diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2013-03-14 18:20:01 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2013-04-03 11:48:36 -0400 |
| commit | c0293b0131a8d582af85023c684786f7536f0767 (patch) | |
| tree | a3df8753a4fa892d031b16e88cbc8966523ce2ba | |
| parent | 1ca507920db36aea8b81fe1443f96a1a6a43318f (diff) | |
| download | op-kernel-dev-c0293b0131a8d582af85023c684786f7536f0767.zip op-kernel-dev-c0293b0131a8d582af85023c684786f7536f0767.tar.gz | |
nfsd4: destroy_clientid simplification
I'm not sure what the check for clientid expiry was meant to do here.
The check for a matching session is redundant given the previous check
for state: a client without state is, in particular, a client without
sessions.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
| -rw-r--r-- | fs/nfsd/nfs4state.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 84dfbdf..905a5b5 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -2131,13 +2131,7 @@ nfsd4_destroy_clientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *csta if (conf) { clp = conf; - if (!is_client_expired(conf) && client_has_state(conf)) { - status = nfserr_clientid_busy; - goto out; - } - - /* rfc5661 18.50.3 */ - if (cstate->session && conf == cstate->session->se_client) { + if (client_has_state(conf)) { status = nfserr_clientid_busy; goto out; } |
