Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f3aba4e5a1b963c8bd43394cb15fb9fb6a229cd2
Commit: f3aba4e5a1b963c8bd43394cb15fb9fb6a229cd2
Parent: f394baad139f8a67a40b4246d53d3b818af2eb88
Author: J. Bruce Fields <[EMAIL PROTECTED]>
AuthorDate: Tue Nov 20 16:52:07 2007 -0500
Committer: J. Bruce Fields <[EMAIL PROTECTED]>
CommitDate: Fri Feb 1 16:42:05 2008 -0500
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: J. Bruce Fields <[EMAIL PROTECTED]>
---
fs/nfsd/nfs4state.c | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index df3e7a7..23b5fc7 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -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:
@@ -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
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
