Commit b7b2c972 authored by Ziye Yang's avatar Ziye Yang Committed by Jim Harris
Browse files

nvme/tcp: solve the adminq is not created issue. 



If the adminq is not created, we should call
nvme_transport_ctrlr_destruct (i.e., nvme_tcp_ctrlr_destruct
in tcp transport).

Change-Id: If2362c47ac89fd80289ddd8402cf9f74d7bb5801
Signed-off-by: default avatarZiye Yang <optimistyzy@gmail.com>
Reviewed-on: https://review.gerrithub.io/436613


Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 20c69bbc

lib/nvme/nvme_tcp.c

+2 −2
Original line number Diff line number Diff line
@@ -1769,7 +1769,7 @@ struct spdk_nvme_ctrlr *nvme_tcp_ctrlr_construct(const struct spdk_nvme_transpor 


	rc = nvme_ctrlr_construct(&tctrlr->ctrlr);

	if (rc != 0) {

		nvme_ctrlr_destruct(&tctrlr->ctrlr);

		free(tctrlr);

		return NULL;

	}
@@ -1777,7 +1777,7 @@ struct spdk_nvme_ctrlr *nvme_tcp_ctrlr_construct(const struct spdk_nvme_transpor 
			       SPDK_NVMF_MIN_ADMIN_QUEUE_ENTRIES, 0, SPDK_NVMF_MIN_ADMIN_QUEUE_ENTRIES);

	if (!tctrlr->ctrlr.adminq) {

		SPDK_ERRLOG("failed to create admin qpair\n");

		nvme_ctrlr_destruct(&tctrlr->ctrlr);

		nvme_tcp_ctrlr_destruct(&tctrlr->ctrlr);

		return NULL;

	}