Skip to content

Commit

Permalink
nfsd: eliminate final bogus case from setclientid logic
Browse files Browse the repository at this point in the history
We're supposed to generate a different cl_confirm verifier for each new
client, so these to cl_confirm values should never be the same.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
  • Loading branch information
J. Bruce Fields committed Feb 1, 2008
1 parent a186e76 commit 49ba878
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions fs/nfsd/nfs4state.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
Expand Down

0 comments on commit 49ba878

Please sign in to comment.