nfsd4: remove unnecessary cl_verifier check from setclientid_confirm

Again, the only way conf and unconf can have the same clientid is if
they were created in the "probable callback update" case of setclientid,
in which case we already know that the cl_verifier fields must agree.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index df3e7a7ad31e4e17c65c18eb531c2bdfe4a791c4..23b5fc71f9fb88422af0982266636221329a63ff 100644 (file)
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -837,7 +837,6 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
         */
        if ((conf && unconf) && 
            (same_verf(&unconf->cl_confirm, &confirm)) &&
-           (same_verf(&conf->cl_verifier, &unconf->cl_verifier)) &&
            (!same_verf(&conf->cl_confirm, &unconf->cl_confirm))) {
                /*
                 * RFC 3530 14.2.34 CASE 1:
@@ -855,9 +854,7 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
                        status = nfs_ok;
 
                }
-       } else if ((conf && !unconf) ||
-           ((conf && unconf) && 
-            !same_verf(&conf->cl_verifier, &unconf->cl_verifier))) {
+       } else if (conf && !unconf) {
                /*
                 * RFC 3530 14.2.34 CASE 2:
                 * probable retransmitted request; play it safe and