---

yaml
---
r: 82431
b: refs/heads/master
c: f3aba4e
h: refs/heads/master
i:
  82429: e156cc7
  82427: 6b81eb2
  82423: 940e7f1
  82415: 55b2f41
  82399: 9c1ece6
  82367: 681bc99
  82303: e8e7fce
  82175: aa6c1d0
  81919: 86990bb
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f394baad139f8a67a40b4246d53d3b818af2eb88
+refs/heads/master: f3aba4e5a1b963c8bd43394cb15fb9fb6a229cd2

trunk/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