From nobody Thu Sep 24 18:39:31 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 4hrN0h1rgLz6t3xy for ; Thu, 24 Sep 2026 18:39:32 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hrN0g6b03z4ryZ for ; Thu, 24 Sep 2026 18:39:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790275171; 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=Lpu4MWI50Hb89Ef6ta/MPcwpHlh4N1nXH6Mcgu/ntPE=; b=tOtynUYdSuWql9gHZkPIYjsoBoQC1pBsEanr3lsiTcgliFNAt5XziLSfmtmckR0bR3Z1DI ABD07JZJTJx+PmfUu1elodg9mokDu9SXoq6hyfbKHkNtO2Z7s+yzKaQRbenuMFY/xQ4XeR zkyIVvVkkEcuDr17ZZVCfX7IyXQdEVTytTUEKPAq63b9xtaEwPzWcpxOstUGyFMwEl7MuU zb1aRbu53o7jH0INWu0q9d0MtxTYitpfCIDgBgJVq5b8JpE38YjXs6jJbtQeNnFj2RRWEv xSTDU9lH2xXxuOwZI1KJxHl9za896k8VpPWfJGFflLnboi40X40Pnowlylr2pA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790275171; b=AuKm9G2L8U1c/1NV0NzyRdXIq4vNI4kj8uDIp+zyqUTKX/iOgB75bF8d8ikCJoHn3asoLV M98WOkiNkmVIltcSgP7Z93KP/bUBu/seiF2oOmOXsRDRTJRvWsxJA9Sowqpa4gv8GlaQjM fI2m40i+M9EItxTLqsTuDsui3zV8m+bZ/2FbrFJg2M79L4IsD7xZxFO+Fr2oIk2cXA/NqI uAPXn3WAp6Fwb+cNvO9ooimmMO2wUtuubu9rha6K7JF7hUpy+MjvdqWDb4KWrmoFpOcZag Q5WgC6Pho9/3C3yxHTO3fg0cKHOid/sC6jmuUYIVmBP45Jxs3cO4wGlZoa1G3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790275171; 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=Lpu4MWI50Hb89Ef6ta/MPcwpHlh4N1nXH6Mcgu/ntPE=; b=DrgOyhJPWLkT+cmd+rJtrjtVB2fIwMc0RFvI+5i26miaM/+cCMAdmLHPNdIwzmPNwUWzrI Anrzu59YW/28av4IWFkIc8EJwsEarZ/R3vBaYb6RmBtG3hy6K6nGBpvBb7haWSOcqsxrNI auYPPbsuSLZWEPZvsMGDk/WIljl53CCPCZz2nbJoPrEVAuGCM+M6TqCDkLzfGqBgjzIe55 5hgrd+637o3KoCK1O59z7ckYtzXw5NR4FIPF9JivMv6KXkTeukQIUPheoST7TC+xx8dhdu C+aExS31gGMbF5woND32aX21KHuFvk9Hk2rLwY1VcXUVgP4XryDyVNRZ/tkA5g== 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 4hrN0g51TLzcP1 for ; Thu, 24 Sep 2026 18:39:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25561 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 24 Sep 2026 18:39:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 53edaad235c8 - main - filesystems: use g_vfs_close_unlocked(9) 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 53edaad235c86e4426e97d63be48f0160bcc5267 Auto-Submitted: auto-generated Date: Thu, 24 Sep 2026 18:39:31 +0000 Message-Id: <6ab56e63.25561.59601817@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=53edaad235c86e4426e97d63be48f0160bcc5267 commit 53edaad235c86e4426e97d63be48f0160bcc5267 Author: Konstantin Belousov AuthorDate: 2026-09-20 10:27:07 +0000 Commit: Konstantin Belousov CommitDate: 2026-09-24 18:38:33 +0000 filesystems: use g_vfs_close_unlocked(9) As result, we lock the devvp vnode around calls to VOP_FSYNC() on unmount. For instance, the vn_fsync_buf() implementation of fsync() needs exclusive lock on the vnode to guarantee that all dirty buffers are indeed synced. Reviewed by: markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D59932 --- sys/fs/cd9660/cd9660_vfsops.c | 11 +++-------- sys/fs/ext2fs/ext2_vfsops.c | 15 +++------------ sys/fs/msdosfs/msdosfs_vfsops.c | 7 ++----- sys/fs/udf/udf_vfsops.c | 11 +++-------- sys/ufs/ffs/ffs_vfsops.c | 7 ++----- 5 files changed, 13 insertions(+), 38 deletions(-) diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c index ce6d03b73290..02d8acf6371a 100644 --- a/sys/fs/cd9660/cd9660_vfsops.c +++ b/sys/fs/cd9660/cd9660_vfsops.c @@ -506,11 +506,8 @@ out: brelse(pribp); if (supbp != NULL) brelse(supbp); - if (cp != NULL) { - g_topology_lock(); - g_vfs_close(cp); - g_topology_unlock(); - } + if (cp != NULL) + g_vfs_close_unlocked(cp); if (isomp) { free(isomp, M_ISOFSMNT); mp->mnt_data = NULL; @@ -541,9 +538,7 @@ cd9660_unmount(struct mount *mp, int mntflags) if (isomp->im_l2d) cd9660_iconv->close(isomp->im_l2d); } - g_topology_lock(); - g_vfs_close(isomp->im_cp); - g_topology_unlock(); + g_vfs_close_unlocked(isomp->im_cp); vrele(isomp->im_devvp); dev_rel(isomp->im_dev); free(isomp, M_ISOFSMNT); diff --git a/sys/fs/ext2fs/ext2_vfsops.c b/sys/fs/ext2fs/ext2_vfsops.c index 0f3808a7c747..fc92eb79c81a 100644 --- a/sys/fs/ext2fs/ext2_vfsops.c +++ b/sys/fs/ext2fs/ext2_vfsops.c @@ -837,7 +837,6 @@ ext2_mountfs(struct vnode *devvp, struct mount *mp) struct ext2fs *es; struct cdev *dev = devvp->v_rdev; struct g_consumer *cp; - struct bufobj *bo; struct csum *sump; int error; int ronly; @@ -870,9 +869,6 @@ ext2_mountfs(struct vnode *devvp, struct mount *mp) goto out; } - bo = &devvp->v_bufobj; - bo->bo_private = cp; - bo->bo_ops = g_vfs_bufops; if (devvp->v_rdev->si_iosize_max != 0) mp->mnt_iosize_max = devvp->v_rdev->si_iosize_max; if (mp->mnt_iosize_max > maxphys) @@ -983,11 +979,8 @@ ext2_mountfs(struct vnode *devvp, struct mount *mp) out: if (bp) brelse(bp); - if (cp != NULL) { - g_topology_lock(); - g_vfs_close(cp); - g_topology_unlock(); - } + if (cp != NULL) + g_vfs_close_unlocked(cp); if (ump) { mtx_destroy(EXT2_MTX(ump)); free(ump->um_e2fs->e2fs_gd, M_EXT2MNT); @@ -1029,9 +1022,7 @@ ext2_unmount(struct mount *mp, int mntflags) ext2_sbupdate(ump, MNT_WAIT); } - g_topology_lock(); - g_vfs_close(ump->um_cp); - g_topology_unlock(); + g_vfs_close_unlocked(ump->um_cp); vrele(ump->um_devvp); sump = fs->e2fs_clustersum; for (i = 0; i < fs->e2fs_gcount; i++, sump++) diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c index 30c63cfa8a35..cdb3cc30fdff 100644 --- a/sys/fs/msdosfs/msdosfs_vfsops.c +++ b/sys/fs/msdosfs/msdosfs_vfsops.c @@ -863,11 +863,8 @@ mountmsdosfs(struct vnode *odevvp, struct mount *mp) error_exit: if (bp != NULL) brelse(bp); - if (cp != NULL) { - g_topology_lock(); - g_vfs_close(cp); - g_topology_unlock(); - } + if (cp != NULL) + g_vfs_close_unlocked(cp); if (pmp != NULL) { lockdestroy(&pmp->pm_fatlock); free(pmp->pm_inusemap, M_MSDOSFSFAT); diff --git a/sys/fs/udf/udf_vfsops.c b/sys/fs/udf/udf_vfsops.c index c1627285a174..9d6b9fdc649e 100644 --- a/sys/fs/udf/udf_vfsops.c +++ b/sys/fs/udf/udf_vfsops.c @@ -496,11 +496,8 @@ bail: free(udfmp, M_UDFMOUNT); if (bp != NULL) brelse(bp); - if (cp != NULL) { - g_topology_lock(); - g_vfs_close(cp); - g_topology_unlock(); - } + if (cp != NULL) + g_vfs_close_unlocked(cp); dev_rel(dev); return error; }; @@ -528,9 +525,7 @@ udf_unmount(struct mount *mp, int mntflags) #endif } - g_topology_lock(); - g_vfs_close(udfmp->im_cp); - g_topology_unlock(); + g_vfs_close_unlocked(udfmp->im_cp); vrele(udfmp->im_devvp); dev_rel(udfmp->im_dev); diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index f7f1d3e7ff93..b692f9c49a2a 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -1202,11 +1202,8 @@ out: free(fs->fs_si, M_UFSMNT); free(fs, M_UFSMNT); } - if (cp != NULL) { - g_topology_lock(); - g_vfs_close(cp); - g_topology_unlock(); - } + if (cp != NULL) + g_vfs_close_unlocked(cp); if (ump != NULL) { mtx_destroy(UFS_MTX(ump)); if (mp->mnt_gjprovider != NULL) {