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

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

nfsd: nfsd4_open_confirm() must reference the open stateid 



Ensure that nfsd4_open_confirm() keeps a reference to the open
stateid until it is done working with it.

Necessary step toward client_mutex removal.

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

fs/nfsd/nfs4state.c

+5 −1
Original line number Diff line number Diff line
@@ -4434,10 +4434,12 @@ nfsd4_open_confirm(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
					NFS4_OPEN_STID, &stp, nn);

	if (status)

		goto out;

	/* FIXME: move into nfs4_preprocess_seqid_op */

	atomic_inc(&stp->st_stid.sc_count);

	oo = openowner(stp->st_stateowner);

	status = nfserr_bad_stateid;

	if (oo->oo_flags & NFS4_OO_CONFIRMED)

		goto out;

		goto put_stateid;

	oo->oo_flags |= NFS4_OO_CONFIRMED;

	update_stateid(&stp->st_stid.sc_stateid);

	memcpy(&oc->oc_resp_stateid, &stp->st_stid.sc_stateid, sizeof(stateid_t));
@@ -4446,6 +4448,8 @@ nfsd4_open_confirm(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 


	nfsd4_client_record_create(oo->oo_owner.so_client);

	status = nfs_ok;

put_stateid:

	nfs4_put_stid(&stp->st_stid);

out:

	nfsd4_bump_seqid(cstate, status);

	if (!cstate->replay_owner)