From nobody Thu Apr 30 17:59:22 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 4g624B75fCz6bwmk for ; Thu, 30 Apr 2026 17:59:22 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g624B4NhSz3qbD for ; Thu, 30 Apr 2026 17:59:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777571962; 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=udpiO9CtScj8vm9WzOPwldsEfbdqvOaTiE3RKOeYDQg=; b=aAR9vekanWSp7HjZ9MV9S5FxsrgI23qR5WqT8MooMjm49q4Ueq2O8KMmLPAzFVpsTWf38a E/6GGvX1uYNeFU2hL1lO8Q7RDpvrzZooy1FNtq/9jZxYcaFpYXubibhJmV0BI4Hv8ME79D C6yulejY8Xaytn6xWzfZXlCDzkcPvzhg712KT4+qCqJ5pq47fDvMWPrZL4OwY01Tn6FoB2 gZlC0CHMIG1++crqnFbJd7bH9P2qeUp+v20FU8MgyM8oXTjskx+rHF8dBrl16zANCOCB9Y 6+okjOEQydywUocLOlhBtJZGjIYfFTbuegqC4mvxSQpZ17myTyk9oj5qZqjlcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777571962; a=rsa-sha256; cv=none; b=ibTFa+uicLZFHwN3il/fNBUsE3CLUEk4bozfI5tujXwHDYcc+CqtE4foH+ymh5m0JElmlF Ill0yKg0RrXdhNpVoM3pAlG3D2KtBa2WGKlwt0M1VIyVU/zDlCA0c5UjqmM/+yL8TuUyqh JORwjNSDPaa2htMy52WkBzgW/TSnFcPTLI0mXWD5Sus8Et5K3lvIRIi4gw0m0eMgYZ0waU RcoZxGV5XWkAKpe87xlm9kppT1ZV0/dA4UXxqWOc8407tYVWDr2NnlRxyjuFb3DA+Yqk+b UZo+wBMCwnHwrrEdDmoXIf4TlaO2LcbHkZkh4Z6BvyHGHiazrKJ6OA/ykgMi5g== 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=1777571962; 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=udpiO9CtScj8vm9WzOPwldsEfbdqvOaTiE3RKOeYDQg=; b=t7G3No6bb7W/H9+pPOieS9i2fQqES8X6IFJx2N61xW10yoy85xidP6GQbCuTub40xDvGwd 9W88jmCqXATg0Cdsy5GCgeRoWh5y/hnd9hjebCrXTHBhmjjPFb1If4Qu83lk1zxUTrpgJz +UleM/14bKY3voHJWbssSzx5Hna4hO9+1lKjMjVltXIgrFZXaQq+kMToLi7lVu6/mMBsvt UQs9JVmKy/2+CYl2CrvtSoDPlqn6az2pw9xj80Y+QBnQj1bnIq+DtCBCVtT3NPzqSmgWAb KkeJn3KqV+7e64XcZ0HKv29GtawHE3rQOwVPcBw5Hyhc7/fRz6DNuDLpMnaUQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g624B3pJWz6yZ for ; Thu, 30 Apr 2026 17:59:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33284 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 30 Apr 2026 17:59:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: ac38d964c9ad - stable/15 - 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 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/15 X-Git-Reftype: branch X-Git-Commit: ac38d964c9ad4731611d0a01cb75951a92a49763 Auto-Submitted: auto-generated Date: Thu, 30 Apr 2026 17:59:22 +0000 Message-Id: <69f3987a.33284.5e5ac9ee@gitrepo.freebsd.org> The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=ac38d964c9ad4731611d0a01cb75951a92a49763 commit ac38d964c9ad4731611d0a01cb75951a92a49763 Author: Olivier Certner AuthorDate: 2026-03-27 12:43:24 +0000 Commit: Olivier Certner CommitDate: 2026-04-30 17:58:45 +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 c1253b4439a5..393353d8c038 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -2082,26 +2082,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. */ @@ -2169,7 +2165,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); @@ -2377,10 +2373,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); } }