Commit a3351726 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Jim Harris
Browse files

nvme: Initialize cpl->sqid when aborting requests for RDMA and TCP 



nvme_rdma_qpair_abort_reqs() and nvme_tcp_qpair_abort_reqs() did not
initialize cpl->sqid. Hence, unexpected message was printed by
spdk_nvme_print_completion(). Fix the bugs in this patch.

Fixes #2930

Signed-off-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17067

 (master)

(cherry picked from commit 7413e1e4)
Change-Id: I8b41166e58b26ce22c453ab85794b46dbe3dd3a2
Signed-off-by: default avatarKrzysztof Karas <krzysztof.karas@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17698


Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 7c4369a5

lib/nvme/nvme_rdma.c

+1 −0
Original line number Diff line number Diff line
@@ -2349,6 +2349,7 @@ nvme_rdma_qpair_abort_reqs(struct spdk_nvme_qpair *qpair, uint32_t dnr) 
	struct spdk_nvme_cpl cpl;

	struct nvme_rdma_qpair *rqpair = nvme_rdma_qpair(qpair);



	cpl.sqid = qpair->id;

	cpl.status.sc = SPDK_NVME_SC_ABORTED_SQ_DELETION;

	cpl.status.sct = SPDK_NVME_SCT_GENERIC;

	cpl.status.dnr = dnr;

lib/nvme/nvme_tcp.c

+1 −0
Original line number Diff line number Diff line
@@ -790,6 +790,7 @@ nvme_tcp_qpair_abort_reqs(struct spdk_nvme_qpair *qpair, uint32_t dnr) 
	struct spdk_nvme_cpl cpl = {};

	struct nvme_tcp_qpair *tqpair = nvme_tcp_qpair(qpair);



	cpl.sqid = qpair->id;

	cpl.status.sc = SPDK_NVME_SC_ABORTED_SQ_DELETION;

	cpl.status.sct = SPDK_NVME_SCT_GENERIC;

	cpl.status.dnr = dnr;