nfsd4: rearrange exchange_id logic to simplify

Minor cleanup: it's simpler to have separate code paths for the update
and non-update cases.

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

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 93fcf53daee105f68506b9f0df18a1bd3cdc6e25..491f13a70db132e33118c543297e9a860adb3e79 100644 (file)
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -1557,36 +1557,36 @@ nfsd4_exchange_id(struct svc_rqst *rqstp,
                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 (update) { /* buggy client */
+               if (update) {
+                       if (!clp_used_exchangeid(conf)) { /* buggy client */
                                status = nfserr_inval;
                                goto out;
                        }
-               }
-               if (!creds_match) { /* case 9 */
-                       if (update)
+                       if (!creds_match) { /* case 9 */
                                status = nfserr_perm;
-                       else /* case 3 */
-                               status = nfserr_clid_inuse;
-                       goto out;
-               }
-               if (!verfs_match) { /* case 8 */
-                       if (update) {
+                               goto out;
+                       }
+                       if (!verfs_match) { /* case 8 */
                                status = nfserr_not_same;
                                goto out;
                        }
-                       /* case 5, client reboot */
-                       expire_client(conf);
-                       goto out_new;
+                       /* case 6 */
+                       exid->flags |= EXCHGID4_FLAG_CONFIRMED_R;
+                       new = conf;
+                       goto out_copy;
                }
-               if (!clp_used_exchangeid(conf)) {
-                       status = nfserr_inval;
+               if (!creds_match) { /* case 3 */
+                       status = nfserr_clid_inuse;
                        goto out;
                }
-               /* case 2 */
-               exid->flags |= EXCHGID4_FLAG_CONFIRMED_R;
-               new = conf;
-               goto out_copy;
+               if (verfs_match) { /* case 2 */
+                       exid->flags |= EXCHGID4_FLAG_CONFIRMED_R;
+                       new = conf;
+                       goto out_copy;
+               }
+               /* case 5, client reboot */
+               expire_client(conf);
+               goto out_new;
        }
 
        if (update) { /* case 7 */