3 files changed, 21 insertions, 19 deletions

diff --git a/fs/nfsd/auth.c b/fs/nfsd/auth.c
index 294992e9bf69..808fc03a6fbd 100644
--- a/fs/nfsd/auth.c
+++ b/fs/nfsd/auth.c
@@ -27,6 +27,7 @@ int nfsexp_flags(struct svc_rqst *rqstp, struct svc_export *exp)
 
 int nfsd_setuser(struct svc_rqst *rqstp, struct svc_export *exp)
 {
+        struct cred *act_as = current->cred ;
         struct svc_cred cred = rqstp->rq_cred;
         int i;
         int flags = nfsexp_flags(rqstp, exp);
@@ -55,25 +56,26 @@ int nfsd_setuser(struct svc_rqst *rqstp, struct svc_export *exp)
                 get_group_info(cred.cr_group_info);
 
         if (cred.cr_uid != (uid_t) -1)
-                current->fsuid = cred.cr_uid;
+                act_as->fsuid = cred.cr_uid;
         else
-                current->fsuid = exp->ex_anon_uid;
+                act_as->fsuid = exp->ex_anon_uid;
         if (cred.cr_gid != (gid_t) -1)
-                current->fsgid = cred.cr_gid;
+                act_as->fsgid = cred.cr_gid;
         else
-                current->fsgid = exp->ex_anon_gid;
+                act_as->fsgid = exp->ex_anon_gid;
 
         if (!cred.cr_group_info)
                 return -ENOMEM;
-        ret = set_current_groups(cred.cr_group_info);
+        ret = set_groups(act_as, cred.cr_group_info);
         put_group_info(cred.cr_group_info);
         if ((cred.cr_uid)) {
-                current->cap_effective =
-                        cap_drop_nfsd_set(current->cap_effective);
+                act_as->cap_effective =
+                        cap_drop_nfsd_set(act_as->cap_effective);
         } else {
-                current->cap_effective =
-                        cap_raise_nfsd_set(current->cap_effective,
-                                           current->cap_permitted);
+                act_as->cap_effective =
+                        cap_raise_nfsd_set(act_as->cap_effective,
+                                           act_as->cap_permitted);
         }
         return ret;
 }
+
diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c
index bb93946ace22..a5e14e8695ea 100644
--- a/fs/nfsd/nfs4recover.c
+++ b/fs/nfsd/nfs4recover.c
@@ -57,17 +57,17 @@ static int rec_dir_init = 0;
 static void
 nfs4_save_user(uid_t *saveuid, gid_t *savegid)
 {
-        *saveuid = current->fsuid;
-        *savegid = current->fsgid;
-        current->fsuid = 0;
-        current->fsgid = 0;
+        *saveuid = current->cred->fsuid;
+        *savegid = current->cred->fsgid;
+        current->cred->fsuid = 0;
+        current->cred->fsgid = 0;
 }
 
 static void
 nfs4_reset_user(uid_t saveuid, gid_t savegid)
 {
-        current->fsuid = saveuid;
-        current->fsgid = savegid;
+        current->cred->fsuid = saveuid;
+        current->cred->fsgid = savegid;
 }
 
 static void
diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c
index cd25d91895a1..e67cfaea0865 100644
--- a/fs/nfsd/nfsfh.c
+++ b/fs/nfsd/nfsfh.c
@@ -186,9 +186,9 @@ static __be32 nfsd_set_fh_dentry(struct svc_rqst *rqstp, struct svc_fh *fhp)
                  * access control settings being in effect, we cannot
                  * fix that case easily.
                  */
-                current->cap_effective =
-                        cap_raise_nfsd_set(current->cap_effective,
-                                           current->cap_permitted);
+                current->cred->cap_effective =
+                        cap_raise_nfsd_set(current->cred->cap_effective,
+                                           current->cred->cap_permitted);
         } else {
                 error = nfsd_setuser_and_check_port(rqstp, exp);
                 if (error)