diff --git a/lib/nvme/nvme.c b/lib/nvme/nvme.c index ce2da9618..214c306ce 100644 --- a/lib/nvme/nvme.c +++ b/lib/nvme/nvme.c @@ -594,6 +594,7 @@ spdk_nvme_probe_internal(struct spdk_nvme_probe_ctx *probe_ctx, int rc; struct spdk_nvme_ctrlr *ctrlr, *ctrlr_tmp; + spdk_nvme_trid_populate_transport(&probe_ctx->trid, probe_ctx->trid.trtype); if (!spdk_nvme_transport_available_by_name(probe_ctx->trid.trstring)) { SPDK_ERRLOG("NVMe trtype %u not available\n", probe_ctx->trid.trtype); return -1; diff --git a/lib/nvme/nvme_pcie.c b/lib/nvme/nvme_pcie.c index d57b78f97..958e6d5c8 100644 --- a/lib/nvme/nvme_pcie.c +++ b/lib/nvme/nvme_pcie.c @@ -828,7 +828,6 @@ struct spdk_nvme_ctrlr *nvme_pcie_ctrlr_construct(const struct spdk_nvme_transpo pctrlr->is_remapped = false; pctrlr->ctrlr.is_removed = false; - spdk_nvme_trid_populate_transport(&pctrlr->ctrlr.trid, SPDK_NVME_TRANSPORT_PCIE); pctrlr->devhandle = devhandle; pctrlr->ctrlr.opts = *opts; memcpy(&pctrlr->ctrlr.trid, trid, sizeof(pctrlr->ctrlr.trid)); diff --git a/lib/nvme/nvme_rdma.c b/lib/nvme/nvme_rdma.c index c502b8045..b19742bf7 100644 --- a/lib/nvme/nvme_rdma.c +++ b/lib/nvme/nvme_rdma.c @@ -1724,7 +1724,6 @@ struct spdk_nvme_ctrlr *nvme_rdma_ctrlr_construct(const struct spdk_nvme_transpo return NULL; } - spdk_nvme_trid_populate_transport(&rctrlr->ctrlr.trid, SPDK_NVME_TRANSPORT_RDMA); rctrlr->ctrlr.opts = *opts; memcpy(&rctrlr->ctrlr.trid, trid, sizeof(rctrlr->ctrlr.trid)); diff --git a/lib/nvme/nvme_tcp.c b/lib/nvme/nvme_tcp.c index 2fbbca4b6..eb6cfc6e2 100644 --- a/lib/nvme/nvme_tcp.c +++ b/lib/nvme/nvme_tcp.c @@ -1625,7 +1625,6 @@ struct spdk_nvme_ctrlr *nvme_tcp_ctrlr_construct(const struct spdk_nvme_transpor tctrlr->ctrlr.opts = *opts; tctrlr->ctrlr.trid = *trid; - spdk_nvme_trid_populate_transport(&tctrlr->ctrlr.trid, SPDK_NVME_TRANSPORT_TCP); rc = nvme_ctrlr_construct(&tctrlr->ctrlr); if (rc != 0) {