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

nfsd4: less confusing nfsd4_compound_in_session 



Make the function prototype match the name a little better.

Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent a8585763

fs/nfsd/nfs4state.c

+4 −4
Original line number Diff line number Diff line
@@ -2956,11 +2956,11 @@ __be32 nfsd4_bind_conn_to_session(struct svc_rqst *rqstp, 
	return status;

}



static bool nfsd4_compound_in_session(struct nfsd4_session *session, struct nfs4_sessionid *sid)

static bool nfsd4_compound_in_session(struct nfsd4_compound_state *cstate, struct nfs4_sessionid *sid)

{

	if (!session)

	if (!cstate->session)

		return false;

	return !memcmp(sid, &session->se_sessionid, sizeof(*sid));

	return !memcmp(sid, &cstate->session->se_sessionid, sizeof(*sid));

}



__be32
@@ -2975,7 +2975,7 @@ nfsd4_destroy_session(struct svc_rqst *r, struct nfsd4_compound_state *cstate, 
	struct nfsd_net *nn = net_generic(net, nfsd_net_id);



	status = nfserr_not_only_op;

	if (nfsd4_compound_in_session(cstate->session, &sessionid->sessionid)) {

	if (nfsd4_compound_in_session(cstate, &sessionid->sessionid)) {

		if (!nfsd4_last_compound_op(r))

			goto out;

		ref_held_by_me++;