Commit 72bd481f authored by Jeff Layton's avatar Jeff Layton Committed by Steve French

cifs: reinstate the forcegid option

Apparently this was lost when we converted to the standard option
parser in 8830d7e0

Cc: Sachin Prabhu <sprabhu@redhat.com>
Cc: stable@vger.kernel.org # v3.4+
Reported-by: default avatarGregory Lee Bartholomew <gregory.lee.bartholomew@gmail.com>
Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarSteve French <smfrench@gmail.com>
parent fd3ba42c
...@@ -67,6 +67,7 @@ enum { ...@@ -67,6 +67,7 @@ enum {
/* Mount options that take no arguments */ /* Mount options that take no arguments */
Opt_user_xattr, Opt_nouser_xattr, Opt_user_xattr, Opt_nouser_xattr,
Opt_forceuid, Opt_noforceuid, Opt_forceuid, Opt_noforceuid,
Opt_forcegid, Opt_noforcegid,
Opt_noblocksend, Opt_noautotune, Opt_noblocksend, Opt_noautotune,
Opt_hard, Opt_soft, Opt_perm, Opt_noperm, Opt_hard, Opt_soft, Opt_perm, Opt_noperm,
Opt_mapchars, Opt_nomapchars, Opt_sfu, Opt_mapchars, Opt_nomapchars, Opt_sfu,
...@@ -117,6 +118,8 @@ static const match_table_t cifs_mount_option_tokens = { ...@@ -117,6 +118,8 @@ static const match_table_t cifs_mount_option_tokens = {
{ Opt_nouser_xattr, "nouser_xattr" }, { Opt_nouser_xattr, "nouser_xattr" },
{ Opt_forceuid, "forceuid" }, { Opt_forceuid, "forceuid" },
{ Opt_noforceuid, "noforceuid" }, { Opt_noforceuid, "noforceuid" },
{ Opt_forcegid, "forcegid" },
{ Opt_noforcegid, "noforcegid" },
{ Opt_noblocksend, "noblocksend" }, { Opt_noblocksend, "noblocksend" },
{ Opt_noautotune, "noautotune" }, { Opt_noautotune, "noautotune" },
{ Opt_hard, "hard" }, { Opt_hard, "hard" },
...@@ -1195,6 +1198,12 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, ...@@ -1195,6 +1198,12 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
case Opt_noforceuid: case Opt_noforceuid:
override_uid = 0; override_uid = 0;
break; break;
case Opt_forcegid:
override_gid = 1;
break;
case Opt_noforcegid:
override_gid = 0;
break;
case Opt_noblocksend: case Opt_noblocksend:
vol->noblocksnd = 1; vol->noblocksnd = 1;
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment