Skip to content

Commit

Permalink
nfsd4: remove unnecessary cl_verifier check from setclientid_confirm
Browse files Browse the repository at this point in the history
Again, the only way conf and unconf can have the same clientid is if
they were created in the "probable callback update" case of setclientid,
in which case we already know that the cl_verifier fields must agree.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
  • Loading branch information
J. Bruce Fields committed Feb 1, 2008
1 parent f394baa commit f3aba4e
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions fs/nfsd/nfs4state.c
Original file line number Diff line number Diff line change
Expand Up @@ -837,7 +837,6 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
*/
if ((conf && unconf) &&
(same_verf(&unconf->cl_confirm, &confirm)) &&
(same_verf(&conf->cl_verifier, &unconf->cl_verifier)) &&
(!same_verf(&conf->cl_confirm, &unconf->cl_confirm))) {
/*
* RFC 3530 14.2.34 CASE 1:
Expand All @@ -855,9 +854,7 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
status = nfs_ok;

}
} else if ((conf && !unconf) ||
((conf && unconf) &&
!same_verf(&conf->cl_verifier, &unconf->cl_verifier))) {
} else if (conf && !unconf) {
/*
* RFC 3530 14.2.34 CASE 2:
* probable retransmitted request; play it safe and
Expand Down

0 comments on commit f3aba4e

Please sign in to comment.