X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fmount_zfs%2Fmount_zfs.c;h=fd685faaa286574bb901a97d5b3d397578d4c500;hb=da29fe63f04aab286cfbfadefa12bb58389748c2;hp=cd2731446684960954df7eeaa52eba55f5a6a617;hpb=fb827006163574fddb7fa837109d228dacd2ebf6;p=zfs.git diff --git a/cmd/mount_zfs/mount_zfs.c b/cmd/mount_zfs/mount_zfs.c index cd27314..fd685fa 100644 --- a/cmd/mount_zfs/mount_zfs.c +++ b/cmd/mount_zfs/mount_zfs.c @@ -131,15 +131,6 @@ parse_option(char *mntopt, unsigned long *mntflags, if (strncmp(name, opt->name, strlen(name)) == 0) { *mntflags |= opt->mntmask; *zfsflags |= opt->zfsmask; - - /* MS_USERS implies default user options */ - if (opt->mntmask & (MS_USERS)) - *mntflags |= (MS_NOEXEC|MS_NOSUID|MS_NODEV); - - /* MS_OWNER|MS_GROUP imply default owner options */ - if (opt->mntmask & (MS_OWNER | MS_GROUP)) - *mntflags |= (MS_NOSUID|MS_NODEV); - error = 0; goto out; }