Commit c0293b01 authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

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: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 1ca50792

fs/nfsd/nfs4state.c

+1 −7
Original line number Diff line number Diff line
@@ -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;

		}