提交 f3aba4e5 编写于 作者: J J. Bruce Fields

nfsd4: remove unnecessary cl_verifier check from setclientid_confirm

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: NJ. Bruce Fields <bfields@citi.umich.edu>
上级 f394baad
...@@ -837,7 +837,6 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp, ...@@ -837,7 +837,6 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
*/ */
if ((conf && unconf) && if ((conf && unconf) &&
(same_verf(&unconf->cl_confirm, &confirm)) && (same_verf(&unconf->cl_confirm, &confirm)) &&
(same_verf(&conf->cl_verifier, &unconf->cl_verifier)) &&
(!same_verf(&conf->cl_confirm, &unconf->cl_confirm))) { (!same_verf(&conf->cl_confirm, &unconf->cl_confirm))) {
/* /*
* RFC 3530 14.2.34 CASE 1: * RFC 3530 14.2.34 CASE 1:
...@@ -855,9 +854,7 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp, ...@@ -855,9 +854,7 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
status = nfs_ok; status = nfs_ok;
} }
} else if ((conf && !unconf) || } else if (conf && !unconf) {
((conf && unconf) &&
!same_verf(&conf->cl_verifier, &unconf->cl_verifier))) {
/* /*
* RFC 3530 14.2.34 CASE 2: * RFC 3530 14.2.34 CASE 2:
* probable retransmitted request; play it safe and * probable retransmitted request; play it safe and
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册