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

nfsd: Remove nfs4_lock_state(): nfsd4_open and nfsd4_open_confirm 



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

fs/nfsd/nfs4proc.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -385,8 +385,6 @@ nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	if (nfsd4_has_session(cstate))

	if (nfsd4_has_session(cstate))

		copy_clientid(&open->op_clientid, cstate->session);

		copy_clientid(&open->op_clientid, cstate->session);





	nfs4_lock_state();



	/* check seqid for replay. set nfs4_owner */

	/* check seqid for replay. set nfs4_owner */

	resp = rqstp->rq_resp;

	resp = rqstp->rq_resp;

	status = nfsd4_process_open1(&resp->cstate, open, nn);

	status = nfsd4_process_open1(&resp->cstate, open, nn);
@@ -471,7 +469,6 @@ nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	}

	}

	nfsd4_cleanup_open_state(cstate, open, status);

	nfsd4_cleanup_open_state(cstate, open, status);

	nfsd4_bump_seqid(cstate, status);

	nfsd4_bump_seqid(cstate, status);

	nfs4_unlock_state();

	return status;

	return status;

}

}

fs/nfsd/nfs4state.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -4007,9 +4007,6 @@ static void nfsd4_deleg_xgrade_none_ext(struct nfsd4_open *open, 
	 */

	 */

}

}





/*

 * called with nfs4_lock_state() held.

 */

__be32

__be32

nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open *open)

nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open *open)

{

{
@@ -4690,8 +4687,6 @@ nfsd4_open_confirm(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	if (status)

	if (status)

		return status;

		return status;





	nfs4_lock_state();



	status = nfs4_preprocess_seqid_op(cstate,

	status = nfs4_preprocess_seqid_op(cstate,

					oc->oc_seqid, &oc->oc_req_stateid,

					oc->oc_seqid, &oc->oc_req_stateid,

					NFS4_OPEN_STID, &stp, nn);

					NFS4_OPEN_STID, &stp, nn);
@@ -4785,7 +4780,6 @@ nfsd4_open_downgrade(struct svc_rqst *rqstp, 
	nfs4_put_stid(&stp->st_stid);

	nfs4_put_stid(&stp->st_stid);

out:

out:

	nfsd4_bump_seqid(cstate, status);

	nfsd4_bump_seqid(cstate, status);

	nfs4_unlock_state();

	return status;

	return status;

}

}