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

Commit c2d1d6a8 authored by Trond Myklebust's avatar Trond Myklebust Committed by J. Bruce Fields
Browse files

nfsd: Remove nfs4_lock_state(): nfs4_preprocess_stateid_op() 



Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 285abdee

fs/nfsd/nfs4state.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -4465,13 +4465,11 @@ nfs4_preprocess_stateid_op(struct net *net, struct nfsd4_compound_state *cstate, 
	if (ZERO_STATEID(stateid) || ONE_STATEID(stateid))

	if (ZERO_STATEID(stateid) || ONE_STATEID(stateid))

		return check_special_stateids(net, current_fh, stateid, flags);

		return check_special_stateids(net, current_fh, stateid, flags);





	nfs4_lock_state();



	status = nfsd4_lookup_stateid(cstate, stateid,

	status = nfsd4_lookup_stateid(cstate, stateid,

				NFS4_DELEG_STID|NFS4_OPEN_STID|NFS4_LOCK_STID,

				NFS4_DELEG_STID|NFS4_OPEN_STID|NFS4_LOCK_STID,

				&s, nn);

				&s, nn);

	if (status)

	if (status)

		goto unlock_state;

		return status;

	status = check_stateid_generation(stateid, &s->sc_stateid, nfsd4_has_session(cstate));

	status = check_stateid_generation(stateid, &s->sc_stateid, nfsd4_has_session(cstate));

	if (status)

	if (status)

		goto out;

		goto out;
@@ -4521,8 +4519,6 @@ nfs4_preprocess_stateid_op(struct net *net, struct nfsd4_compound_state *cstate, 
		*filpp = file;

		*filpp = file;

out:

out:

	nfs4_put_stid(s);

	nfs4_put_stid(s);

unlock_state:

	nfs4_unlock_state();

	return status;

	return status;

}

}