From 94dc7e91460547df23c0cecd45e0ecf2e465d03d Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Tue, 20 Nov 2007 15:39:07 -0500 Subject: [PATCH] --- yaml --- r: 82430 b: refs/heads/master c: f394baad139f8a67a40b4246d53d3b818af2eb88 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/nfsd/nfs4state.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b6dd5c8f1d00..97d2eb36cec3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: deda2faa8e71474c828d8eefc8bc0f19d02062ef +refs/heads/master: f394baad139f8a67a40b4246d53d3b818af2eb88 diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c index 9f6322e830fa..df3e7a7ad31e 100644 --- a/trunk/fs/nfsd/nfs4state.c +++ b/trunk/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