提交 5cfdddcf 编写于 作者: P Pavel Shilovsky 提交者: Steve French

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: NPavel Shilovsky <piastry@etersoft.ru>
Reviewed-by: NJeff Layton <jlayton@redhat.com>
Signed-off-by: NSteve French <sfrench@us.ibm.com>
上级 8f09c3d8
...@@ -140,6 +140,7 @@ static const match_table_t cifs_mount_option_tokens = { ...@@ -140,6 +140,7 @@ static const match_table_t cifs_mount_option_tokens = {
{ Opt_nobrl, "nobrl" }, { Opt_nobrl, "nobrl" },
{ Opt_nobrl, "nolock" }, { Opt_nobrl, "nolock" },
{ Opt_forcemandatorylock, "forcemandatorylock" }, { Opt_forcemandatorylock, "forcemandatorylock" },
{ Opt_forcemandatorylock, "forcemand" },
{ Opt_setuids, "setuids" }, { Opt_setuids, "setuids" },
{ Opt_nosetuids, "nosetuids" }, { Opt_nosetuids, "nosetuids" },
{ Opt_dynperm, "dynperm" }, { Opt_dynperm, "dynperm" },
...@@ -1326,9 +1327,11 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, ...@@ -1326,9 +1327,11 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
break; break;
case Opt_nobrl: case Opt_nobrl:
vol->nobrl = 1; vol->nobrl = 1;
/* turn off mandatory locking in mode /*
* turn off mandatory locking in mode
* if remote locking is turned off since the * if remote locking is turned off since the
* local vfs will do advisory */ * local vfs will do advisory
*/
if (vol->file_mode == if (vol->file_mode ==
(S_IALLUGO & ~(S_ISUID | S_IXGRP))) (S_IALLUGO & ~(S_ISUID | S_IXGRP)))
vol->file_mode = S_IALLUGO; vol->file_mode = S_IALLUGO;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册