diff options
| author | Pavel Shilovsky <piastry@etersoft.ru> | 2012-03-27 18:51:15 +0200 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2012-03-27 19:27:51 +0200 |
| commit | 5cfdddcfc415b0a67be25a0dec28ea9b1a537397 (patch) | |
| tree | 1180e92d333904ad87a5c86201e2fefcdbfe5483 /fs | |
| parent | Merge branch 'for-3.4' (diff) | |
| download | linux-5cfdddcfc415b0a67be25a0dec28ea9b1a537397.tar.xz linux-5cfdddcfc415b0a67be25a0dec28ea9b1a537397.zip | |
CIFS: Add missed forcemand mount option
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 <piastry@etersoft.ru>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | 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 980815426ac6..302a15c505a9 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" }, @@ -1326,9 +1327,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; |