OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nfsd4: exchange_id cleanup: local shorthands for repeated tests 

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
J. Bruce Fields 2012-05-14 09:08:10 -04:00
parent 1a308118c2
commit 83e08fd46c
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fs/nfsd/nfs4state.c
View File

@ -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;
}