From 3ffeefe553e43e67c01ddea05b6f532090e85e09 Mon Sep 17 00:00:00 2001 From: Umer Saleem Date: Wed, 4 Sep 2024 00:40:44 +0500 Subject: [PATCH] Revert "Make mount.zfs(8) calling zfs_mount_at for legacy mounts as well" This reverts commit 34118eac06fba834f0c934419aec1b386c98665a. Signed-off-by: Umer Saleem --- cmd/mount_zfs.c | 5 +++-- module/os/linux/zfs/zfs_ctldir.c | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cmd/mount_zfs.c b/cmd/mount_zfs.c index 283074daf717..fc9220950647 100644 --- a/cmd/mount_zfs.c +++ b/cmd/mount_zfs.c @@ -269,7 +269,8 @@ main(int argc, char **argv) return (MOUNT_USAGE); } - if (sloppy || libzfs_envvar_is_set("ZFS_MOUNT_HELPER")) { + if (!zfsutil || sloppy || + libzfs_envvar_is_set("ZFS_MOUNT_HELPER")) { zfs_adjust_mount_options(zhp, mntpoint, mntopts, mtabopt); } @@ -336,7 +337,7 @@ main(int argc, char **argv) dataset, mntpoint, mntflags, zfsflags, mntopts, mtabopt); if (!fake) { - if (!remount && !sloppy && + if (zfsutil && !sloppy && !libzfs_envvar_is_set("ZFS_MOUNT_HELPER")) { error = zfs_mount_at(zhp, mntopts, mntflags, mntpoint); if (error) { diff --git a/module/os/linux/zfs/zfs_ctldir.c b/module/os/linux/zfs/zfs_ctldir.c index e042116333fb..54ed70d0394f 100644 --- a/module/os/linux/zfs/zfs_ctldir.c +++ b/module/os/linux/zfs/zfs_ctldir.c @@ -1101,8 +1101,8 @@ zfsctl_snapshot_mount(struct path *path, int flags) zfsvfs_t *snap_zfsvfs; zfs_snapentry_t *se; char *full_name, *full_path; - char *argv[] = { "/usr/bin/env", "mount", "-i", "-t", "zfs", "-n", - NULL, NULL, NULL }; + char *argv[] = { "/usr/bin/env", "mount", "-t", "zfs", "-n", NULL, NULL, + NULL }; char *envp[] = { NULL }; int error; struct path spath; @@ -1153,8 +1153,8 @@ zfsctl_snapshot_mount(struct path *path, int flags) * value from call_usermodehelper() will be (exitcode << 8 + signal). */ dprintf("mount; name=%s path=%s\n", full_name, full_path); - argv[6] = full_name; - argv[7] = full_path; + argv[5] = full_name; + argv[6] = full_path; error = call_usermodehelper(argv[0], argv, envp, UMH_WAIT_PROC); if (error) { if (!(error & MOUNT_BUSY << 8)) {