From nobody Mon Mar 30 09:25:12 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 4fkm7F0K7Fz6Wgpq for ; Mon, 30 Mar 2026 09:25:13 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fkm7D6gCsz3Fkc for ; Mon, 30 Mar 2026 09:25:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774862713; 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=9lBkgsdiXqmArLmOd3V/nCBKmLDfs6DzIrbtaHhJOKU=; b=v0lCixYgpmsvuCErxImK1rdsxd9EaWimxx2wNfqjAj1TReHvOoZAxFRha6HgHN3KTZWv4w XyBoLuRd28XHgAt+lWWnH1fYSE7Rk7kuD6xcEZiG419X3W4IOkVBeRcRCdo/8zCRi9AJru 8Dx3oyqaj2GZeMonnTIz4lWzCWlqOmIVwXQseHRBpr5rwb197O0ZxzGenMD60vqW6rJi6U DiC4z5CNSM+y5dw20uds/R+O+9tn1jZwuqAuSajJWWnM8dN5vrl7JpN6NZ0bB+36IMfoYF wZBPqUSQXthuCuveuBZGbLYT4jW9HaluwbsOw9z9mWtUJz4kQToyiXbBe5gTPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774862713; a=rsa-sha256; cv=none; b=ETj31tuCxtgwAMoGDSl1Gr8Qm7njvberl0lMxLzDKFaBlMnKRHpdESZGUbYskFLYKg6u0x sQdF6oH/FszN2zWDSKBTzkcPbnp9qASIEVVQLfv0IU1lXGMjtWoIblBQiaZwpwrCqRpeHv QEuOfuRJnPw69++kl46qLr2+v1qRzXRhYN5bXpRRXJwZaIp1JPnbGyrUFq+QhA5g7xxMeZ e4/y9PwY2HBGbQCDr0/EQGR6j4/vDXOzyJ7pGgba2fd9URK7T/ApT0r5Yter6cXZcG+BNZ rqnR+RqlMl10yfY2JEb8PH2LISFj/ng6j1FpQUbiNFp9sYaE6io0r8YA0XEqtg== 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=1774862713; 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=9lBkgsdiXqmArLmOd3V/nCBKmLDfs6DzIrbtaHhJOKU=; b=bU7XfHm0DpRpLWfPT00v97ziPZRxSVqxxDiesXmKpUzHTscTQ3lDSAuQPGPOz5XW1d/2GN Q4OrguykTUJ3YktRxOK7MqxNk0ASDsWx912VqkBBXXgj/hsmmOpxsowjNG5U5K9y9pZSlV Thp7qxE5jnKWHDYa/N9vP0yNQvYvtR+fBdwTiXnydlN4rGGQgSiFSli317ai+yGA5TZPf3 1sINs4pZfWnC5uz6jl3XFO28Q/37y/YpNhh5TYWnV4lHucUGGeluB7O7V1tfHd4KtzhXag GW1cvSngFbHchWH7l1DAM2TgLuzsem7tK6+J9INDYy8Y0l4J3n/Pq8rYbeL9GA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fkm7D5rsFzckK for ; Mon, 30 Mar 2026 09:25:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27070 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 30 Mar 2026 09:25:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 4deb934c1a10 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 4deb934c1a1051d7ef41e9309d066742722ce180 Auto-Submitted: auto-generated Date: Mon, 30 Mar 2026 09:25:12 +0000 Message-Id: <69ca4178.27070.49cd4f61@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=4deb934c1a1051d7ef41e9309d066742722ce180 commit 4deb934c1a1051d7ef41e9309d066742722ce180 Author: Olivier Certner AuthorDate: 2026-03-27 12:43:24 +0000 Commit: Olivier Certner CommitDate: 2026-03-30 09:24:23 +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 --- 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 ea8f8437b743..4061b2272193 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -2078,26 +2078,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. */ @@ -2165,7 +2161,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); @@ -2373,10 +2369,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); } }