From nobody Thu Sep 24 18:39:30 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 4hrN0m1Qkzz6t3S9 for ; Thu, 24 Sep 2026 18:39:36 +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 4hrN0l6QMCz4s0G for ; Thu, 24 Sep 2026 18:39:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790275175; 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=MD/HWIPo3D0iGvPAXt48Q4vkFd4B+USrJPuX5D0RFr9oZ19hrLr7m9gmIRqiIG0puZsSFw vhcoRMAz0KXM7KdJCugJh9HnvJU1x2lu/syX+2Gj8axscPBuvmSn0IpPZeJuiV+QLbmAPW xHPGHTR4vUI4GXpHqoBrF0cxGDUP1LIOesiYv5DL1whKhSKhX71uuXFEGjxSePzpMA78Mt X1g28fCz4yzuDuZFpopX2Lc/7+DbosBFm/BcY9iPRAIsV6iDGPDV7+3px4JfnO8vhnPrRe kh3+QC62Tm7Hl1dXrBqgUek3UCGuGtovnMPqXA12v5OI25VlZ2QpDNL4ilkL6A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790275175; b=XkhHgDUHOEQ31fWqCQNPaWkgcXutF5dhkjulM2/Q1o6Z3r7B1miZXVN4Vl/sxLbStIWi5E uTiaRYXtA4n7NPYENHRCfnZ6JvaI39fhfKA7BI/2yrZuZnN/wUhO60C5B5TeKy1aKoZdOQ DHEsmhnO09DYH096LR7j650q0Pxl/kKbmag6ptRoQH1giBmVMvUrH66zetFQqYnRWYBmMb GjIvH0r9JpAV6I+MM9Rx9tfYTXkxgQsMMtu+mT/v1t7uYGQQFsdfy2PHYQ3hPyepgMBMpc sk00xz/tml6oEdivqSgI4v1HO5n5D2JCCU02fckiBqueTHXoykPaEI+nVTfIpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790275175; 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=tW9v30M1CiPbntBtdGlsJ34vD52i7fAUjBDI24Kfi6s64NhUd/xfSmNfEMvNcw4jPXlcaB H88TvIQLn2kcLLrhctidmZG+jC0RmpqCP3zTlBbXWwOWjSdzno0EIVSha1XGoSFgiGIC8q +5KbVpkvMD4CUm/EUUoOQPT2MNahAdGG+gQElU26q9YXfbqlbD+oJkOjGdSe7zSqWmaj+u 7RRbzbNOU9w2dsod1TmxY9DJoDqZlnWfpFKcecLuXSJcoIpzGXeEqXwAQKyOGcUWlubAQ7 gw4rY/X5NDs+W/F5FlGfEez5vQKNcHRrufWmiNfW6Iof7e/4nB20iulWAcsyww== 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 4hrN0l5V0Fzcxl for ; Thu, 24 Sep 2026 18:39:35 +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 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: 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_ */