diff options
| -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 = { | |||
| 140 | { Opt_nobrl, "nobrl" }, | 140 | { Opt_nobrl, "nobrl" }, |
| 141 | { Opt_nobrl, "nolock" }, | 141 | { Opt_nobrl, "nolock" }, |
| 142 | { Opt_forcemandatorylock, "forcemandatorylock" }, | 142 | { Opt_forcemandatorylock, "forcemandatorylock" }, |
| 143 | { Opt_forcemandatorylock, "forcemand" }, | ||
| 143 | { Opt_setuids, "setuids" }, | 144 | { Opt_setuids, "setuids" }, |
| 144 | { Opt_nosetuids, "nosetuids" }, | 145 | { Opt_nosetuids, "nosetuids" }, |
| 145 | { Opt_dynperm, "dynperm" }, | 146 | { Opt_dynperm, "dynperm" }, |
| @@ -1326,9 +1327,11 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, | |||
| 1326 | break; | 1327 | break; |
| 1327 | case Opt_nobrl: | 1328 | case Opt_nobrl: |
| 1328 | vol->nobrl = 1; | 1329 | vol->nobrl = 1; |
| 1329 | /* turn off mandatory locking in mode | 1330 | /* |
| 1331 | * turn off mandatory locking in mode | ||
| 1330 | * if remote locking is turned off since the | 1332 | * if remote locking is turned off since the |
| 1331 | * local vfs will do advisory */ | 1333 | * local vfs will do advisory |
| 1334 | */ | ||
| 1332 | if (vol->file_mode == | 1335 | if (vol->file_mode == |
| 1333 | (S_IALLUGO & ~(S_ISUID | S_IXGRP))) | 1336 | (S_IALLUGO & ~(S_ISUID | S_IXGRP))) |
| 1334 | vol->file_mode = S_IALLUGO; | 1337 | vol->file_mode = S_IALLUGO; |