summaryrefslogtreecommitdiffstats
path: root/fs/nfsd
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2012-05-18 22:00:38 -0400
committerJ. Bruce Fields <bfields@redhat.com>2012-05-31 20:30:00 -0400
commitad72aae5ada1970f423ae7ee0027d0d7eb477597 (patch)
tree33b41826e3cedb3a70cf8bd7f81e453b0469cfb4 /fs/nfsd
parent63db46328a9854d0adcde69871a28d94e0fc7746 (diff)
downloadlinux-ad72aae5ada1970f423ae7ee0027d0d7eb477597.tar.bz2
nfsd4: merge last two setclientid cases
The code here is mostly the same. Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
-rw-r--r--fs/nfsd/nfs4state.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index dd4c6d36534b..f62ab7624b1f 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -2212,15 +2212,10 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
if (new == NULL)
goto out;
copy_clid(new, conf);
- } else if (!unconf) {
- /* case 2: probable client reboot: */
- new = create_client(clname, dname, rqstp, &clverifier);
- if (new == NULL)
- goto out;
- gen_clid(new);
- } else {
- /* case 3: probable client reboot: */
- expire_client(unconf);
+ } else { /* conf && !same_verf(): */
+ /* cases 2, 3: probable client reboot: */
+ if (unconf)
+ expire_client(unconf);
new = create_client(clname, dname, rqstp, &clverifier);
if (new == NULL)
goto out;