From nobody Thu Jan 15 14:18:55 2026 X-Original-To: dev-commits-src-main@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 4dsQ8N4WPbz6P2fD for ; Thu, 15 Jan 2026 14:19:00 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dsQ8N3DVVz4Qft for ; Thu, 15 Jan 2026 14:19:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768486740; 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=Xph6Oyz/mqm4YwirckEgUI3/0ogcdLCJIAGRE7WqQ80=; b=jw8QBCrrSI9Kb7RW54ElDmjed8s6epeqd1h6dt/1JNeZE5fHnS65bDe++8ksrayjTnCmPv osaORx1Pplabrb3QyIg+LoHSNWpy2vFbm2qkjeMFgVeMWoIJTfzA6PqwgT3YvBCPXaZHfL 3ECCbQEsWa2M+O4PUpfDKytech4UTYyTpUS/DywPEzJvLWLnpdnCsGcemvrKH3Lr07PHVr nvkjyMKQQm/zKWDCGUcRGEQdcPsiqj7LnmYJZGlPgIahHswLgfljp3UKC8oPLKrRAhclp/ hQvIkpAK2KO1CuozBm4XqdvvEdtbs/89O140oTYi7d3YgTVest7Qka8Jj1o7iQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768486740; 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=Xph6Oyz/mqm4YwirckEgUI3/0ogcdLCJIAGRE7WqQ80=; b=twd4tuKiS18DoYsNR6SgXJK458Y0/vctZdhXj+GdNLlgHH6QyjHl+tcYN9KegsWhl3dGj8 +DpTUBnsCKLjMeL2BhMsDXh08scjzsWadwD/Dd40OjDCAU7uhxy9dOddYXQDkudM5GAv55 VpOFVJj+GVn19/qkGNC99Bzb1kabLu3H9+97+7Phapa7cgU+HyoMzEl3W5XR+yw8NFGt2G GmjUV3KReQz252iMkdthXR9jU7VheXD65yqmXbvDMp7elJwRcWA42Id8S31c9HWfKu+AiB zUb7jKTAOvTnoOzUc3JTHHPxOgbo29v/yWUyzn28bcTUgbVE+aMZZtami6o+Tw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768486740; a=rsa-sha256; cv=none; b=VnT0y2EwknnALxSfpPA1vYOfBL1gCgHu/Cc7zanS57qr5/z0NBgA/YbH+j6H52ZzkSZA3x tv/suCbFUlnpIBV1+lvpr/znSvmr0EsOby4HxEQApjrPdvYpkkLn/wFYYCfdMq0S6hv7mv r9P04Q6adpn6MAGG/meXqvX4i4+l3Q5YSEEfvyxapXCZdFkiB2XaLY1sV0cv1nWh2skYSS 0/2UJj8rr9OXVb/F7b6H77NbDpZ5FIpvjqD/XoF6V21iAgLkX7ApzA8On1fIGlFE1aRIq8 cSUf/WTMlIvAA2ATmRqxywc4KdRCpcjFLcqwt/GVm5fYQk6YAU37i19F1Lgh/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dsQ8N2SKVzXXx for ; Thu, 15 Jan 2026 14:19:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id d96b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 15 Jan 2026 14:18:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 9d015a916745 - main - Remove the DEBUG_VFS_LOCKS kernel option List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 9d015a916745e320aed50fc759f111fc7622e427 Auto-Submitted: auto-generated Date: Thu, 15 Jan 2026 14:18:55 +0000 Message-Id: <6968f74f.d96b.6d90ab37@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9d015a916745e320aed50fc759f111fc7622e427 commit 9d015a916745e320aed50fc759f111fc7622e427 Author: Mark Johnston AuthorDate: 2026-01-15 13:50:20 +0000 Commit: Mark Johnston CommitDate: 2026-01-15 13:50:20 +0000 Remove the DEBUG_VFS_LOCKS kernel option After commit 3bd8fab2415b ("vfs: Move DEBUG_VFS_LOCKS checks to INVARIANTS"), this option has no effect. Let's finish the removal. There are a couple of additional uses in zfs, I will submit a separate patch upstream for them. Reviewed by: mckusick, kib Differential Revision: https://reviews.freebsd.org/D54662 --- sys/conf/NOTES | 1 - sys/conf/options | 1 - sys/conf/std.nodebug | 1 - sys/fs/unionfs/union_subr.c | 2 +- 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/conf/NOTES b/sys/conf/NOTES index eb33d0abf919..6d3ea088b819 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -2673,7 +2673,6 @@ options INIT_PATH=/sbin/init:/rescue/init # Debug options options BUS_DEBUG # enable newbus debugging -options DEBUG_VFS_LOCKS # enable VFS lock debugging options SOCKBUF_DEBUG # enable sockbuf last record/mb tail checking options IFMEDIA_DEBUG # enable debugging in net/if_media.c diff --git a/sys/conf/options b/sys/conf/options index c86560491faf..c9b9307718b7 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -601,7 +601,6 @@ BLKDEV_IOSIZE opt_global.h BURN_BRIDGES opt_global.h DEBUG opt_global.h DEBUG_LOCKS opt_global.h -DEBUG_VFS_LOCKS opt_global.h DFLTPHYS opt_global.h DIAGNOSTIC opt_global.h INVARIANT_SUPPORT opt_global.h diff --git a/sys/conf/std.nodebug b/sys/conf/std.nodebug index 79676a1d618f..7ce16e9b52aa 100644 --- a/sys/conf/std.nodebug +++ b/sys/conf/std.nodebug @@ -7,7 +7,6 @@ nooptions INVARIANT_SUPPORT nooptions DIAGNOSTIC nooptions WITNESS nooptions WITNESS_SKIPSPIN -nooptions DEBUG_VFS_LOCKS nooptions BUF_TRACKING nooptions FULL_BUF_TRACKING nooptions DEADLKRES diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c index 90be4d6af812..6489eb77ce2b 100644 --- a/sys/fs/unionfs/union_subr.c +++ b/sys/fs/unionfs/union_subr.c @@ -1071,7 +1071,7 @@ unionfs_forward_vop_ref(struct vnode *basevp, int *lkflags) * forwarded VOP reacquires the base vnode lock the unionfs vnode * lock will no longer be held. This can lead to violation of the * caller's sychronization requirements as well as various failed - * locking assertions when DEBUG_VFS_LOCKS is enabled. + * locking assertions when INVARIANTS is enabled. * 2) Loss of reference on the base vnode. The caller is expected to * hold a v_usecount reference on the unionfs vnode, while the * unionfs vnode holds a reference on the base-layer vnode(s). But