From d3d6f74ca16258cc85173fb19fb342f1c98464ec Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Wed, 11 Aug 2021 16:57:13 +0900 Subject: [PATCH] bdev/nvme: Inline find_admin_path() bdev_nvme_find_admin_path() is used only in a place and it's role is to find a non-failed ctrlr even after multipath is supported. Inline it into bdev_nvme_admin_passthru() will be better. Signed-off-by: Shuhei Matsumoto Change-Id: If58507c49b43d047e1f3ef25bbdfb571c36a1956 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9194 Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Dong Yi Reviewed-by: Ben Walker Reviewed-by: Jim Harris Reviewed-by: Konrad Sztyber Reviewed-by: Paul Luse --- module/bdev/nvme/bdev_nvme.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/module/bdev/nvme/bdev_nvme.c b/module/bdev/nvme/bdev_nvme.c index aef522983..e95c6d301 100644 --- a/module/bdev/nvme/bdev_nvme.c +++ b/module/bdev/nvme/bdev_nvme.c @@ -479,14 +479,6 @@ bdev_nvme_find_io_path(struct nvme_bdev_channel *nbdev_ch, return true; } -static inline bool -bdev_nvme_find_admin_path(struct nvme_bdev_channel *nbdev_ch, - struct nvme_ctrlr **_nvme_ctrlr) -{ - *_nvme_ctrlr = nbdev_ch->ctrlr_ch->ctrlr; - return true; -} - static inline void bdev_nvme_io_complete_nvme_status(struct nvme_bdev_io *bio, const struct spdk_nvme_cpl *cpl) @@ -3838,9 +3830,7 @@ bdev_nvme_admin_passthru(struct nvme_bdev_channel *nbdev_ch, struct nvme_bdev_io struct nvme_ctrlr *nvme_ctrlr; uint32_t max_xfer_size; - if (!bdev_nvme_find_admin_path(nbdev_ch, &nvme_ctrlr)) { - return -EINVAL; - } + nvme_ctrlr = nbdev_ch->ctrlr_ch->ctrlr; max_xfer_size = spdk_nvme_ctrlr_get_max_xfer_size(nvme_ctrlr->ctrlr);