diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2007-11-20 15:54:10 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2008-02-01 16:42:06 -0500 |
| commit | 366e0c1d9116ed03320779ecf9c162204f4c712e (patch) | |
| tree | 5610f88a5a98d1ba4544d7ed18a9d497f3c63228 | |
| parent | f3aba4e5a1b963c8bd43394cb15fb9fb6a229cd2 (diff) | |
| download | op-kernel-dev-366e0c1d9116ed03320779ecf9c162204f4c712e.zip op-kernel-dev-366e0c1d9116ed03320779ecf9c162204f4c712e.tar.gz | |
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 <bfields@citi.umich.edu>
| -rw-r--r-- | 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 |
