summaryrefslogtreecommitdiffstats
path: root/fs/cifs
diff options
context:
space:
mode:
authorPavel Shilovsky <piastry@etersoft.ru>2012-03-27 20:51:15 +0400
committerSteve French <sfrench@us.ibm.com>2012-03-27 12:27:51 -0500
commit5cfdddcfc415b0a67be25a0dec28ea9b1a537397 (patch)
tree1180e92d333904ad87a5c86201e2fefcdbfe5483 /fs/cifs
parent8f09c3d8dbb8ba35c579e426b3f30bf7bafe0a85 (diff)
downloadop-kernel-dev-5cfdddcfc415b0a67be25a0dec28ea9b1a537397.zip
op-kernel-dev-5cfdddcfc415b0a67be25a0dec28ea9b1a537397.tar.gz
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/cifs')
-rw-r--r--fs/cifs/connect.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 9808154..302a15c 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;
OpenPOWER on IntegriCloud