From ffabc8ac29a367d7b066ce5f78635ff520b0e9cd Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Fri, 26 Nov 2021 03:41:24 +0900 Subject: [PATCH] bdev/nvme: Inline bdev_nvme_failover_start() into bdev_nvme_failover() Signed-off-by: Shuhei Matsumoto Change-Id: I70593de284f5623db9e30d94b03b6576bd6ca29b Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10442 Tested-by: SPDK CI Jenkins Community-CI: Broadcom CI Reviewed-by: Ben Walker Reviewed-by: Aleksey Marchuk --- module/bdev/nvme/bdev_nvme.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/module/bdev/nvme/bdev_nvme.c b/module/bdev/nvme/bdev_nvme.c index c10ac8001..49b770bab 100644 --- a/module/bdev/nvme/bdev_nvme.c +++ b/module/bdev/nvme/bdev_nvme.c @@ -1576,9 +1576,9 @@ bdev_nvme_reset_io(struct nvme_bdev_channel *nbdev_ch, struct nvme_bdev_io *bio) } static int -bdev_nvme_failover_start(struct nvme_ctrlr *nvme_ctrlr, bool remove) +bdev_nvme_failover(struct nvme_ctrlr *nvme_ctrlr, bool remove) { - struct nvme_path_id *path_id = NULL, *next_path = NULL; + struct nvme_path_id *path_id, *next_path; int rc __attribute__((unused)); pthread_mutex_lock(&nvme_ctrlr->mutex); @@ -1624,22 +1624,11 @@ bdev_nvme_failover_start(struct nvme_ctrlr *nvme_ctrlr, bool remove) } pthread_mutex_unlock(&nvme_ctrlr->mutex); + + spdk_thread_send_msg(nvme_ctrlr->thread, _bdev_nvme_reset, nvme_ctrlr); return 0; } -static int -bdev_nvme_failover(struct nvme_ctrlr *nvme_ctrlr, bool remove) -{ - int rc; - - rc = bdev_nvme_failover_start(nvme_ctrlr, remove); - if (rc == 0) { - spdk_thread_send_msg(nvme_ctrlr->thread, _bdev_nvme_reset, nvme_ctrlr); - } - - return rc; -} - static int bdev_nvme_unmap(struct nvme_bdev_io *bio, uint64_t offset_blocks, uint64_t num_blocks);