forked from openzfs/zfs
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
1). A minor grammar error was corrected in main() when the ENOENT
case is handled. 2). In both files, the header and the C code, these options are now accepted as passed through by mount in util-linux-2.24 when it execs mount.zfs: acl noacl posixacl
- Loading branch information
Showing
2 changed files
with
10 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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_COMMENT, ZS_COMMENT }, | ||
{ MNTOPT_NOACL, MS_COMMENT, ZS_COMMENT }, | ||
{ MNTOPT_POSIXACL, MS_COMMENT, ZS_COMMENT }, | ||
This comment has been minimized.
Sorry, something went wrong. |
||
#ifdef MS_NOATIME | ||
{ MNTOPT_NOATIME, MS_NOATIME, ZS_COMMENT }, | ||
#endif | ||
|
@@ -409,8 +413,7 @@ main(int argc, char **argv) | |
} | ||
|
||
/* validate mount options and set mntflags */ | ||
error = parse_options(mntopts, &mntflags, &zfsflags, sloppy, | ||
badopt, mtabopt); | ||
error = parse_options(mntopts, &mntflags, &zfsflags, sloppy, badopt, mtabopt); | ||
This comment has been minimized.
Sorry, something went wrong. |
||
if (error) { | ||
switch (error) { | ||
case ENOMEM: | ||
|
@@ -420,7 +423,7 @@ main(int argc, char **argv) | |
return (MOUNT_SYSERR); | ||
case ENOENT: | ||
(void) fprintf(stderr, gettext("filesystem '%s' " | ||
"cannot be mounted of due invalid option " | ||
"cannot be mounted due to invalid option " | ||
This comment has been minimized.
Sorry, something went wrong.
behlendorf
|
||
"'%s'.\n"), dataset, badopt); | ||
(void) fprintf(stderr, gettext("Use the '-s' option " | ||
"to ignore the bad mount option.\n")); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Both MNTOPT_ACL and MNTOPT_POSIXACL should really be set to MS_POSIXACL. That way this mount flag will get passed down in to the kernel. Today it will be completely ignored but it should cause a temporary override of the acltype property for the duration of the mount. This isn't yet implemented under Linux see openzfs#985, but passing the flag would be a start.