leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nfsd4: merge last two setclientid cases

Browse Source 
The code here is mostly the same.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
J. Bruce Fields 2012-05-18 22:00:38 -04:00
parent 63db46328a
commit ad72aae5ad
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/nfsd/nfs4state.c
View File

@ -2212,15 +2212,10 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
if (new == NULL) if (new == NULL)
goto out; goto out;
copy_clid(new, conf); copy_clid(new, conf);
} else if (!unconf) { } else { /* conf && !same_verf(): */
/* case 2: probable client reboot: */ /* cases 2, 3: probable client reboot: */
new = create_client(clname, dname, rqstp, &clverifier); if (unconf)
if (new == NULL) expire_client(unconf);
goto out;
gen_clid(new);
} else {
/* case 3: probable client reboot: */
expire_client(unconf);
new = create_client(clname, dname, rqstp, &clverifier); new = create_client(clname, dname, rqstp, &clverifier);
if (new == NULL) if (new == NULL)
goto out; goto out;