Commit 63fb2f77 authored by Ben Walker's avatar Ben Walker Committed by Daniel Verkamp
Browse files

nvme: Close file descriptor if controller fails to initialize 



Change-Id: I9fee91ece79b204962a70fc49d9032abe2c55090
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/408218


Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 4988e482

lib/nvme/nvme_pcie.c

+3 −0
Original line number Diff line number Diff line
@@ -790,6 +790,7 @@ struct spdk_nvme_ctrlr *nvme_pcie_ctrlr_construct(const struct spdk_nvme_transpo 


	pctrlr = spdk_dma_zmalloc(sizeof(struct nvme_pcie_ctrlr), 64, NULL);

	if (pctrlr == NULL) {

		close(claim_fd);

		SPDK_ERRLOG("could not allocate ctrlr\n");

		return NULL;

	}
@@ -804,6 +805,7 @@ struct spdk_nvme_ctrlr *nvme_pcie_ctrlr_construct(const struct spdk_nvme_transpo 


	rc = nvme_pcie_ctrlr_allocate_bars(pctrlr);

	if (rc != 0) {

		close(claim_fd);

		spdk_dma_free(pctrlr);

		return NULL;

	}
@@ -815,6 +817,7 @@ struct spdk_nvme_ctrlr *nvme_pcie_ctrlr_construct(const struct spdk_nvme_transpo 


	if (nvme_ctrlr_get_cap(&pctrlr->ctrlr, &cap)) {

		SPDK_ERRLOG("get_cap() failed\n");

		close(claim_fd);

		spdk_dma_free(pctrlr);

		return NULL;

	}