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

    nfsd4: kill unnecessary same_name() in setclientid_confirm
    
    If conf and unconf are both found in the lookup by cl_clientid, then
    they share the same cl_clientid.  We always create a unique new
    cl_clientid field when creating a new client--the only exception is the
    "probable callback update" case in setclientid, where we copy the old
    cl_clientid from another clientid with the same name.
    
    Therefore two clients with the same cl_client field also always share
    the same cl_name field, and a couple of the checks here are redundant.
    
    Thanks to Simon Holm Th√łgersen for a compile fix.
    
    Signed-off-by: J. Bruce Fields <[EMAIL PROTECTED]>
    Cc: Simon Holm Th√łgersen <[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 9f6322e..df3e7a7 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -838,7 +838,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_name(conf->cl_recdir,unconf->cl_recdir))  &&
            (!same_verf(&conf->cl_confirm, &unconf->cl_confirm))) {
                /*
                 * RFC 3530 14.2.34 CASE 1:
@@ -858,8 +857,7 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
                }
        } else if ((conf && !unconf) ||
            ((conf && unconf) && 
-            (!same_verf(&conf->cl_verifier, &unconf->cl_verifier) ||
-             !same_name(conf->cl_recdir, unconf->cl_recdir)))) {
+            !same_verf(&conf->cl_verifier, &unconf->cl_verifier))) {
                /*
                 * 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

Reply via email to