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

Commit 3d74e6a5 authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

nfsd4: no need for replay_owner in sessions case 



The replay_owner will never be used in the sessions case.

Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent c383747e

fs/nfsd/nfs4proc.c

+1 −1
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	WARN_ON(status && open->op_created);

out:

	nfsd4_cleanup_open_state(open, status);

	if (open->op_openowner)

	if (open->op_openowner && !nfsd4_has_session(cstate))

		cstate->replay_owner = &open->op_openowner->oo_owner;

	nfsd4_bump_seqid(cstate, status);

	if (!cstate->replay_owner)

fs/nfsd/nfs4state.c

+4 −4
Original line number Diff line number Diff line
@@ -3666,6 +3666,7 @@ nfs4_preprocess_seqid_op(struct nfsd4_compound_state *cstate, u32 seqid, 
	if (status)

		return status;

	*stpp = openlockstateid(s);

	if (!nfsd4_has_session(cstate))

		cstate->replay_owner = (*stpp)->st_stateowner;



	return nfs4_seqid_op_checks(cstate, stateid, seqid, *stpp);
@@ -3858,10 +3859,9 @@ nfsd4_close(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
		oo->oo_last_closed_stid = stp;



	if (list_empty(&oo->oo_owner.so_stateids)) {

		if (cstate->minorversion) {

		if (cstate->minorversion)

			release_openowner(oo);

			cstate->replay_owner = NULL;

		} else {

		else {

			/*

			 * In the 4.0 case we need to keep the owners around a

			 * little while to handle CLOSE replay.