nfsd4: kill unneeded cl_confirm check

We generate a unique cl_confirm for every new client; so if we've
already checked that this cl_confirm agrees with the cl_confirm of
unconf, then we already know that it does not agree with the cl_confirm
of conf.

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

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 23b5fc71f9fb88422af0982266636221329a63ff..60cc937b7076c4df365ae8c5056e18ffcbc75ce5 100644 (file)
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -835,9 +835,7 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
         * SETCLIENTID_CONFIRM request processing consisting
         * of 4 bullet points, labeled as CASE1 - CASE4 below.
         */
-       if ((conf && unconf) && 
-           (same_verf(&unconf->cl_confirm, &confirm)) &&
-           (!same_verf(&conf->cl_confirm, &unconf->cl_confirm))) {
+       if (conf && unconf && same_verf(&confirm, &unconf->cl_confirm)) {
                /*
                 * RFC 3530 14.2.34 CASE 1:
                 * callback update