nfsd4: move principal name into svc_cred

Instead of keeping the principal name associated with a request in a
structure that's private to auth_gss and using an accessor function,
move it to svc_cred.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>

2 files changed, 8 insertions, 19 deletions

diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
index f0a0cd4470b7..d091d7d09bea 100644
--- a/net/sunrpc/auth_gss/svcauth_gss.c
+++ b/net/sunrpc/auth_gss/svcauth_gss.c
@@ -335,7 +335,6 @@ struct rsc {
         struct svc_cred         cred;
         struct gss_svc_seq_data seqdata;
         struct gss_ctx          *mechctx;
-        char                    *client_name;
 };
 
 static struct rsc *rsc_update(struct cache_detail *cd, struct rsc *new, struct rsc *old);
@@ -346,9 +345,7 @@ static void rsc_free(struct rsc *rsci)
         kfree(rsci->handle.data);
         if (rsci->mechctx)
                 gss_delete_sec_context(&rsci->mechctx);
-        if (rsci->cred.cr_group_info)
-                put_group_info(rsci->cred.cr_group_info);
-        kfree(rsci->client_name);
+        free_svc_cred(&rsci->cred);
 }
 
 static void rsc_put(struct kref *ref)
@@ -386,7 +383,7 @@ rsc_init(struct cache_head *cnew, struct cache_head *ctmp)
         tmp->handle.data = NULL;
         new->mechctx = NULL;
         new->cred.cr_group_info = NULL;
-        new->client_name = NULL;
+        new->cred.cr_principal = NULL;
 }
 
 static void
@@ -401,8 +398,8 @@ update_rsc(struct cache_head *cnew, struct cache_head *ctmp)
         spin_lock_init(&new->seqdata.sd_lock);
         new->cred = tmp->cred;
         tmp->cred.cr_group_info = NULL;
-        new->client_name = tmp->client_name;
-        tmp->client_name = NULL;
+        new->cred.cr_principal = tmp->cred.cr_principal;
+        tmp->cred.cr_principal = NULL;
 }
 
 static struct cache_head *
@@ -496,8 +493,8 @@ static int rsc_parse(struct cache_detail *cd,
                 /* get client name */
                 len = qword_get(&mesg, buf, mlen);
                 if (len > 0) {
-                        rsci.client_name = kstrdup(buf, GFP_KERNEL);
-                        if (!rsci.client_name)
+                        rsci.cred.cr_principal = kstrdup(buf, GFP_KERNEL);
+                        if (!rsci.cred.cr_principal)
                                 goto out;
                 }
 
@@ -927,16 +924,6 @@ struct gss_svc_data {
         struct rsc                      *rsci;
 };
 
-char *svc_gss_principal(struct svc_rqst *rqstp)
-{
-        struct gss_svc_data *gd = (struct gss_svc_data *)rqstp->rq_auth_data;
-
-        if (gd && gd->rsci)
-                return gd->rsci->client_name;
-        return NULL;
-}
-EXPORT_SYMBOL_GPL(svc_gss_principal);
-
 static int
 svcauth_gss_set_client(struct svc_rqst *rqstp)
 {
diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
index 9c3b9f014468..12e4897d0bf3 100644
--- a/net/sunrpc/svcauth_unix.c
+++ b/net/sunrpc/svcauth_unix.c
@@ -740,6 +740,7 @@ svcauth_null_accept(struct svc_rqst *rqstp, __be32 *authp)
         struct svc_cred *cred = &rqstp->rq_cred;
 
         cred->cr_group_info = NULL;
+        cred->cr_principal = NULL;
         rqstp->rq_client = NULL;
 
         if (argv->iov_len < 3*4)
@@ -805,6 +806,7 @@ svcauth_unix_accept(struct svc_rqst *rqstp, __be32 *authp)
         int             len   = argv->iov_len;
 
         cred->cr_group_info = NULL;
+        cred->cr_principal = NULL;
         rqstp->rq_client = NULL;
 
         if ((len -= 3*4) < 0)