cifs: reinstate the forcegid option

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

Cc: Sachin Prabhu <sprabhu@redhat.com>
Cc: stable@vger.kernel.org # v3.4+
Reported-by: Gregory Lee Bartholomew <gregory.lee.bartholomew@gmail.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <smfrench@gmail.com>

1 files changed, 9 insertions, 0 deletions

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 2fdbe08a7a2..5c670b998ff 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -67,6 +67,7 @@ enum {
         /* Mount options that take no arguments */
         Opt_user_xattr, Opt_nouser_xattr,
         Opt_forceuid, Opt_noforceuid,
+        Opt_forcegid, Opt_noforcegid,
         Opt_noblocksend, Opt_noautotune,
         Opt_hard, Opt_soft, Opt_perm, Opt_noperm,
         Opt_mapchars, Opt_nomapchars, Opt_sfu,
@@ -117,6 +118,8 @@ static const match_table_t cifs_mount_option_tokens = {
         { Opt_nouser_xattr, "nouser_xattr" },
         { Opt_forceuid, "forceuid" },
         { Opt_noforceuid, "noforceuid" },
+        { Opt_forcegid, "forcegid" },
+        { Opt_noforcegid, "noforcegid" },
         { Opt_noblocksend, "noblocksend" },
         { Opt_noautotune, "noautotune" },
         { Opt_hard, "hard" },
@@ -1195,6 +1198,12 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
                 case Opt_noforceuid:
                         override_uid = 0;
                         break;
+                case Opt_forcegid:
+                        override_gid = 1;
+                        break;
+                case Opt_noforcegid:
+                        override_gid = 0;
+                        break;
                 case Opt_noblocksend:
                         vol->noblocksnd = 1;
                         break;