From 7b8699f78ceb71162f52cac5e4b9b3a83e06ef9c Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Tue, 20 Nov 2007 16:52:07 -0500 Subject: [PATCH] --- yaml --- r: 82431 b: refs/heads/master c: f3aba4e5a1b963c8bd43394cb15fb9fb6a229cd2 h: refs/heads/master i: 82429: e156cc7a425d7884efff7da8cb75476b030b23cf 82427: 6b81eb20a367c454f8539a4874096677e45dc000 82423: 940e7f1672c08dfa9aa39d7b69c770107b912e87 82415: 55b2f4154119440a3d117c45ebdd1d136f075cf7 82399: 9c1ece6f5891df1422a2cf00f5aaacbae17b6e62 82367: 681bc993b4d2e9e7807a2b89e199910b3c0760e2 82303: e8e7fce6eb94ea72c0b0f88f144c5d49f4e38391 82175: aa6c1d018b5a2cf015db6c2fc1fbccceb312a363 81919: 86990bbb9e4622883ae58e694d03b932f7543f22 v: v3 --- [refs] | 2 +- trunk/fs/nfsd/nfs4state.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 97d2eb36cec3..4faa280acdbe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f394baad139f8a67a40b4246d53d3b818af2eb88 +refs/heads/master: f3aba4e5a1b963c8bd43394cb15fb9fb6a229cd2 diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c index df3e7a7ad31e..23b5fc71f9fb 100644 --- a/trunk/fs/nfsd/nfs4state.c +++ b/trunk/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