From nobody Sun Aug 3 22:11:53 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bwDS96NdJz63tjW; Sun, 03 Aug 2025 22:11:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bwDS94PgDz3sjh; Sun, 03 Aug 2025 22:11:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754259113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jOEOEEyV36O3aAN2ZA/rVr9PHrEkpkDUod1iyI6nxvQ=; b=QrV3Q7uB1j94y7FTgiMJfLflRHsBWWRfPNEoMqCDMGX4y6lY0kSrY4/6iL867LMOe2OTVd YPL52wX3QDdz2sijBOSk4GwX7sUwvMZFiN3J53LN4tiJItBZFz8shTX3Z4x1GR9j+Wm7SM Wi2xcH6QlKbfjtD4R+sfyLSctKCvjIQL3JtEEPVBPhA0SC4W9Vq/a0jsvSq+1aRpbG1Jv0 +5n08WR67ptGnqynJgVEdwHDbqDv/0J1s491du0F7Ow16ITrr37mtdbH4R60IpWT/U+YuH c3d+W4Tyde+K+QL610h3LZweDWLUfl7qN7rosIk27MclSOPJx6eN4VgDi5mrCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754259113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jOEOEEyV36O3aAN2ZA/rVr9PHrEkpkDUod1iyI6nxvQ=; b=qsx2G4ShECwlr7jrCbhB/IYCI6eu1gDCS/DIGEUFoQ3AXbNvj3dgZV4bsrXhcQTN3e18nJ f1LZ0fStKVmhNWUa85nR3V53pL9gGai5sutGIlaMcTbq9Epwuk3Cj7JL7x1Lf2Kn2rSOkS 975Ij9ze4xiefhs8hdNlXxGb77/K9gezkNuEPGH3am5W06BpKqPLY37og4kimOLHliJPJf lymvCWP3MU99MgEEYk1Msl25o4l+kyivkW43Sc9ZpHyt6QJ6uc2/mIzHZJNbzBM8B7eq84 76fUGeUzxL74Gfy2IOVWYJ0JHrdTdlekfsOZE00BW2h//v8My0iOX32gcXgUFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754259113; a=rsa-sha256; cv=none; b=JFEDeGVMhrlYH+GC5hjaNeFxctEYArHqSJn7J8t7b4dXjlGcipYJ5UsW9cZHfuLmOKKPtL iNPYL1cMsbh/w1TDWlE40IgAZoKekxP7B0FCAsrVKAiaaP5EzBgtAHAYVRy3nZQgaITZuO cmn57cWO11LsUXOAt6z9bHdnFXdMe5lhobLhxFFQ9IDzGDJo776RkmiSjmEWPx0ikOs7d/ pXv6SaTJGwuRGnEhica3JyxXHtFF7TsYrx3LHIR+CpUkkSdw5TPjp7VLqkjXnD7qasgQOu Cc7mtu1rnigNCPRfJxf8P9rPIpSnw40aQANDlBGqf6XZozf/krSXIN/BYcvu6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bwDS93Z1Nz6Zc; Sun, 03 Aug 2025 22:11:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 573MBria067047; Sun, 3 Aug 2025 22:11:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 573MBrmQ067036; Sun, 3 Aug 2025 22:11:53 GMT (envelope-from git) Date: Sun, 3 Aug 2025 22:11:53 GMT Message-Id: <202508032211.573MBrmQ067036@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 2daaf63d538b - main - mac: Remove uses of DEBUG_VFS_LOCKS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2daaf63d538b76b6c135c273cc17c56fac5a7535 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2daaf63d538b76b6c135c273cc17c56fac5a7535 commit 2daaf63d538b76b6c135c273cc17c56fac5a7535 Author: Mark Johnston AuthorDate: 2025-07-24 15:30:15 +0000 Commit: Mark Johnston CommitDate: 2025-08-03 21:52:23 +0000 mac: Remove uses of DEBUG_VFS_LOCKS We can assert that a vnode lock is held whenever INVARIANTS is configured. Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D51698 --- sys/security/mac/mac_framework.h | 2 +- sys/security/mac/mac_vfs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/security/mac/mac_framework.h b/sys/security/mac/mac_framework.h index 8e43f267f368..af827c33ee58 100644 --- a/sys/security/mac/mac_framework.h +++ b/sys/security/mac/mac_framework.h @@ -488,7 +488,7 @@ void mac_sysvshm_init(struct shmid_kernel *); void mac_thread_userret(struct thread *td); -#if defined(MAC) && defined(DEBUG_VFS_LOCKS) +#if defined(MAC) && defined(INVARIANTS) void mac_vnode_assert_locked(struct vnode *vp, const char *func); #else #define mac_vnode_assert_locked(vp, func) do { } while (0) diff --git a/sys/security/mac/mac_vfs.c b/sys/security/mac/mac_vfs.c index a50c6f0c8f26..dc2bfa7c643b 100644 --- a/sys/security/mac/mac_vfs.c +++ b/sys/security/mac/mac_vfs.c @@ -1078,7 +1078,7 @@ vn_setlabel(struct vnode *vp, struct label *intlabel, struct ucred *cred) return (0); } -#ifdef DEBUG_VFS_LOCKS +#ifdef INVARIANTS void mac_vnode_assert_locked(struct vnode *vp, const char *func) {