From nobody Mon Aug 25 15:22: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 4c9ZL56M64z65vkJ; Mon, 25 Aug 2025 15:22: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c9ZL53Mrdz3XY0; Mon, 25 Aug 2025 15:22:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756135373; 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=5F62hVGhTjGD2yMqlbMn67NE8H4AKwcppJHAR2/0Bf4=; b=dJ6/OY6tBtJz8ExQnkEfCe6V2wcRIDh3ql7aNtWPzsR7qKjESIRWr3JyPp4YXv7wJFW9OB XCmIr1XTTelzfIw6FQVV0W6r29RuzNhb/VT0QtVyzdTK1qXYguxM3cbf1KBKjaKMgO0HId P3kiLWMmQB8JRTu5B9ARpLqZ4NuIIXuTzznaVE9XxxD29VRNsfvKykN3UQIWzcwG1eY+Q+ Fjb9vGSAMd4xD0PqbczvZeyV2lguKFW/zKsCBJaafZShp1RP1cstZ0onayM9CygzyEsd/o 4SzhFA/dlLYJX7K8J62aopuhMY/iq3ziCRUUKbY+X7QL0llNj5hf+8X1sa6p7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756135373; 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=5F62hVGhTjGD2yMqlbMn67NE8H4AKwcppJHAR2/0Bf4=; b=g73ekx9rPtDG5EgE2prJ7JN6mnr4uRCbItU+gk+raBb5dUEfCAjff9RQAgYGrfbH1wTss0 nInnt8/QWeN1dbCnOAn28VQF+wor78eLliOHhYnKgVqAllM69BhNo/aMMmJqaNNvUnQf3c ei8ZeNxQT6gIl1itWvDYvTkvo65dVrOEFIDC0F/OZE3MseXNyQTYDp3KKmkfodGq+LLlb2 sc1D5cqMS2aXj78SYk3/VQlpjJHUwd9VFCvrIYvsHMRdp5ae8JnmJgaYxMqad8PGeRsaBR lSdARgBjwakW3RYwBsWlnsY+1vav/zxnwvUvVxcR/l9xvz9PlUJsugcpawkVbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756135373; a=rsa-sha256; cv=none; b=qSQW17bZp+fPJeED/2skynGQVUEdRU3RY22O4uaVeP+SLIj0m36NxDevm9MQJwjM0sDy1J sYLLHD55RnzxxvYoRrCDYDFVTuSZ8RKh8YVdxhiNc4dgz7oRLEPEzOi41amyJX30xqcGfP IGdmUYoWgvoRpRWPMPFDTLYy+KUy6euq4wq+CnRQAiUTrENmCbEgqFW/4AVo7WdBchWQTC HG08+1rZvf0RlQmH38muXSzA+v+UCWYS9Ux0XUhtgwv+3M+q+6irGZwPBonb76G0iXNVH7 QXyHqVirhOUq+4wNxWXs/sgxbfCSVEFHtipTDFz4184QgEXlXOtxGLVoPTZvXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c9ZL52xxmzw6n; Mon, 25 Aug 2025 15:22: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 57PFMrQu053997; Mon, 25 Aug 2025 15:22:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57PFMrEr053994; Mon, 25 Aug 2025 15:22:53 GMT (envelope-from git) Date: Mon, 25 Aug 2025 15:22:53 GMT Message-Id: <202508251522.57PFMrEr053994@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 765b8ef6991c - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 765b8ef6991c317b4172f3ebc2db21beb8168627 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=765b8ef6991c317b4172f3ebc2db21beb8168627 commit 765b8ef6991c317b4172f3ebc2db21beb8168627 Author: Mark Johnston AuthorDate: 2025-07-24 15:30:15 +0000 Commit: Mark Johnston CommitDate: 2025-08-25 13:57:57 +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 (cherry picked from commit 2daaf63d538b76b6c135c273cc17c56fac5a7535) --- 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 99bb11be8796..831046e808e9 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) {