From nobody Mon Dec 04 21:03:42 2023 X-Original-To: dev-commits-src-branches@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 4Skbk70wB5z52pTC; Mon, 4 Dec 2023 21:03:43 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Skbk70RTpz4Gsg; Mon, 4 Dec 2023 21:03:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701723823; 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=vElxVXgw5O9XcA6MEP4+5/Broa6PoITK/mqjeJtA5hM=; b=F3F5vooSqdkPZUN7LjIQSaQcfhT8bl3uFXgQWYJ4E+IAHM1Wi8r9+dXPr1rB/Chwk3ym/5 OroUiGb7jOjktj9n+KDnmJObSFdI1gbH/gQBKMpSkTHRHq3iPET9taQaQR1CLcqc++PJdN hg9ofdP33tHUNSEjUHLHAwc8YaEt/4BDDibmvJCGd0kFMnGV7C9ZAvYvm6+vkSOdxiny1L gWaJqFHMexHoVoZCiEI8+146QMkoi5KSBhRWn+YLBxSzjUOvPaXrvRejqFL+ejgk19Mo8K C9eWcWGj2hCJg5b1v2FSWRLFpjd+0syjdlbvo8l6j5D9Lxj8uso38BkYZwPCHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701723823; 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=vElxVXgw5O9XcA6MEP4+5/Broa6PoITK/mqjeJtA5hM=; b=X2vMg+3nB1DkKcrHIWsJ3yvMuB3uJ1JLfxFz8p54+qIF5YtY15La9bWrvJdwzWal06DbuR 3X/Et+wOBjCBBZ4d1M6ZADaEbBxwumhPpVW9SsmGvQo4rfL0xdX3zgamkC1kv9QAQ1DyHR xH2nXzGiFWPJjJeK8ME2xXxHTXGSSrR795PLWncrryTU7+HUIN6BktPi7xNcvGzDv4Tff1 q+Nh3Pgqe9KvrlmNeb9EkKGK9yWg/iIX49hvJB7xaj8T4lxWw+N5omMEEDYR5+zzKOv4ee aMcvGQR0DfRmXwR5OcLblUkmZYP365YNMxFCz6mHqlfHMDCjOotPfp/KI0K7xQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701723823; a=rsa-sha256; cv=none; b=TFzWlVsIcH+0oYynDoSvUBg11Xt3hZmRlbP9zVhYz4uRTD+8pJZuP1cIgaIyL6nG9A+ame klF6hQraJu4G4OW8upWIQRpWNy2bq4eLn3n1+6CKeih9zwjLj0mNZfUe5YDVoftEBNOyp9 zcwkVEck+eyHknmFPf0SpTI2b890nTYkBLXCBH3jO5qBnTsCJeh+izuyPu/GhcwcwTuBXE xT8meDsFfhZYHHGSXcFpd4pEZoU/giKNyC9uUXEQsBQlxTFqu9LoMBOE/MDOcSO8aUaZo3 JvlxSx7YifUONKeHwoHY51fbd8Vs3KWV0qbT67Lhku/GI2jtyMXaxaDqG7kJlg== 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 4Skbk66fYpzj0c; Mon, 4 Dec 2023 21:03:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4L3gAU061963; Mon, 4 Dec 2023 21:03:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4L3g1x061960; Mon, 4 Dec 2023 21:03:42 GMT (envelope-from git) Date: Mon, 4 Dec 2023 21:03:42 GMT Message-Id: <202312042103.3B4L3g1x061960@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 00f0b99e63c3 - stable/13 - OpenZFS: Fix ZFS so that snapshots under .zfs/snapshot are NFS visible List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 00f0b99e63c3b27174b89dae426a2d87435d991a Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=00f0b99e63c3b27174b89dae426a2d87435d991a commit 00f0b99e63c3b27174b89dae426a2d87435d991a Author: rmacklem <64620010+rmacklem@users.noreply.github.com> AuthorDate: 2023-11-28 00:31:03 +0000 Commit: Ed Maste CommitDate: 2023-12-04 21:03:30 +0000 OpenZFS: Fix ZFS so that snapshots under .zfs/snapshot are NFS visible Call vfs_exjail_clone() for mounts created under .zfs/snapshot to fill in the mnt_exjail field for the mount. If this is not done, the snapshots under .zfs/snapshot with not be accessible over NFS. This version has the argument name in vfs.h fixed to match that of the name in spl_vfs.c, although it really does not matter. External-issue: https://reviews.freebsd.org/D42672 Reviewed-by: Alexander Motin Signed-off-by: Rick Macklem Closes #15563 (cherry picked from commit 522414da3b283dada175161e49ea7f3fe46436ff) --- sys/contrib/openzfs/include/os/freebsd/spl/sys/vfs.h | 2 +- sys/contrib/openzfs/module/os/freebsd/spl/spl_vfs.c | 9 ++++++++- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/vfs.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/vfs.h index a432f6c56739..62986b7fc525 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/vfs.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/vfs.h @@ -103,7 +103,7 @@ void vfs_setmntopt(vfs_t *vfsp, const char *name, const char *arg, void vfs_clearmntopt(vfs_t *vfsp, const char *name); int vfs_optionisset(const vfs_t *vfsp, const char *opt, char **argp); int mount_snapshot(kthread_t *td, vnode_t **vpp, const char *fstype, - char *fspath, char *fspec, int fsflags); + char *fspath, char *fspec, int fsflags, vfs_t *parent_vfsp); typedef uint64_t vfs_feature_t; diff --git a/sys/contrib/openzfs/module/os/freebsd/spl/spl_vfs.c b/sys/contrib/openzfs/module/os/freebsd/spl/spl_vfs.c index 53ef46fb8ce5..177a059e88a1 100644 --- a/sys/contrib/openzfs/module/os/freebsd/spl/spl_vfs.c +++ b/sys/contrib/openzfs/module/os/freebsd/spl/spl_vfs.c @@ -120,7 +120,7 @@ vfs_optionisset(const vfs_t *vfsp, const char *opt, char **argp) int mount_snapshot(kthread_t *td, vnode_t **vpp, const char *fstype, char *fspath, - char *fspec, int fsflags) + char *fspec, int fsflags, vfs_t *parent_vfsp) { struct vfsconf *vfsp; struct mount *mp; @@ -220,6 +220,13 @@ mount_snapshot(kthread_t *td, vnode_t **vpp, const char *fstype, char *fspath, mp->mnt_opt = mp->mnt_optnew; (void) VFS_STATFS(mp, &mp->mnt_stat); +#ifdef VFS_SUPPORTS_EXJAIL_CLONE + /* + * Clone the mnt_exjail credentials of the parent, as required. + */ + vfs_exjail_clone(parent_vfsp, mp); +#endif + /* * Prevent external consumers of mount options from reading * mnt_optnew. diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c index cfc4bab2fa96..3c9311098696 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c @@ -1025,7 +1025,8 @@ zfsctl_snapdir_lookup(struct vop_lookup_args *ap) "%s/" ZFS_CTLDIR_NAME "/snapshot/%s", dvp->v_vfsp->mnt_stat.f_mntonname, name); - err = mount_snapshot(curthread, vpp, "zfs", mountpoint, fullname, 0); + err = mount_snapshot(curthread, vpp, "zfs", mountpoint, fullname, 0, + dvp->v_vfsp); kmem_free(mountpoint, mountpoint_len); if (err == 0) { /*