aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd
diff options
context:
space:
mode:
Diffstat (limited to 'fs/nfsd')
-rw-r--r--fs/nfsd/nfs4state.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 242fee7c1018..035e70a01027 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -769,7 +769,7 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
769 if (new == NULL) 769 if (new == NULL)
770 goto out; 770 goto out;
771 gen_clid(new); 771 gen_clid(new);
772 } else if (!same_verf(&conf->cl_confirm, &unconf->cl_confirm)) { 772 } else {
773 /* 773 /*
774 * RFC 3530 14.2.33 CASE 3: 774 * RFC 3530 14.2.33 CASE 3:
775 * probable client reboot; state will be removed if 775 * probable client reboot; state will be removed if
@@ -780,11 +780,6 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
780 if (new == NULL) 780 if (new == NULL)
781 goto out; 781 goto out;
782 gen_clid(new); 782 gen_clid(new);
783 } else {
784 /* No cases hit !!! */
785 status = nfserr_inval;
786 goto out;
787
788 } 783 }
789 copy_verf(new, &clverifier); 784 copy_verf(new, &clverifier);
790 new->cl_addr = sin->sin_addr.s_addr; 785 new->cl_addr = sin->sin_addr.s_addr;