From nobody Thu Sep 24 18:39:30 2026 X-Original-To: dev-commits-src-main@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 4hrN0f6Cwwz6t3q4 for ; Thu, 24 Sep 2026 18:39:30 +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 4hrN0f5Tvjz4s6N for ; Thu, 24 Sep 2026 18:39:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790275170; 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=xrYFUjfY1WhiZAv3GJQGm3TiRw3tkyp9bRQJlDN2+tY=; b=M1ajqu2yew0+0vFXdZ9sepem9DveiTT9hv0yvhZfRGTNuWX1BznDhgszrTMFO1jMU7M1DR FVRzOVp0KpuRyJ3mO4QVgCiBKGiHV87trMINPHChe+96Dz+HbQ0JN8adkPdNdwsAv314Oe HcRKk5es0a3mwMnJFin64TegyLE9IWKBXMJuVPEhoRBYKfGzSlCoaTHfm/xs2dQbRkuCkN FzVAh2+MMdeBJUZoOgBflT2NjCPv/A9FKLy5e7aevi+VMuHjPi0XCBhcGXWg5rxxfJ3Hsn eM+kpPBKWFEKAWS0YxT8ZnBUIsfrei+B0IA+ZGfz+YXuolbAkp+UIbWR8hWDAw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790275170; b=EKCkHKhnqTHaKLU3ItlojduPM8v5cH69zKK5dNYPfa76loGm8oa1QpH4WMHFZDzXiZ6PqX 3Pv7eCOERiBQ25Pcy7aMr6zzFJyrVlogBfcaupSNwsBWJIwH+7tQBVJySWw9Esfv7CoR5b xxPlvPEbslrPQXx+QHUV4AqqA7cpmgPXt8tM5qfGvJ2kqhmOFZT2zbJ02vLSLqseET0Uz7 d06GCFQ6ChlTURnk39Ukq6AWc2F47Kff/C9J/pKzNMrApBpnerCmHdMQn0XVEd6WKdi+s8 /SxLgLPMoIi8ONpJSwaeIvKJWW6vo49Bik/tkq3245KZ+th+HDMkWsc1Umx0fQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790275170; 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=xrYFUjfY1WhiZAv3GJQGm3TiRw3tkyp9bRQJlDN2+tY=; b=jeAWSDlXxFWpUMcSh8mAv62e/Xqp2FPYQyT/73Te4dfy5VbuXoR13qCKTjSzekNKLLKaY1 9J6MzQQ7z7GLIwF+2RGf6n5YV021mY/5Ss0cMirKTHpzaL/RFDUX6EF7Ds8FNqQhSQlfoP Aa+MnUKfjHXUy5ag8hgfIqK58Bw9wYeJDZVQN8p1dBM8H65Hyxq10/d+slvYqkXs3IeAng 31m/FFFU1KKryNoCjlnoZw9WsTEjrzrPPaGwpN5zUnOBAA6otLpVvQrdMjwiK+q5zS4nti ffSTtgSgjIyU15Br7p8iOOyoyyVF1nceuAD51hGO08VJV7XIgGmQQ2Nu1/NvXw== 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 4hrN0f4HKSzcLj for ; Thu, 24 Sep 2026 18:39:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2555d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 24 Sep 2026 18:39:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 87962e08fa18 - main - g_vfs_close_unlocked(9): wrapper around g_vfs_close(9) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 87962e08fa18797103c96c17fd8c88ada056e0c0 Auto-Submitted: auto-generated Date: Thu, 24 Sep 2026 18:39:30 +0000 Message-Id: <6ab56e62.2555d.9770dcf@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=87962e08fa18797103c96c17fd8c88ada056e0c0 commit 87962e08fa18797103c96c17fd8c88ada056e0c0 Author: Konstantin Belousov AuthorDate: 2026-09-20 10:27:07 +0000 Commit: Konstantin Belousov CommitDate: 2026-09-24 18:38:32 +0000 g_vfs_close_unlocked(9): wrapper around g_vfs_close(9) that locks both bo vnode and topology. Reviewed by: markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D59932 --- sys/geom/geom_vfs.c | 13 +++++++++++++ sys/geom/geom_vfs.h | 4 +++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/sys/geom/geom_vfs.c b/sys/geom/geom_vfs.c index 122e2f6a02ec..74723f43081c 100644 --- a/sys/geom/geom_vfs.c +++ b/sys/geom/geom_vfs.c @@ -338,3 +338,16 @@ g_vfs_close(struct g_consumer *cp) KASSERT(sc->sc_event == NULL, ("g_vfs %p event is non-NULL", sc)); g_free(sc); } + +void +g_vfs_close_unlocked(struct g_consumer *cp) +{ + struct vnode *vp; + + vp = cp->private; + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); + g_topology_lock(); + g_vfs_close(cp); + g_topology_unlock(); + VOP_UNLOCK(vp); +} diff --git a/sys/geom/geom_vfs.h b/sys/geom/geom_vfs.h index 56b91dd10c3b..01efc3e19d41 100644 --- a/sys/geom/geom_vfs.h +++ b/sys/geom/geom_vfs.h @@ -36,7 +36,9 @@ struct buf; extern struct buf_ops *g_vfs_bufops; void g_vfs_strategy(struct bufobj *bo, struct buf *bp); -int g_vfs_open(struct vnode *vp, struct g_consumer **cpp, const char *fsname, int wr); +int g_vfs_open(struct vnode *vp, struct g_consumer **cpp, + const char *fsname, int wr); void g_vfs_close(struct g_consumer *cp); +void g_vfs_close_unlocked(struct g_consumer *cp); #endif /* _GEOM_GEOM_VFS_H_ */