nfsd: eliminate final bogus case from setclientid logic

[linux-2.6-block.git] / fs / nfsd / nfs4state.c

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 242fee7c10187424215a5528626e76d9e54a5760..035e70a01027a6747d5b28acb5c9220a8e201dde 100644 (file)
--- 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,
                if (new == NULL)
                        goto out;
                gen_clid(new);
-       } else if (!same_verf(&conf->cl_confirm, &unconf->cl_confirm)) {
+       } else {
                /*
                 * RFC 3530 14.2.33 CASE 3:
                 * probable client reboot; state will be removed if
@@ -780,11 +780,6 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                if (new == NULL)
                        goto out;
                gen_clid(new);
-       } else {
-               /* No cases hit !!! */
-               status = nfserr_inval;
-               goto out;
-
        }
        copy_verf(new, &clverifier);
        new->cl_addr = sin->sin_addr.s_addr;