Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=366e0c1d9116ed03320779ecf9c162204f4c712e
Commit:     366e0c1d9116ed03320779ecf9c162204f4c712e
Parent:     f3aba4e5a1b963c8bd43394cb15fb9fb6a229cd2
Author:     J. Bruce Fields <[EMAIL PROTECTED]>
AuthorDate: Tue Nov 20 15:54:10 2007 -0500
Committer:  J. Bruce Fields <[EMAIL PROTECTED]>
CommitDate: Fri Feb 1 16:42:06 2008 -0500

    nfsd4: kill unneeded cl_confirm check
    
    We generate a unique cl_confirm for every new client; so if we've
    already checked that this cl_confirm agrees with the cl_confirm of
    unconf, then we already know that it does not agree with the cl_confirm
    of conf.
    
    Signed-off-by: J. Bruce Fields <[EMAIL PROTECTED]>
---
 fs/nfsd/nfs4state.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 23b5fc7..60cc937 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -835,9 +835,7 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
         * SETCLIENTID_CONFIRM request processing consisting
         * of 4 bullet points, labeled as CASE1 - CASE4 below.
         */
-       if ((conf && unconf) && 
-           (same_verf(&unconf->cl_confirm, &confirm)) &&
-           (!same_verf(&conf->cl_confirm, &unconf->cl_confirm))) {
+       if (conf && unconf && same_verf(&confirm, &unconf->cl_confirm)) {
                /*
                 * RFC 3530 14.2.34 CASE 1:
                 * callback update
-
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

Reply via email to