From nobody Thu Oct 16 02:22:31 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 4cnBYh1Pt8z6CG0w; Thu, 16 Oct 2025 02:22: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cnBYg2CK0z3sh4; Thu, 16 Oct 2025 02:22:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760581351; 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=p5HM9muI7YdfTIxBYbvoJzJtS40dtSrvlC3w+NWKzB8=; b=JwLSBweqnI5/Sv8LNiFUqEywncIenm4dxfrVDxBRQA5Sn7h97E6EsdrIg+tbKYWjRf+9op tbKd2B6ObYdlPnZLEQ86kWhP9zAblWn9nPMp+Qd5DDpKGiGuYPa50jGoosM5fjImhBnm17 vsKzU410h6k6j3JgBA+mN8is025qGxZHEPPZOmhnOpx4VVJS3rgutbLMUyTEQkCKytz3s7 Cz8Na6FOZeTpULNnsjr0CcLsTR/QPnniy1D3eoPR4rYFLqTM9rYiy7jXWsHJssyIRcaFQa idP9n3Hkx+by/wHcVFwdmFS5ySw6Y0BdonFSOiBlBEEsqklJIQ9A8XwTRdBkag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760581351; 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=p5HM9muI7YdfTIxBYbvoJzJtS40dtSrvlC3w+NWKzB8=; b=vG6iMdc6qZLrJPQDyluiTXp//x4952i3eRqaIU9hYpS0QEG06StgFrTY+ufABoYk5HFtGW 4uHHVTqfm4o8HBNRPNbR1xgcuRb5Vb8FpVDmG9pHVByvAzDC/nDSAktZPsofyHnHigGoXs EqQhgCfE42u90XFQDC1OWBEVg7VoUkIN+eYJdWYH8X5TeWfjjz1OlNMHkeEeS5mMKzVe85 iz6wj5kBa7+T18vqRhLfr8pmryVQG4wH0XDtktWV/r+v627Nn+MGj74QVhbgI2DwhY4tfi jB5pwx1Yb3DTHORHPnpkFveE/qzlk2Y8OgEA+Gryk4SsoH8cYXenTMNn05EN3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760581351; a=rsa-sha256; cv=none; b=QwUKba8expR5ikOVqfrpmCKyxo3XCvVXxd7jKkn9AtwHCfIsUPhraLIubrJOruWEvVygjy tM6JrOqIaVH5uTR5vVihA8FDtfId8bW8KwE1YgqX21+1Gii/+mX3dnG8kc0A6yfuJDzYp2 Rq8RMnSGj8SbDzq4e4CA23gJcV1EeH/GsTyqIjsUqRdOZmwNwr5xG6bBpFpohY7u5waxRy zRmmEYdjdYLQcSZbXU9qDslyF0nyQE7080/2NACBUOcoFQuvkPPJ7NoSLXNxhiWojrHMDH McmQE/al2Zwa2R6tnIJBGujKyEyHxn5onZO2+eqn36eS6Wv/bLiF1zHPe1QrzQ== 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 4cnBYg1RZsz14HG; Thu, 16 Oct 2025 02:22:31 +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 59G2MVZO017950; Thu, 16 Oct 2025 02:22:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59G2MVj6017947; Thu, 16 Oct 2025 02:22:31 GMT (envelope-from git) Date: Thu, 16 Oct 2025 02:22:31 GMT Message-Id: <202510160222.59G2MVj6017947@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: b4fe667b2fdd - stable/15 - nullfs: add nounixbypass mount option 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/15 X-Git-Reftype: branch X-Git-Commit: b4fe667b2fddde0101fca4e431868336cc5c4099 Auto-Submitted: auto-generated The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b4fe667b2fddde0101fca4e431868336cc5c4099 commit b4fe667b2fddde0101fca4e431868336cc5c4099 Author: Konstantin Belousov AuthorDate: 2025-10-08 15:47:15 +0000 Commit: Konstantin Belousov CommitDate: 2025-10-16 02:22:20 +0000 nullfs: add nounixbypass mount option (cherry picked from commit 6fa205a6233fea7c41ba0306c778bc5cab37ce7d) --- sys/fs/nullfs/null.h | 5 +++-- sys/fs/nullfs/null_subr.c | 4 +++- sys/fs/nullfs/null_vfsops.c | 9 +++++++++ sys/fs/nullfs/null_vnops.c | 8 ++++++++ 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/sys/fs/nullfs/null.h b/sys/fs/nullfs/null.h index abd652c4ac1c..d07e5c8643b9 100644 --- a/sys/fs/nullfs/null.h +++ b/sys/fs/nullfs/null.h @@ -35,7 +35,8 @@ #ifndef FS_NULL_H #define FS_NULL_H -#define NULLM_CACHE 0x0001 +#define NULLM_CACHE 0x0001 +#define NULLM_NOUNPBYPASS 0x0002 struct null_mount { struct mount *nullm_vfs; @@ -86,7 +87,7 @@ null_is_nullfs_vnode(struct vnode *vp) const struct vop_vector *op; op = vp->v_op; - return (op == &null_vnodeops); + return (op == &null_vnodeops || op == &null_vnodeops_no_unp_bypass); } #ifdef MALLOC_DECLARE diff --git a/sys/fs/nullfs/null_subr.c b/sys/fs/nullfs/null_subr.c index 7dcc83880bb9..d71e91cfacf1 100644 --- a/sys/fs/nullfs/null_subr.c +++ b/sys/fs/nullfs/null_subr.c @@ -210,7 +210,9 @@ null_nodeget(struct mount *mp, struct vnode *lowervp, struct vnode **vpp) */ xp = malloc(sizeof(struct null_node), M_NULLFSNODE, M_WAITOK); - error = getnewvnode("nullfs", mp, &null_vnodeops, &vp); + error = getnewvnode("nullfs", mp, (MOUNTTONULLMOUNT(mp)->nullm_flags & + NULLM_NOUNPBYPASS) != 0 ? &null_vnodeops_no_unp_bypass : + &null_vnodeops, &vp); if (error) { vput(lowervp); free(xp, M_NULLFSNODE); diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c index 483d4182e65e..170a3dd51cd8 100644 --- a/sys/fs/nullfs/null_vfsops.c +++ b/sys/fs/nullfs/null_vfsops.c @@ -87,6 +87,8 @@ nullfs_mount(struct mount *mp) bool isvnunlocked; static const char cache_opt_name[] = "cache"; static const char nocache_opt_name[] = "nocache"; + static const char unixbypass_opt_name[] = "unixbypass"; + static const char nounixbypass_opt_name[] = "nounixbypass"; NULLFSDEBUG("nullfs_mount(mp = %p)\n", (void *)mp); @@ -222,6 +224,13 @@ nullfs_mount(struct mount *mp) &xmp->notify_node); } + if (vfs_getopt(mp->mnt_optnew, unixbypass_opt_name, NULL, NULL) == 0) { + ; + } else if (vfs_getopt(mp->mnt_optnew, nounixbypass_opt_name, NULL, + NULL) == 0) { + xmp->nullm_flags |= NULLM_NOUNPBYPASS; + } + if (lowerrootvp == mp->mnt_vnodecovered) { vn_lock(lowerrootvp, LK_EXCLUSIVE | LK_RETRY | LK_CANRECURSE); lowerrootvp->v_vflag |= VV_CROSSLOCK; diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c index ebb765b0a1c5..acbe4cb03f76 100644 --- a/sys/fs/nullfs/null_vnops.c +++ b/sys/fs/nullfs/null_vnops.c @@ -1215,3 +1215,11 @@ struct vop_vector null_vnodeops = { .vop_copy_file_range = VOP_PANIC, }; VFS_VOP_VECTOR_REGISTER(null_vnodeops); + +struct vop_vector null_vnodeops_no_unp_bypass = { + .vop_default = &null_vnodeops, + .vop_unp_bind = vop_stdunp_bind, + .vop_unp_connect = vop_stdunp_connect, + .vop_unp_detach = vop_stdunp_detach, +}; +VFS_VOP_VECTOR_REGISTER(null_vnodeops_no_unp_bypass);