diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/nfsd/nfs4state.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 9f6322e830fa..df3e7a7ad31e 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
@@ -838,7 +838,6 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp, | |||
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)) && | 840 | (same_verf(&conf->cl_verifier, &unconf->cl_verifier)) && |
841 | (same_name(conf->cl_recdir,unconf->cl_recdir)) && | ||
842 | (!same_verf(&conf->cl_confirm, &unconf->cl_confirm))) { | 841 | (!same_verf(&conf->cl_confirm, &unconf->cl_confirm))) { |
843 | /* | 842 | /* |
844 | * RFC 3530 14.2.34 CASE 1: | 843 | * RFC 3530 14.2.34 CASE 1: |
@@ -858,8 +857,7 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp, | |||
858 | } | 857 | } |
859 | } else if ((conf && !unconf) || | 858 | } else if ((conf && !unconf) || |
860 | ((conf && unconf) && | 859 | ((conf && unconf) && |
861 | (!same_verf(&conf->cl_verifier, &unconf->cl_verifier) || | 860 | !same_verf(&conf->cl_verifier, &unconf->cl_verifier))) { |
862 | !same_name(conf->cl_recdir, unconf->cl_recdir)))) { | ||
863 | /* | 861 | /* |
864 | * RFC 3530 14.2.34 CASE 2: | 862 | * RFC 3530 14.2.34 CASE 2: |
865 | * probable retransmitted request; play it safe and | 863 | * probable retransmitted request; play it safe and |