From nobody Fri Oct 24 09:51:51 2025 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 4ctJ8R4qwlz6F07q; Fri, 24 Oct 2025 09:51:51 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ctJ8R2bKWz3bRL; Fri, 24 Oct 2025 09:51:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761299511; 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=nGLhcATKm9JImENQZzp846MmesBt2mALl4n/ne7AbzQ=; b=DDp1vKJ8c0bjZRskcH2vNZBGpXgFhxiZza4CY9P1qMElvO3toO42G860hgdJvSLRPlwSG1 0ZDGWZ9rd31Aee/WdCh2MTUa5x+mrY+eSF6Z6G9PgdSDZ41N3e6LzRfsncQA5/HXkQ4N8z ShSecOK+VjDESAPnMfKOQR9DpTh21pZppbsx9TiJ3fH4CFunCx6JP6Jw3ejPG94rv1q1Hy LDgW3vPm6bE4QI2sCe+e0Cai0H7qSjy6UODQrSY4LdMVz7juXL11ZuSLkI7qhuPbCuap4q 3lz5yr/Z1YcHUsoqFh6qR2T0tW9wYEgfMU4DTz9xfa8cjZ/9VJLkrl01ezwBZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761299511; 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=nGLhcATKm9JImENQZzp846MmesBt2mALl4n/ne7AbzQ=; b=mD74E2aJaAC/cX82cfTOQQaufZ7KM/GUKQ90OVi5ze+qV5CVbuulL00ytxqAJiNfPzkPC3 ApoRLV1+il5yfX4rF3adHrfYTSDcsXylNAecUYEO86bfbNQdq2I6USUM76nh43Sll4+Chs 2EINy3XiJ+ud6vxrlcGx1A8hEe38BW56X4i9aRQBwoHPYdHY6UCy/QnpiBadG4c5rl23uW HXvxMDGNZGGQgYA1oWMgMn2CBq6qXqII30cp7lMrNBGmx2MjFAs2mAGtPZUnO9J1azE8tR v4+oTUdTViCq0yotQXAVSUHzWmjlp9u1lnKM2k+8Gzbat/J29+5ns/EjCsV1vg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761299511; a=rsa-sha256; cv=none; b=yeMp3OBdVjbpAMGQpTf7S4OLzlthJJjnTVBYU9t2XzZBCp5tqzxU60D/8PMRbNRPymroAC WgZ75SxMq8CEsw3jFSks+rJraRfdoWf6PZhI6PbxDQp2TsxcYTe70601ljIwzhMhHaHT4u 4s7mEdy8g+XKcmBZVZXy9dDdZqWuY6ojGqcHbolZaiZXbRFLsUR2nRa4GT7OkpeYHvFSRw K8y1XGG5APN7LOx07c7pETV4t8q1VkerBje2hEQSGYUqBEfi32MaPmvbRsiGIe2TwUJJEB Tl6klrOGRYm7r9TiNvdNMorxUt+8PGk+M8eiMuzDSw7q2p1oLX/X/Txmy7AF/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ctJ8R1ZnxzwHt; Fri, 24 Oct 2025 09:51:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59O9pp3q088675; Fri, 24 Oct 2025 09:51:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59O9ppDN088672; Fri, 24 Oct 2025 09:51:51 GMT (envelope-from git) Date: Fri, 24 Oct 2025 09:51:51 GMT Message-Id: <202510240951.59O9ppDN088672@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 26285c35d1f2 - stable/14 - nullfs: add a helper for testing if vnode belongs to a nullfs mount 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 26285c35d1f25f9fbbcac93720eadc0cb45eda78 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=26285c35d1f25f9fbbcac93720eadc0cb45eda78 commit 26285c35d1f25f9fbbcac93720eadc0cb45eda78 Author: Konstantin Belousov AuthorDate: 2025-10-08 15:42:27 +0000 Commit: Konstantin Belousov CommitDate: 2025-10-24 09:47:36 +0000 nullfs: add a helper for testing if vnode belongs to a nullfs mount (cherry picked from commit 419f2fe6b70b1a409bf7eca7020d7c745558690f) --- sys/fs/nullfs/null.h | 10 ++++++++++ sys/fs/nullfs/null_vfsops.c | 4 ++-- sys/fs/nullfs/null_vnops.c | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/sys/fs/nullfs/null.h b/sys/fs/nullfs/null.h index 3ae0cd02b2b6..34b8b4225ba8 100644 --- a/sys/fs/nullfs/null.h +++ b/sys/fs/nullfs/null.h @@ -80,6 +80,16 @@ struct vnode *null_checkvp(struct vnode *vp, char *fil, int lno); #endif extern struct vop_vector null_vnodeops; +extern struct vop_vector null_vnodeops_no_unp_bypass; + +static inline bool +null_is_nullfs_vnode(struct vnode *vp) +{ + const struct vop_vector *op; + + op = vp->v_op; + return (op == &null_vnodeops); +} #ifdef MALLOC_DECLARE MALLOC_DECLARE(M_NULLFSNODE); diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c index 8d980932623d..14a6ed5d4d4c 100644 --- a/sys/fs/nullfs/null_vfsops.c +++ b/sys/fs/nullfs/null_vfsops.c @@ -120,7 +120,7 @@ nullfs_mount(struct mount *mp) /* * Unlock lower node to avoid possible deadlock. */ - if (mp->mnt_vnodecovered->v_op == &null_vnodeops && + if (null_is_nullfs_vnode(mp->mnt_vnodecovered) && VOP_ISLOCKED(mp->mnt_vnodecovered) == LK_EXCLUSIVE) { VOP_UNLOCK(mp->mnt_vnodecovered); isvnunlocked = true; @@ -154,7 +154,7 @@ nullfs_mount(struct mount *mp) /* * Check multi null mount to avoid `lock against myself' panic. */ - if (mp->mnt_vnodecovered->v_op == &null_vnodeops) { + if (null_is_nullfs_vnode(mp->mnt_vnodecovered)) { nn = VTONULL(mp->mnt_vnodecovered); if (nn == NULL || lowerrootvp == nn->null_lowervp) { NULLFSDEBUG("nullfs_mount: multi null mount?\n"); diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c index 41915da7f13c..e398053c7028 100644 --- a/sys/fs/nullfs/null_vnops.c +++ b/sys/fs/nullfs/null_vnops.c @@ -258,7 +258,7 @@ null_bypass(struct vop_generic_args *ap) * that aren't. (We must always map first vp or vclean fails.) */ if (i != 0 && (*this_vp_p == NULLVP || - (*this_vp_p)->v_op != &null_vnodeops)) { + !null_is_nullfs_vnode(*this_vp_p))) { old_vps[i] = NULLVP; } else { old_vps[i] = *this_vp_p;