diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2007-11-19 19:09:50 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2008-02-01 16:42:05 -0500 |
| commit | 49ba87811f34a0219dc7a373cd24aa68450f2058 (patch) | |
| tree | c0e50e1378d002c5346451f3bf0aa031f893ff20 | |
| parent | a186e767473bd329122f0229b91573b9b6fa43c1 (diff) | |
| download | op-kernel-dev-49ba87811f34a0219dc7a373cd24aa68450f2058.zip op-kernel-dev-49ba87811f34a0219dc7a373cd24aa68450f2058.tar.gz | |
nfsd: eliminate final bogus case from setclientid logic
We're supposed to generate a different cl_confirm verifier for each new
client, so these to cl_confirm values should never be the same.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
| -rw-r--r-- | fs/nfsd/nfs4state.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 242fee7..035e70a 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -769,7 +769,7 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, if (new == NULL) goto out; gen_clid(new); - } else if (!same_verf(&conf->cl_confirm, &unconf->cl_confirm)) { + } else { /* * RFC 3530 14.2.33 CASE 3: * probable client reboot; state will be removed if @@ -780,11 +780,6 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, if (new == NULL) goto out; gen_clid(new); - } else { - /* No cases hit !!! */ - status = nfserr_inval; - goto out; - } copy_verf(new, &clverifier); new->cl_addr = sin->sin_addr.s_addr; |
