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

nfsd41: change check_slot_seqid parameters 



For separation of session slot and clientid slot processing.

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

fs/nfsd/nfs4state.c

+13 −11
Original line number Diff line number Diff line
@@ -1309,26 +1309,26 @@ nfsd4_exchange_id(struct svc_rqst *rqstp, 
}



static int

check_slot_seqid(u32 seqid, struct nfsd4_slot *slot)

check_slot_seqid(u32 seqid, u32 slot_seqid, int slot_inuse)

{

	dprintk("%s enter. seqid %d slot->sl_seqid %d\n", __func__, seqid,

		slot->sl_seqid);

	dprintk("%s enter. seqid %d slot_seqid %d\n", __func__, seqid,

		slot_seqid);



	/* The slot is in use, and no response has been sent. */

	if (slot->sl_inuse) {

		if (seqid == slot->sl_seqid)

	if (slot_inuse) {

		if (seqid == slot_seqid)

			return nfserr_jukebox;

		else

			return nfserr_seq_misordered;

	}

	/* Normal */

	if (likely(seqid == slot->sl_seqid + 1))

	if (likely(seqid == slot_seqid + 1))

		return nfs_ok;

	/* Replay */

	if (seqid == slot->sl_seqid)

	if (seqid == slot_seqid)

		return nfserr_replay_cache;

	/* Wraparound */

	if (seqid == 1 && (slot->sl_seqid + 1) == 0)

	if (seqid == 1 && (slot_seqid + 1) == 0)

		return nfs_ok;

	/* Misordered replay or misordered new request */

	return nfserr_seq_misordered;
@@ -1351,7 +1351,8 @@ nfsd4_create_session(struct svc_rqst *rqstp, 


	if (conf) {

		slot = &conf->cl_slot;

		status = check_slot_seqid(cr_ses->seqid, slot);

		status = check_slot_seqid(cr_ses->seqid, slot->sl_seqid,

					  slot->sl_inuse);

		if (status == nfserr_replay_cache) {

			dprintk("Got a create_session replay! seqid= %d\n",

				slot->sl_seqid);
@@ -1376,7 +1377,8 @@ nfsd4_create_session(struct svc_rqst *rqstp, 
		}



		slot = &unconf->cl_slot;

		status = check_slot_seqid(cr_ses->seqid, slot);

		status = check_slot_seqid(cr_ses->seqid, slot->sl_seqid,

					  slot->sl_inuse);

		if (status) {

			/* an unconfirmed replay returns misordered */

			status = nfserr_seq_misordered;
@@ -1477,7 +1479,7 @@ nfsd4_sequence(struct svc_rqst *rqstp, 
	slot = &session->se_slots[seq->slotid];

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



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

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

	if (status == nfserr_replay_cache) {

		cstate->slot = slot;

		cstate->session = session;