Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

fs/cifs/connect.c

+9 −0
Original line number Diff line number Diff line
@@ -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;