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

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

nfsd: Remove nfs4_lock_state(): nfsd4_lock/locku/lockt() 



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

fs/nfsd/nfs4state.c

+0 −9
Original line number Diff line number Diff line
@@ -5205,8 +5205,6 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
		return status;

	}



	nfs4_lock_state();



	if (lock->lk_is_new) {

		if (nfsd4_has_session(cstate))

			/* See rfc 5661 18.10.3: given clientid is ignored: */
@@ -5349,7 +5347,6 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	if (open_stp)

		nfs4_put_stid(&open_stp->st_stid);

	nfsd4_bump_seqid(cstate, status);

	nfs4_unlock_state();

	if (file_lock)

		locks_free_lock(file_lock);

	if (conflock)
@@ -5392,8 +5389,6 @@ nfsd4_lockt(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	if (check_lock_length(lockt->lt_offset, lockt->lt_length))

		 return nfserr_inval;



	nfs4_lock_state();



	if (!nfsd4_has_session(cstate)) {

		status = lookup_clientid(&lockt->lt_clientid, cstate, nn);

		if (status)
@@ -5448,7 +5443,6 @@ nfsd4_lockt(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
out:

	if (lo)

		nfs4_put_stateowner(&lo->lo_owner);

	nfs4_unlock_state();

	if (file_lock)

		locks_free_lock(file_lock);

	return status;
@@ -5472,8 +5466,6 @@ nfsd4_locku(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	if (check_lock_length(locku->lu_offset, locku->lu_length))

		 return nfserr_inval;



	nfs4_lock_state();

									        

	status = nfs4_preprocess_seqid_op(cstate, locku->lu_seqid,

					&locku->lu_stateid, NFS4_LOCK_STID,

					&stp, nn);
@@ -5516,7 +5508,6 @@ nfsd4_locku(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	nfs4_put_stid(&stp->st_stid);

out:

	nfsd4_bump_seqid(cstate, status);

	nfs4_unlock_state();

	if (file_lock)

		locks_free_lock(file_lock);

	return status;