From 186c834f043911f841cbd91b3744fd6d02656a05 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Fri, 9 Oct 2020 22:47:17 +0900 Subject: [PATCH] bdev_nvme/opal: Use spdk_bdev_part_base_construct_ext() to pass bdev_name This is a drop-in replacement of spdk_bdev_part_base_construct() by spdk_bdev_part_base_construct_ext(). Signed-off-by: Shuhei Matsumoto Change-Id: I0c719683b5a9cd6dffce057552982d8e44871ab1 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4580 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Tomasz Zawadzki Reviewed-by: Aleksey Marchuk Reviewed-by: Paul Luse --- module/bdev/nvme/vbdev_opal.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/module/bdev/nvme/vbdev_opal.c b/module/bdev/nvme/vbdev_opal.c index a0588ab58..56530d0ec 100644 --- a/module/bdev/nvme/vbdev_opal.c +++ b/module/bdev/nvme/vbdev_opal.c @@ -378,15 +378,19 @@ vbdev_opal_create(const char *nvme_ctrlr_name, uint32_t nsid, uint8_t locking_ra } TAILQ_INIT(&opal_part_base->part_tailq); - opal_part_base->part_base = spdk_bdev_part_base_construct(spdk_bdev_get_by_name(base_bdev_name), - vbdev_opal_base_bdev_hotremove_cb, &opal_if, - &opal_vbdev_fn_table, &opal_part_base->part_tailq, vbdev_opal_base_free, - opal_part_base, sizeof(struct vbdev_opal_channel), NULL, NULL); - if (opal_part_base->part_base == NULL) { - SPDK_ERRLOG("Could not allocate part_base\n"); + rc = spdk_bdev_part_base_construct_ext(base_bdev_name, + vbdev_opal_base_bdev_hotremove_cb, &opal_if, + &opal_vbdev_fn_table, &opal_part_base->part_tailq, + vbdev_opal_base_free, opal_part_base, + sizeof(struct vbdev_opal_channel), NULL, NULL, + &opal_part_base->part_base); + if (rc != 0) { + if (rc != -ENODEV) { + SPDK_ERRLOG("Could not allocate part_base\n"); + } free(opal_bdev); free(opal_part_base); - return -ENOMEM; + return rc; } opal_part_base->nvme_ctrlr_name = strdup(nvme_ctrlr_name); if (opal_part_base->nvme_ctrlr_name == NULL) {