Skip to content

Commit

Permalink
nfsd4: destroy_clientid simplification
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
J. Bruce Fields committed Apr 3, 2013
1 parent 1ca5079 commit c0293b0
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions fs/nfsd/nfs4state.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit c0293b0

Please sign in to comment.