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

Commit 0579c8d2 authored by Kinglong Mee's avatar Kinglong Mee Committed by Trond Myklebust
Browse files

nfs: Initialize cb_sequenceres information before validate_seqid() 



For a cb_layoutrecall replay, nfsd got CB_SEQUENCE status of zero,
but all informations of cb_sequenceres are zero too !!!

validate_seqid() return NFS4ERR_RETRY_UNCACHED_REP for a replay,
and skip the initlize cb_sequenceres.

Signed-off-by: default avatarKinglong Mee <kinglongmee@gmail.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent e937ee71

fs/nfs/callback_proc.c

+7 −7
Original line number Diff line number Diff line
@@ -445,6 +445,13 @@ __be32 nfs4_callback_sequence(struct cb_sequenceargs *args, 
		goto out;

	}



	memcpy(&res->csr_sessionid, &args->csa_sessionid,

	       sizeof(res->csr_sessionid));

	res->csr_sequenceid = args->csa_sequenceid;

	res->csr_slotid = args->csa_slotid;

	res->csr_highestslotid = NFS41_BC_MAX_CALLBACKS - 1;

	res->csr_target_highestslotid = NFS41_BC_MAX_CALLBACKS - 1;



	status = validate_seqid(tbl, args);

	spin_unlock(&tbl->slot_tbl_lock);

	if (status)
@@ -462,13 +469,6 @@ __be32 nfs4_callback_sequence(struct cb_sequenceargs *args, 
		goto out;

	}



	memcpy(&res->csr_sessionid, &args->csa_sessionid,

	       sizeof(res->csr_sessionid));

	res->csr_sequenceid = args->csa_sequenceid;

	res->csr_slotid = args->csa_slotid;

	res->csr_highestslotid = NFS41_BC_MAX_CALLBACKS - 1;

	res->csr_target_highestslotid = NFS41_BC_MAX_CALLBACKS - 1;



	/*

	 * RFC5661 20.9.3

	 * If CB_SEQUENCE returns an error, then the state of the slot