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

Commit a8dfdaeb authored by Andy Adamson's avatar Andy Adamson Committed by J. Bruce Fields
Browse files

nfsd41: use session maxreqs for sequence target and highest slotid 



This fixes a bug in the sequence operation reply.

The sequence operation returns the highest slotid it will accept in the future
in sr_highest_slotid, and the highest slotid it prefers the client to use.
Since we do not re-negotiate the session slot table yet, these should both
always be set to the session ca_maxrequests.

Signed-off-by: default avatarAndy Adamson <andros@netapp.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent a649637c

fs/nfsd/nfs4state.c

+5 −1
Original line number Diff line number Diff line
@@ -1133,7 +1133,6 @@ nfsd4_replay_cache_entry(struct nfsd4_compoundres *resp, 
	 * session inactivity timer fires and a solo sequence operation

	 * is sent (lease renewal).

	 */

	seq->maxslots = resp->cstate.session->se_fchannel.maxreqs;



	/* Either returns 0 or nfserr_retry_uncached */

	status = nfsd4_enc_sequence_replay(resp->rqstp->rq_argp, resp);
@@ -1497,6 +1496,11 @@ nfsd4_sequence(struct svc_rqst *rqstp, 
	slot = &session->se_slots[seq->slotid];

	dprintk("%s: slotid %d\n", __func__, seq->slotid);



	/* We do not negotiate the number of slots yet, so set the

	 * maxslots to the session maxreqs which is used to encode

	 * sr_highest_slotid and the sr_target_slot id to maxslots */

	seq->maxslots = session->se_fchannel.maxreqs;



	status = check_slot_seqid(seq->seqid, slot->sl_seqid, slot->sl_inuse);

	if (status == nfserr_replay_cache) {

		cstate->slot = slot;