aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd/nfs4state.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/nfsd/nfs4state.c')
-rw-r--r--fs/nfsd/nfs4state.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index df3e7a7ad31e..23b5fc71f9fb 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -837,7 +837,6 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
837 */ 837 */
838 if ((conf && unconf) && 838 if ((conf && unconf) &&
839 (same_verf(&unconf->cl_confirm, &confirm)) && 839 (same_verf(&unconf->cl_confirm, &confirm)) &&
840 (same_verf(&conf->cl_verifier, &unconf->cl_verifier)) &&
841 (!same_verf(&conf->cl_confirm, &unconf->cl_confirm))) { 840 (!same_verf(&conf->cl_confirm, &unconf->cl_confirm))) {
842 /* 841 /*
843 * RFC 3530 14.2.34 CASE 1: 842 * RFC 3530 14.2.34 CASE 1:
@@ -855,9 +854,7 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
855 status = nfs_ok; 854 status = nfs_ok;
856 855
857 } 856 }
858 } else if ((conf && !unconf) || 857 } else if (conf && !unconf) {
859 ((conf && unconf) &&
860 !same_verf(&conf->cl_verifier, &unconf->cl_verifier))) {
861 /* 858 /*
862 * RFC 3530 14.2.34 CASE 2: 859 * RFC 3530 14.2.34 CASE 2:
863 * probable retransmitted request; play it safe and 860 * probable retransmitted request; play it safe and