diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2015-11-23 15:39:12 -0700 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2015-11-24 10:39:18 -0700 |
| commit | 50c7b948adbd1f8f0475fa0c92abb51c8a49f847 (patch) | |
| tree | 5586fd5053b8daaf342fafc49b54c05d48f82918 | |
| parent | 50043859325b377e728676d31aad7affaf91b2ce (diff) | |
| download | op-kernel-dev-50c7b948adbd1f8f0475fa0c92abb51c8a49f847.zip op-kernel-dev-50c7b948adbd1f8f0475fa0c92abb51c8a49f847.tar.gz | |
nfsd: minor consolidation of mach_cred handling code
Minor cleanup, no change in functionality.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
| -rw-r--r-- | fs/nfsd/nfs4state.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 641604a..efa3d4c 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -2375,10 +2375,17 @@ nfsd4_exchange_id(struct svc_rqst *rqstp, if (exid->flags & ~EXCHGID4_FLAG_MASK_A) return nfserr_inval; + new = create_client(exid->clname, rqstp, &verf); + if (new == NULL) + return nfserr_jukebox; + switch (exid->spa_how) { case SP4_MACH_CRED: - if (!svc_rqst_integrity_protected(rqstp)) - return nfserr_inval; + if (!svc_rqst_integrity_protected(rqstp)) { + status = nfserr_inval; + goto out_nolock; + } + new->cl_mach_cred = true; case SP4_NONE: break; default: /* checked by xdr code */ @@ -2387,10 +2394,6 @@ nfsd4_exchange_id(struct svc_rqst *rqstp, return nfserr_encr_alg_unsupp; } - new = create_client(exid->clname, rqstp, &verf); - if (new == NULL) - return nfserr_jukebox; - /* Cases below refer to rfc 5661 section 18.35.4: */ spin_lock(&nn->client_lock); conf = find_confirmed_client_by_name(&exid->clname, nn); @@ -2452,7 +2455,6 @@ out_new: goto out; } new->cl_minorversion = cstate->minorversion; - new->cl_mach_cred = (exid->spa_how == SP4_MACH_CRED); gen_clid(new, nn); add_to_unconfirmed(new); @@ -2470,6 +2472,7 @@ out_copy: out: spin_unlock(&nn->client_lock); +out_nolock: if (new) expire_client(new); if (unconf) |
