Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd699b8a authored by Jeff Layton's avatar Jeff Layton Committed by J. Bruce Fields
Browse files

nfsd: don't destroy clients that are busy 



It's possible that we'll have an in-progress call on some of the clients
while a rogue EXCHANGE_ID or DESTROY_CLIENTID call comes in. Be sure to
try and mark the client expired first, so that the refcount is
respected.

This will only be a problem once the client_mutex is removed.

Signed-off-by: default avatarJeff Layton <jlayton@primarydata.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent fb94d766

fs/nfsd/nfs4state.c

+8 −2
Original line number Diff line number Diff line
@@ -2267,8 +2267,11 @@ nfsd4_exchange_id(struct svc_rqst *rqstp, 


	/* case 1 (normal case) */

out_new:

	if (conf)

		unhash_client_locked(conf);

	if (conf) {

		status = mark_client_expired_locked(conf);

		if (status)

			goto out;

	}

	new->cl_minorversion = cstate->minorversion;

	new->cl_mach_cred = (exid->spa_how == SP4_MACH_CRED);
@@ -2881,6 +2884,9 @@ nfsd4_destroy_clientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *csta 
			status = nfserr_clientid_busy;

			goto out;

		}

		status = mark_client_expired_locked(conf);

		if (status)

			goto out;

		clp = conf;

	} else if (unconf)

		clp = unconf;