Commit bf0561f7 authored Apr 27, 2020 by Seth Howell Committed by Tomasz Zawadzki Apr 29, 2020

nvme/nvme_rdma: assign rctrlr in each qpair->ctrlr check



While in practice the qpair->ctrlr variable will not change within
the disconnect function, when the code is built without debug enabled,
gcc thinks that rctrlr may be uninitialized.

Signed-off-by: Seth Howell <seth.howell@intel.com>
Change-Id: I355cd62f3a2baaba65d806e3746f615a0dc37f58
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2056


Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>

parent 3ef6d061

lib/nvme/nvme_rdma.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -1629,7 +1629,7 @@ static void
		nvme_rdma_ctrlr_disconnect_qpair(struct spdk_nvme_ctrlr ctrlr, struct spdk_nvme_qpair qpair)
		{
		struct nvme_rdma_qpair *rqpair = nvme_rdma_qpair(qpair);
		struct nvme_rdma_ctrlr *rctrlr;
		struct nvme_rdma_ctrlr *rctrlr = NULL;
		struct nvme_rdma_cm_event_entry entry, tmp;

		nvme_rdma_unregister_mem(rqpair);
		@@ -1658,8 +1658,7 @@ nvme_rdma_ctrlr_disconnect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme

		if (rqpair->cm_id) {
		rdma_disconnect(rqpair->cm_id);
		if (qpair->ctrlr != NULL) {

		if (rctrlr != NULL) {
		if (nvme_rdma_process_event(rqpair, rctrlr->cm_channel, RDMA_CM_EVENT_DISCONNECTED)) {
		SPDK_DEBUGLOG(SPDK_LOG_NVME, "Target did not respond to qpair disconnect.\n");
		}