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

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

nfsd: Remove nfs4_lock_state(): nfsd4_open_downgrade + nfsd4_close 



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

fs/nfsd/nfs4state.c

+0 −4
Original line number Diff line number Diff line
@@ -4713,7 +4713,6 @@ nfsd4_open_confirm(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	nfs4_put_stid(&stp->st_stid);

out:

	nfsd4_bump_seqid(cstate, status);

	nfs4_unlock_state();

	return status;

}
@@ -4760,7 +4759,6 @@ nfsd4_open_downgrade(struct svc_rqst *rqstp, 
		dprintk("NFSD: %s: od_deleg_want=0x%x ignored\n", __func__,

			od->od_deleg_want);



	nfs4_lock_state();

	status = nfs4_preprocess_confirmed_seqid_op(cstate, od->od_seqid,

					&od->od_stateid, &stp, nn);

	if (status)
@@ -4826,7 +4824,6 @@ nfsd4_close(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	dprintk("NFSD: nfsd4_close on file %pd\n", 

			cstate->current_fh.fh_dentry);



	nfs4_lock_state();

	status = nfs4_preprocess_seqid_op(cstate, close->cl_seqid,

					&close->cl_stateid,

					NFS4_OPEN_STID|NFS4_CLOSED_STID,
@@ -4842,7 +4839,6 @@ nfsd4_close(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	/* put reference from nfs4_preprocess_seqid_op */

	nfs4_put_stid(&stp->st_stid);

out:

	nfs4_unlock_state();

	return status;

}