From 1be049b7d4e764a583c2dc5df70fa35a1090b7f2 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Fri, 2 Jul 2021 14:12:50 +0900 Subject: [PATCH] bdev/nvme: Move up definition of struct nvme_async_probe_ctx in a file Signed-off-by: Shuhei Matsumoto Change-Id: Iac315c3484c23b7e8b9a812d728a15bf1c82dbb7 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8591 Tested-by: SPDK CI Jenkins Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Reviewed-by: Tomasz Zawadzki Reviewed-by: Aleksey Marchuk --- module/bdev/nvme/common.h | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/module/bdev/nvme/common.h b/module/bdev/nvme/common.h index 6a6da504f..1afb6d2ac 100644 --- a/module/bdev/nvme/common.h +++ b/module/bdev/nvme/common.h @@ -46,6 +46,25 @@ extern bool g_bdev_nvme_module_finish; #define NVME_MAX_CONTROLLERS 1024 +typedef void (*spdk_bdev_create_nvme_fn)(void *ctx, size_t bdev_count, int rc); + +struct nvme_async_probe_ctx { + struct spdk_nvme_probe_ctx *probe_ctx; + const char *base_name; + const char **names; + uint32_t count; + uint32_t prchk_flags; + struct spdk_poller *poller; + struct spdk_nvme_transport_id trid; + struct spdk_nvme_ctrlr_opts opts; + spdk_bdev_create_nvme_fn cb_fn; + void *cb_ctx; + uint32_t populates_in_progress; + bool ctrlr_attached; + bool probe_done; + bool namespaces_populated; +}; + enum nvme_ns_type { NVME_NS_UNKNOWN = 0, NVME_NS_STANDARD = 1, @@ -137,25 +156,6 @@ struct nvme_poll_group { uint64_t end_ticks; }; -typedef void (*spdk_bdev_create_nvme_fn)(void *ctx, size_t bdev_count, int rc); - -struct nvme_async_probe_ctx { - struct spdk_nvme_probe_ctx *probe_ctx; - const char *base_name; - const char **names; - uint32_t count; - uint32_t prchk_flags; - struct spdk_poller *poller; - struct spdk_nvme_transport_id trid; - struct spdk_nvme_ctrlr_opts opts; - spdk_bdev_create_nvme_fn cb_fn; - void *cb_ctx; - uint32_t populates_in_progress; - bool ctrlr_attached; - bool probe_done; - bool namespaces_populated; -}; - struct ocssd_io_channel; struct nvme_ctrlr_channel {