On Mon, 26 Jul 2010 13:05:29 -0400 Jeff Layton <jlayton@xxxxxxxxx> wrote: > These are filesystem-independent mount options that get passed to > mount.cifs too. Handle them appropriately by enabling and disabling > MS_MANDLOCK and not handing them off to the kernel. > > Signed-off-by: Jeff Layton <jlayton@xxxxxxxxx> > --- > mount.cifs.c | 12 ++++++++++++ > 1 files changed, 12 insertions(+), 0 deletions(-) > > diff --git a/mount.cifs.c b/mount.cifs.c > index c84e72d..1ca9507 100644 > --- a/mount.cifs.c > +++ b/mount.cifs.c > @@ -159,6 +159,8 @@ > #define OPT_RO 24 > #define OPT_RW 25 > #define OPT_REMOUNT 26 > +#define OPT_MAND 27 > +#define OPT_NOMAND 28 > > > /* struct for holding parsed mount info for use by privleged process */ > @@ -822,6 +824,10 @@ static int parse_opt_token(const char *token) > return OPT_NO_DEV; > if (strncmp(token, "nobrl", 5) == 0 || strncmp(token, "nolock", 6) == 0) > return OPT_NO_LOCK; > + if (strncmp(token, "mand", 4) == 0) > + return OPT_MAND; > + if (strncmp(token, "nomand", 6) == 0) > + return OPT_NOMAND; > if (strncmp(token, "dev", 3) == 0) > return OPT_DEV; > if (strncmp(token, "noexec", 6) == 0) > @@ -1106,6 +1112,12 @@ parse_options(const char *data, struct parsed_mount_info *parsed_info) > case OPT_NO_LOCK: > *filesys_flags &= ~MS_MANDLOCK; > break; > + case OPT_MAND: > + *filesys_flags |= MS_MANDLOCK; > + goto nocopy; > + case OPT_NOMAND: > + *filesys_flags &= ~MS_MANDLOCK; > + goto nocopy; > case OPT_DEV: > *filesys_flags &= ~MS_NODEV; > break; merged -- Jeff Layton <jlayton@xxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe linux-cifs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
