From nobody Mon Aug 25 15:22:51 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 4c9ZL36crzz65vmW; Mon, 25 Aug 2025 15:22:51 +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 4c9ZL31tp5z3XXn; Mon, 25 Aug 2025 15:22:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756135371; 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=8gOk3yCVK0j9PIfhEUXcGhRce3l0gx8Xt2w6GmwZgBs=; b=M+w0iDsJX0SHDk9gtw6a8IN8Vf7Ksno7FPad/g1LhR/P0pmOxxM4ZG6y6GcKcZVnQh+Dj3 SvZ9RBSmd1eZfHhrA4BWcqU7LtBRPXvZoFijmAgUVb8n4t8MsKZxKat/iQDFnM31aIdTzE RAXS2/QiRbSXmQFG8M5+gVPlfylyzSSPMTLgR3Uib6qrFAsDOgP8zlL29xwiSNdQCE561f XxrrSm8iy7NpQDPaQCyMmp9nf93Q6dlkEFEFzuYQMEH3xkPiSo4WfKJJ9f+BTyzSVMf2nY BVKRTW0/S//2Tb/DM2FXnWNJYQU4CM/vB+4uy00xb08po3ZgSPqRyheSxx8Tig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756135371; 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=8gOk3yCVK0j9PIfhEUXcGhRce3l0gx8Xt2w6GmwZgBs=; b=ftClG2Bt64jXTuE8Q0yLkYPW01XMLDdRg/z6LMCm6y01zKydnduQnYHxgJLeXpFEliXYoe dYJd3vcQO/yHZ6TNOBvLDjlSh/5yaeIxoOHBnwXDjL+xJEYdW8DFRdo9Gwz374cGMbUCvw CR1DGjpPekjtVwDtWLFnQzQSfHkbotxkIPXX+ixK5pJDqauYKFTlhV/t3/auxeTFGx+1da upjUvNJaj2Mh5/3uBD+oSIeRIzcDHvcTTkTvAP8Rdzl0JKW54h8gz1tUoKHiSGPXIsB+i6 HpaZdZVRqD89okYtQZHFDDNnTGTXmENMysXHfgNTaMinAGVH8i2Y5M//9RWefg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756135371; a=rsa-sha256; cv=none; b=kiWnbYUPCy5Srm/q5ONMfwIjsHDUnEFf8p9kx+Y3UclrwXxYn9SAARGJvENoN/2MWedZsy H1Maxu5XmjQLVs0YsFsmAQAxDBDVlxxtYgfTxZ6GctNT3Ko9qQUP79RLB4fGoinydlsoyE 1hZMrBIYKDVjd8aF5m3BSkl7peW01kX9oxgUHOaqPIg7w4atNExZK+zWuIBgwpTWSEF6/K bugQmXhyGqmM2RgPvLlOW8Meut3fvs2QcNjFugUcFqA4olL6FNtkc+HqkvKEnFT7PALl73 gn5Y7DCB5ENJK1jcvlWfi3AFzPuB6hkdnlQ/TkDnNcirJzzveC2+IfC2jaG67A== 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 4c9ZL31QzFzvx5; Mon, 25 Aug 2025 15:22:51 +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 57PFMp9C053923; Mon, 25 Aug 2025 15:22:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57PFMp4w053920; Mon, 25 Aug 2025 15:22:51 GMT (envelope-from git) Date: Mon, 25 Aug 2025 15:22:51 GMT Message-Id: <202508251522.57PFMp4w053920@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: d033848a5e4c - stable/14 - ufs: 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: d033848a5e4ca02b20c55b8e8601c57087dafb81 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d033848a5e4ca02b20c55b8e8601c57087dafb81 commit d033848a5e4ca02b20c55b8e8601c57087dafb81 Author: Mark Johnston AuthorDate: 2025-07-24 15:27:56 +0000 Commit: Mark Johnston CommitDate: 2025-08-25 13:57:56 +0000 ufs: Remove uses of DEBUG_VFS_LOCKS All of these assertions can reasonably be checked when plain INVARIANTS is configured, there's no need to configure a separate option. Reviewed by: olce, imp, kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D51696 (cherry picked from commit 4798f1e8f28d1bd440987696b3474eb6ca764fde) --- sys/ufs/ffs/ffs_softdep.c | 2 -- sys/ufs/ffs/ffs_vnops.c | 2 -- sys/ufs/ufs/ufs_lookup.c | 2 -- sys/ufs/ufs/ufs_quota.c | 4 ---- 4 files changed, 10 deletions(-) diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c index 54a0466da88c..70807552c8c8 100644 --- a/sys/ufs/ffs/ffs_softdep.c +++ b/sys/ufs/ffs/ffs_softdep.c @@ -14528,10 +14528,8 @@ getdirtybuf(struct buf *bp, BUF_UNLOCK(bp); if (waitfor != MNT_WAIT) return (NULL); -#ifdef DEBUG_VFS_LOCKS if (bp->b_vp->v_type != VCHR) ASSERT_BO_WLOCKED(bp->b_bufobj); -#endif bp->b_vflags |= BV_BKGRDWAIT; rw_sleep(&bp->b_xflags, lock, PRIBIO, "getbuf", 0); return (NULL); diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c index 03dcb27ff6f7..bf90387ccd59 100644 --- a/sys/ufs/ffs/ffs_vnops.c +++ b/sys/ufs/ffs/ffs_vnops.c @@ -511,9 +511,7 @@ ffs_lock( case LK_EXCLUSIVE: flags = ap->a_flags; for (;;) { -#ifdef DEBUG_VFS_LOCKS VNPASS(vp->v_holdcnt != 0, vp); -#endif /* DEBUG_VFS_LOCKS */ lkp = vp->v_vnlock; result = lockmgr_lock_flags(lkp, flags, &VI_MTX(vp)->lock_object, ap->a_file, ap->a_line); diff --git a/sys/ufs/ufs/ufs_lookup.c b/sys/ufs/ufs/ufs_lookup.c index 423c4c2e4e28..af348157c87d 100644 --- a/sys/ufs/ufs/ufs_lookup.c +++ b/sys/ufs/ufs/ufs_lookup.c @@ -232,7 +232,6 @@ ufs_lookup_ino(struct vnode *vdp, struct vnode **vpp, struct componentname *cnp, bmask = VFSTOUFS(vdp->v_mount)->um_mountp->mnt_stat.f_iosize - 1; -#ifdef DEBUG_VFS_LOCKS /* * Assert that the directory vnode is locked, and locked * exclusively for the last component lookup for modifying @@ -250,7 +249,6 @@ ufs_lookup_ino(struct vnode *vdp, struct vnode **vpp, struct componentname *cnp, if ((nameiop == CREATE || nameiop == DELETE || nameiop == RENAME) && (flags & (LOCKPARENT | ISLASTCN)) == (LOCKPARENT | ISLASTCN)) ASSERT_VOP_ELOCKED(vdp, "ufs_lookup2"); -#endif restart: bp = NULL; diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c index 52fc6c08fdf9..f9427a5f152c 100644 --- a/sys/ufs/ufs/ufs_quota.c +++ b/sys/ufs/ufs/ufs_quota.c @@ -1280,10 +1280,8 @@ dqget(struct vnode *vp, uint64_t id, struct ufsmount *ump, int type, struct uio auio; int dqvplocked, error; -#ifdef DEBUG_VFS_LOCKS if (vp != NULLVP) ASSERT_VOP_ELOCKED(vp, "dqget"); -#endif if (vp != NULLVP && *dqp != NODQUOT) { return (0); @@ -1555,10 +1553,8 @@ dqsync(struct vnode *vp, struct dquot *dq) struct mount *mp; struct ufsmount *ump; -#ifdef DEBUG_VFS_LOCKS if (vp != NULL) ASSERT_VOP_ELOCKED(vp, "dqsync"); -#endif mp = NULL; error = 0;