From nobody Thu Jul 23 10:00:44 2026 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 4h5RT91gYjz6lVxt for ; Thu, 23 Jul 2026 10:00:45 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h5RT85rWHz3VyK for ; Thu, 23 Jul 2026 10:00:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784800844; 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=eD1IqNtOJDlU/rDhzcJ17w4NZ5yNdnSsLj/4xe/c+yg=; b=LfLgJgXqvRTIcJl5/jJ7cMUwVaJutGVdX6qBKcUIO+2xf83sVhXUxndGpqIBpcrUHDx2+Y 4ymzXEmd38NKF9y382+E/497MX3IiAnPG2CcmRdOgrXfM8SvJkwyLmoDavnrWuEMIHQ4Gx kadv4S2dr5eNP2xiPxDW5BxDPmy4qbEm0Hivd94bbHQ1pdwvLGR7ew97Rb6oBORxxsoARE fK7Is8aji3wcjoNfwaA6hHo7DEd5MTT7AbUWAEEMBI+zZ8Kw8OLD/ZydP/n5XKzwdZJggp l2giI1P1RIUdp+pcz3631b3X9myst8NYNX1krgHTjPWFBQoXn3CjDgnVb+u/YQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784800844; a=rsa-sha256; cv=none; b=upXEM6YWFP3f3qYcmU/iByWtxhfwdVgAzUtkfD1gdTKNHapqcDelNRliXpQaCD3C41NCXY xnQiOeeEQ9ICEpV9LYnRoxQ919tmgp3CB75fM3YmhG2lBEZvfGy6GbZUO9+t6CTl+FoPlc chFPC64PWhlhmEsewF8+VA06r+iT2/vL+Pirq77XADzul/ZCG923RDg6n7YLgWfEAzngqi WBOkz4D199lDkKjsQyyCnnu99SaEYN/e+RGQRgVbRLZytooghodGq2FlGDp17gKzi8szTz yTQe1I/imEohvLVqpA7xfV8P/BH/m0cWpZjd4r5WdbXoLPfUtAOs9TyxrVC47g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784800844; 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=eD1IqNtOJDlU/rDhzcJ17w4NZ5yNdnSsLj/4xe/c+yg=; b=bsUkAetQp0IShdt473plbgEZhIXGyRAbM81ciMDdAN0AxIt3fuETI0tM3dV1t8NFH8AyPS FkWPeLTphUR0Civj2ral03snvcMKySivIMkys0t/v3nJZE0ywGiwjVqdsw9Vc7usmedixz fMU2/v3VbPEIwAoc53SZvD8eyVVEM7U8niGbANfNdO9ZoQUpEKof1v+FlBwmCEhs5xpLGj nATloGpHtKETA6eJbqxcpSqOO//ydoWSX6xu7Tll5oKONOwx0eEEcYSqYqxjsep7LUdth/ sAKTUTOKc2bspE5jd/qmQwTQEmDMpwW5nIEIkp4CFWYiG7G9s0eat1tYvsz6NA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h5RT84ZGYz10fs for ; Thu, 23 Jul 2026 10:00:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bb39 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 23 Jul 2026 10:00:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 9356619327e7 - stable/14 - vfs: Simplify vfs_write_resume()/vn_start_write_refed() 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9356619327e726ee2e0453c2198102b562aa3a02 Auto-Submitted: auto-generated Date: Thu, 23 Jul 2026 10:00:44 +0000 Message-Id: <6a61e64c.3bb39.5d80ab4b@gitrepo.freebsd.org> The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=9356619327e726ee2e0453c2198102b562aa3a02 commit 9356619327e726ee2e0453c2198102b562aa3a02 Author: Olivier Certner AuthorDate: 2026-03-27 12:43:24 +0000 Commit: Olivier Certner CommitDate: 2026-07-23 09:59:05 +0000 vfs: Simplify vfs_write_resume()/vn_start_write_refed() The call to vn_start_write_refed() from vfs_write_resume() with 'mplocked' set to 'true' exactly boils down to doing an increment of 'mnt_writeopcount', albeit with lots of unnecessary verifications. Replace it with an inline incrementation. As the original call was the last with 'mplocked' with 'true', remove the 'mplocked' parameter from vfs_write_resume(), simplifying its code accordingly ('mplocked' always false). While here, in vfs_write_resume(), initialize 'error' out of the mount lock. Reviewed by: kib MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56108 (cherry picked from commit 4deb934c1a1051d7ef41e9309d066742722ce180) --- sys/kern/vfs_vnops.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index ee247de2374c..1e97d2260ac9 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -1971,26 +1971,22 @@ vn_closefile(struct file *fp, struct thread *td) * suspension is over, and then proceed. */ static int -vn_start_write_refed(struct mount *mp, int flags, bool mplocked) +vn_start_write_refed(struct mount *mp, int flags) { struct mount_pcpu *mpcpu; int error, mflags; - if (__predict_true(!mplocked) && (flags & V_XSLEEP) == 0 && - vfs_op_thread_enter(mp, mpcpu)) { + if ((flags & V_XSLEEP) == 0 && vfs_op_thread_enter(mp, mpcpu)) { MPASS((mp->mnt_kern_flag & MNTK_SUSPEND) == 0); vfs_mp_count_add_pcpu(mpcpu, writeopcount, 1); vfs_op_thread_exit(mp, mpcpu); return (0); } - if (mplocked) - mtx_assert(MNT_MTX(mp), MA_OWNED); - else - MNT_ILOCK(mp); - error = 0; + MNT_ILOCK(mp); + /* * Check on status of suspension. */ @@ -2058,7 +2054,7 @@ vn_start_write(struct vnode *vp, struct mount **mpp, int flags) if (vp == NULL) vfs_ref(mp); - error = vn_start_write_refed(mp, flags, false); + error = vn_start_write_refed(mp, flags); if (error != 0 && (flags & V_NOWAIT) == 0) *mpp = NULL; return (error); @@ -2266,10 +2262,12 @@ vfs_write_resume(struct mount *mp, int flags) if ((flags & VR_NO_SUSPCLR) == 0) VFS_SUSP_CLEAN(mp); vfs_op_exit(mp); - } else if ((flags & VR_START_WRITE) != 0) { - MNT_REF(mp); - vn_start_write_refed(mp, 0, true); } else { + if ((flags & VR_START_WRITE) != 0) { + MNT_REF(mp); + mp->mnt_writeopcount++; + } + MNT_IUNLOCK(mp); } }