diff options
| author |   J. Bruce Fields <bfields@redhat.com> | 2012-05-14 09:08:10 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2012-05-31 20:29:52 -0400 |
| commit | 83e08fd46cea3b59dce9285461e3854b594042af (patch) | |
| tree | e0c90f655459e83b011a94e85d31df4aac2495d3 /fs/nfsd | |
| parent | nfsd4: allow an EXCHANGE_ID to kill a 4.0 client (diff) | |
| download | linux-dev-83e08fd46cea3b59dce9285461e3854b594042af.tar.xz linux-dev-83e08fd46cea3b59dce9285461e3854b594042af.zip | |
nfsd4: exchange_id cleanup: local shorthands for repeated tests
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index c88f5c103e87..3b6d61008673 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -1520,6 +1520,7 @@ nfsd4_exchange_id(struct svc_rqst *rqstp, char addr_str[INET6_ADDRSTRLEN]; nfs4_verifier verf = exid->verifier; struct sockaddr *sa = svc_addr(rqstp); + bool update = exid->flags & EXCHGID4_FLAG_UPD_CONFIRMED_REC_A; rpc_ntop(sa, addr_str, sizeof(addr_str)); dprintk("%s rqstp=%p exid=%p clname.len=%u clname.data=%p " @@ -1552,23 +1553,26 @@ nfsd4_exchange_id(struct svc_rqst *rqstp, nfs4_lock_state(); conf = find_confirmed_client_by_str(dname, strhashval); if (conf) { + bool creds_match = same_creds(&conf->cl_cred, &rqstp->rq_cred); + bool verfs_match = same_verf(&verf, &conf->cl_verifier); + if (!clp_used_exchangeid(conf)) { - if (exid->flags & EXCHGID4_FLAG_UPD_CONFIRMED_REC_A) { + if (update) { status = nfserr_inval; /* buggy client */ goto out; } } - if (!same_creds(&conf->cl_cred, &rqstp->rq_cred)) { + if (!creds_match) { /* 18.35.4 case 9 */ - if (exid->flags & EXCHGID4_FLAG_UPD_CONFIRMED_REC_A) + if (update) status = nfserr_perm; else /* case 3 */ status = nfserr_clid_inuse; goto out; } - if (!same_verf(&verf, &conf->cl_verifier)) { + if (!verfs_match) { /* 18.35.4 case 8 */ - if (exid->flags & EXCHGID4_FLAG_UPD_CONFIRMED_REC_A) { + if (update) { status = nfserr_not_same; goto out; } @@ -1595,7 +1599,7 @@ nfsd4_exchange_id(struct svc_rqst *rqstp, } /* 18.35.4 case 7 */ - if (exid->flags & EXCHGID4_FLAG_UPD_CONFIRMED_REC_A) { + if (update) { status = nfserr_noent; goto out; } |