diff options
| author | renelson <[email protected]> | 2013-12-17 10:44:23 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2013-12-18 16:46:20 -0800 |
| commit | a5f3665168946318c98ed5407b9314d400bd6dde (patch) | |
| tree | 713134588665baa12f22877c3d9fcc10edabde31 /cmd/mount_zfs | |
| parent | 758d35520b7e15fd6db2e8c8f45294a9cf0514cb (diff) | |
Handle acl flags from util-linux mount command
Add acl, noacl and posixacl to option_map, avoiding ENOENT error
case when mount from util-linux-2.24 execs mount.zfs with any of
those flags
Signed-off-by: Brian Behlendorf <[email protected]>
Signed-off-by: renelson <[email protected]>
Issue #1968
Diffstat (limited to 'cmd/mount_zfs')
| -rw-r--r-- | cmd/mount_zfs/mount_zfs.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cmd/mount_zfs/mount_zfs.c b/cmd/mount_zfs/mount_zfs.c index b3c3e9a14..f7e2d99a0 100644 --- a/cmd/mount_zfs/mount_zfs.c +++ b/cmd/mount_zfs/mount_zfs.c @@ -61,6 +61,10 @@ static const option_map_t option_map[] = { { MNTOPT_SYNC, MS_SYNCHRONOUS, ZS_COMMENT }, { MNTOPT_USER, MS_USERS, ZS_COMMENT }, { MNTOPT_USERS, MS_USERS, ZS_COMMENT }, + /* acl flags passed with util-linux-2.24 mount command */ + { MNTOPT_ACL, MS_POSIXACL, ZS_COMMENT }, + { MNTOPT_NOACL, MS_COMMENT, ZS_COMMENT }, + { MNTOPT_POSIXACL, MS_POSIXACL, ZS_COMMENT }, #ifdef MS_NOATIME { MNTOPT_NOATIME, MS_NOATIME, ZS_COMMENT }, #endif |