From 66e85c204cfd68d826dda3469bb5de13ab65e5c8 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Thu, 24 Sep 2020 11:08:14 +0900 Subject: [PATCH] bdev/nvme: Pass nvme_bdev_ctrlr simply to bdev_nvme_add_trid() Signed-off-by: Shuhei Matsumoto Change-Id: I4ee5ec24f553d03e784b28b1d252f77a73c06ec8 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4389 Tested-by: SPDK CI Jenkins Reviewed-by: Aleksey Marchuk Reviewed-by: Jim Harris Reviewed-by: Ben Walker --- module/bdev/nvme/bdev_nvme.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/module/bdev/nvme/bdev_nvme.c b/module/bdev/nvme/bdev_nvme.c index 7ee069bc2..2568e5b84 100644 --- a/module/bdev/nvme/bdev_nvme.c +++ b/module/bdev/nvme/bdev_nvme.c @@ -1774,9 +1774,8 @@ bdev_nvme_async_poll(void *arg) } static int -bdev_nvme_add_trid(const char *name, struct spdk_nvme_transport_id *trid) +bdev_nvme_add_trid(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, struct spdk_nvme_transport_id *trid) { - struct nvme_bdev_ctrlr *nvme_bdev_ctrlr; struct spdk_nvme_ctrlr *new_ctrlr; struct spdk_nvme_ctrlr_opts opts; uint32_t i; @@ -1785,13 +1784,7 @@ bdev_nvme_add_trid(const char *name, struct spdk_nvme_transport_id *trid) struct nvme_bdev_ctrlr_trid *new_trid; int rc = 0; - assert(name != NULL); - - nvme_bdev_ctrlr = nvme_bdev_ctrlr_get_by_name(name); - if (nvme_bdev_ctrlr == NULL) { - SPDK_ERRLOG("Failed to find NVMe controller\n"); - return -ENODEV; - } + assert(nvme_bdev_ctrlr != NULL); /* Currently we only support failover to the same transport type. */ if (nvme_bdev_ctrlr->connected_trid->trtype != trid->trtype) { @@ -1942,7 +1935,7 @@ bdev_nvme_create(struct spdk_nvme_transport_id *trid, free(ctx); return -EEXIST; } - rc = bdev_nvme_add_trid(existing_ctrlr->name, trid); + rc = bdev_nvme_add_trid(existing_ctrlr, trid); if (rc) { free(ctx); return rc;