From eafae9ae897a5c1c2cab1987367088893dc1cf62 Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Tue, 14 Jul 2020 16:28:56 -0700 Subject: [PATCH] bdev/nvme: pass nvme_bdev_ctrlr struct to adminq. We are about to instrument some checks in this function that will access the nvme_bdev_ctrlr struct directly so pass that directly since the ctrlr is still accessible from the nvme_bdev_ctrlr struct. Signed-off-by: Seth Howell Change-Id: I4e0d0d6c433149368e84275426362f8283903027 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3340 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Paul Luse Reviewed-by: Aleksey Marchuk Reviewed-by: Ben Walker Reviewed-by: Shuhei Matsumoto --- module/bdev/nvme/bdev_nvme.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/module/bdev/nvme/bdev_nvme.c b/module/bdev/nvme/bdev_nvme.c index 0315d437c..e06ef5c01 100644 --- a/module/bdev/nvme/bdev_nvme.c +++ b/module/bdev/nvme/bdev_nvme.c @@ -266,14 +266,12 @@ static int bdev_nvme_poll_adminq(void *arg) { int32_t rc; - struct spdk_nvme_ctrlr *ctrlr = arg; - struct nvme_bdev_ctrlr *nvme_bdev_ctrlr; + struct nvme_bdev_ctrlr *nvme_bdev_ctrlr = arg; - rc = spdk_nvme_ctrlr_process_admin_completions(ctrlr); + assert(nvme_bdev_ctrlr != NULL); + rc = spdk_nvme_ctrlr_process_admin_completions(nvme_bdev_ctrlr->ctrlr); if (rc < 0) { - nvme_bdev_ctrlr = nvme_bdev_ctrlr_get(spdk_nvme_ctrlr_get_transport_id(ctrlr)); - assert(nvme_bdev_ctrlr != NULL); bdev_nvme_reset(nvme_bdev_ctrlr, NULL); } @@ -1435,7 +1433,7 @@ create_ctrlr(struct spdk_nvme_ctrlr *ctrlr, sizeof(struct nvme_io_channel), name); - nvme_bdev_ctrlr->adminq_timer_poller = SPDK_POLLER_REGISTER(bdev_nvme_poll_adminq, ctrlr, + nvme_bdev_ctrlr->adminq_timer_poller = SPDK_POLLER_REGISTER(bdev_nvme_poll_adminq, nvme_bdev_ctrlr, g_opts.nvme_adminq_poll_period_us); TAILQ_INSERT_TAIL(&g_nvme_bdev_ctrlrs, nvme_bdev_ctrlr, tailq);