From dde21d3bbb3790cfe206da1146185324e26ae27a Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Thu, 24 Sep 2020 10:58:58 +0900 Subject: [PATCH] bdev/nvme: Consolidate the code to create failover path in bdev_nvme_create() PCIe failover is not supported yet and it is not possible that the controller is included in g_skipped_nvme_ctrlrs for failover cases. We can consolidate the code to create failover path in bdev_nvme_create(). Signed-off-by: Shuhei Matsumoto Change-Id: Ide456707a0b66a4b26eaf66392b9b53c3e659d9e Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4387 Tested-by: SPDK CI Jenkins Reviewed-by: Aleksey Marchuk Reviewed-by: Jim Harris Reviewed-by: Ben Walker --- module/bdev/nvme/bdev_nvme.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/module/bdev/nvme/bdev_nvme.c b/module/bdev/nvme/bdev_nvme.c index 6eceb3015..d9728f62a 100644 --- a/module/bdev/nvme/bdev_nvme.c +++ b/module/bdev/nvme/bdev_nvme.c @@ -1947,6 +1947,9 @@ bdev_nvme_create(struct spdk_nvme_transport_id *trid, free(ctx); return rc; } + + nvme_ctrlr_populate_namespaces_done(ctx); + return 0; } if (trid->trtype == SPDK_NVME_TRANSPORT_PCIE) { @@ -1959,11 +1962,6 @@ bdev_nvme_create(struct spdk_nvme_transport_id *trid, } } - if (existing_ctrlr) { - nvme_ctrlr_populate_namespaces_done(ctx); - return 0; - } - spdk_nvme_ctrlr_get_default_ctrlr_opts(&ctx->opts, sizeof(ctx->opts)); ctx->opts.transport_retry_count = g_opts.retry_count;