svcrpc: move some initialization to common code

Minor cleanup, no change in behavior.

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

diff --git a/net/sunrpc/svcauth.c b/net/sunrpc/svcauth.c
index 79c0f3459b5c300ea4447d9f86f0ef7c28796447..69841db1f5335a29b27db08ce701f049e28ed2ea 100644 (file)
--- a/net/sunrpc/svcauth.c
+++ b/net/sunrpc/svcauth.c
@@ -55,6 +55,7 @@ svc_authenticate(struct svc_rqst *rqstp, __be32 *authp)
        spin_unlock(&authtab_lock);
 
        rqstp->rq_auth_slack = 0;
+       init_svc_cred(&rqstp->rq_cred);
 
        rqstp->rq_authop = aops;
        return aops->accept(rqstp, authp);
@@ -63,6 +64,7 @@ EXPORT_SYMBOL_GPL(svc_authenticate);
 
 int svc_set_client(struct svc_rqst *rqstp)
 {
+       rqstp->rq_client = NULL;
        return rqstp->rq_authop->set_client(rqstp);
 }
 EXPORT_SYMBOL_GPL(svc_set_client);

diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
index 621ca7b4a1552e393f332fda279be25d7f082152..dfacdc95b3f52010b3342c53dbd06788f1378128 100644 (file)
--- a/net/sunrpc/svcauth_unix.c
+++ b/net/sunrpc/svcauth_unix.c
@@ -728,10 +728,6 @@ svcauth_null_accept(struct svc_rqst *rqstp, __be32 *authp)
        struct kvec     *resv = &rqstp->rq_res.head[0];
        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)
                return SVC_GARBAGE;
 
@@ -794,10 +790,6 @@ svcauth_unix_accept(struct svc_rqst *rqstp, __be32 *authp)
        u32             slen, i;
        int             len   = argv->iov_len;
 
-       cred->cr_group_info = NULL;
-       cred->cr_principal = NULL;
-       rqstp->rq_client = NULL;
-
        if ((len -= 3*4) < 0)
                return SVC_GARBAGE;