| From 72bd481f860f0125c810bb43d878ce5f9c060c58 Mon Sep 17 00:00:00 2001 |
| From: Jeff Layton <jlayton@redhat.com> |
| Date: Wed, 3 Oct 2012 16:02:36 -0400 |
| Subject: cifs: reinstate the forcegid option |
| |
| From: Jeff Layton <jlayton@redhat.com> |
| |
| commit 72bd481f860f0125c810bb43d878ce5f9c060c58 upstream. |
| |
| Apparently this was lost when we converted to the standard option |
| parser in 8830d7e07a5e38bc47650a7554b7c1cfd49902bf |
| |
| Reported-by: Gregory Lee Bartholomew <gregory.lee.bartholomew@gmail.com> |
| Cc: Sachin Prabhu <sprabhu@redhat.com> |
| Signed-off-by: Jeff Layton <jlayton@redhat.com> |
| Signed-off-by: Steve French <smfrench@gmail.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| fs/cifs/connect.c | 9 +++++++++ |
| 1 file changed, 9 insertions(+) |
| |
| --- a/fs/cifs/connect.c |
| +++ b/fs/cifs/connect.c |
| @@ -70,6 +70,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, |
| @@ -121,6 +122,8 @@ static const match_table_t cifs_mount_op |
| { 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" }, |
| @@ -1345,6 +1348,12 @@ cifs_parse_mount_options(const char *mou |
| 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; |
