On Tue, 2012-03-27 at 20:51 +0400, Pavel Shilovsky wrote: > The 'forcemand' form of 'forcemandatorylock' mount option was missed > when the code moved to use the standard token parser. Return it back. > > Also fix a comment style in the parser. > > Signed-off-by: Pavel Shilovsky <[email protected]> > --- > fs/cifs/connect.c | 7 +++++-- > 1 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c > index 26327ea..7e4775c 100644 > --- a/fs/cifs/connect.c > +++ b/fs/cifs/connect.c > @@ -140,6 +140,7 @@ static const match_table_t cifs_mount_option_tokens = { > { Opt_nobrl, "nobrl" }, > { Opt_nobrl, "nolock" }, > { Opt_forcemandatorylock, "forcemandatorylock" }, > + { Opt_forcemandatorylock, "forcemand" }, > { Opt_setuids, "setuids" }, > { Opt_nosetuids, "nosetuids" }, > { Opt_dynperm, "dynperm" }, > @@ -1397,9 +1398,11 @@ cifs_parse_mount_options(const char *mountdata, const > char *devname, > break; > case Opt_nobrl: > vol->nobrl = 1; > - /* turn off mandatory locking in mode > + /* > + * turn off mandatory locking in mode > * if remote locking is turned off since the > - * local vfs will do advisory */ > + * local vfs will do advisory > + */ > if (vol->file_mode == > (S_IALLUGO & ~(S_ISUID | S_IXGRP))) > vol->file_mode = S_IALLUGO;
Looks fine. Reviewed-By: Sachin Prabhu <[email protected]> -- To unsubscribe from this list: send the line "unsubscribe linux-cifs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
