nfsd4: merge last two setclientid cases

The code here is mostly the same.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index dd4c6d36534b2713661ecfbaf60649d13deeb327..f62ab7624b1f4ef5db7d7b33fabe11d3e23994a0 100644 (file)
--- 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;