dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

nfsd4: merge 3 setclientid cases to 2 

Boy, is this simpler.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
J. Bruce Fields 2012-05-18 22:23:42 -04:00
parent 8f9307119d
commit 34b232bb37
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/nfsd/nfs4state.c
View File

@ -2195,16 +2195,11 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
new = create_client(clname, dname, rqstp, &clverifier);
if (new == NULL)
goto out;
if (!conf) {
/* case 4: placed first, because it's the normal case */
gen_clid(new);
} else if (same_verf(&conf->cl_verifier, &clverifier)) {
if (conf && same_verf(&conf->cl_verifier, &clverifier))
/* case 1: probable callback update */
copy_clid(new, conf);
} else { /* conf && !same_verf(): */
/* cases 2, 3: probable client reboot: */
else /* case 4 (new client) or cases 2, 3 (client reboot): */
gen_clid(new);
}
/*
* XXX: we should probably set this at creation time, and check
* for consistent minorversion use throughout: