From edc95ba1173ccb5ee5b688f8333fd602a1d4e1d6 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Wed, 8 Sep 2021 01:07:15 +0900 Subject: [PATCH] bdev/nvme: Delete unnecessary function declarations from bdev_nvme.h A few functions can be made private in bdev_nvme.c. Hence delete these function declarations from bdev_nvme.h. Besides, bdev_nvme_remove_trid() is only a function declaration. Hence delete it together in this patch. Signed-off-by: Shuhei Matsumoto Change-Id: I7bf9ae6da332c6426f6eb40926e7c4130d9acd8a Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9444 Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Aleksey Marchuk Reviewed-by: Jim Harris --- module/bdev/nvme/bdev_nvme.c | 12 ++++++------ module/bdev/nvme/bdev_nvme.h | 9 --------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/module/bdev/nvme/bdev_nvme.c b/module/bdev/nvme/bdev_nvme.c index ed586d730..b107f89b8 100644 --- a/module/bdev/nvme/bdev_nvme.c +++ b/module/bdev/nvme/bdev_nvme.c @@ -276,7 +276,7 @@ nvme_ctrlr_get_next_active_ns(struct nvme_ctrlr *nvme_ctrlr, struct nvme_ns *ns) return NULL; } -struct nvme_ctrlr * +static struct nvme_ctrlr * nvme_ctrlr_get(const struct spdk_nvme_transport_id *trid) { struct nvme_ctrlr *nvme_ctrlr; @@ -353,7 +353,7 @@ nvme_bdev_dump_trid_json(const struct spdk_nvme_transport_id *trid, struct spdk_ } } -void +static void nvme_ctrlr_delete(struct nvme_ctrlr *nvme_ctrlr) { struct nvme_ctrlr_trid *trid, *tmp_trid; @@ -406,7 +406,7 @@ nvme_ctrlr_unregister_cb(void *io_device) pthread_mutex_unlock(&g_bdev_nvme_mutex); } -void +static void nvme_ctrlr_unregister(void *ctx) { struct nvme_ctrlr *nvme_ctrlr = ctx; @@ -414,7 +414,7 @@ nvme_ctrlr_unregister(void *ctx) spdk_io_device_unregister(nvme_ctrlr, nvme_ctrlr_unregister_cb); } -void +static void nvme_ctrlr_release(struct nvme_ctrlr *nvme_ctrlr) { pthread_mutex_lock(&nvme_ctrlr->mutex); @@ -433,7 +433,7 @@ nvme_ctrlr_release(struct nvme_ctrlr *nvme_ctrlr) nvme_ctrlr_unregister(nvme_ctrlr); } -int +static int bdev_nvme_create_bdev_channel_cb(void *io_device, void *ctx_buf) { struct nvme_bdev_channel *nbdev_ch = ctx_buf; @@ -455,7 +455,7 @@ bdev_nvme_create_bdev_channel_cb(void *io_device, void *ctx_buf) return 0; } -void +static void bdev_nvme_destroy_bdev_channel_cb(void *io_device, void *ctx_buf) { struct nvme_bdev_channel *nbdev_ch = ctx_buf; diff --git a/module/bdev/nvme/bdev_nvme.h b/module/bdev/nvme/bdev_nvme.h index c8a73a399..32dc1994f 100644 --- a/module/bdev/nvme/bdev_nvme.h +++ b/module/bdev/nvme/bdev_nvme.h @@ -161,7 +161,6 @@ struct nvme_bdev_channel { struct nvme_ctrlr_channel *ctrlr_ch; }; -struct nvme_ctrlr *nvme_ctrlr_get(const struct spdk_nvme_transport_id *trid); struct nvme_ctrlr *nvme_ctrlr_get_by_name(const char *name); typedef void (*nvme_ctrlr_for_each_fn)(struct nvme_ctrlr *nvme_ctrlr, void *ctx); @@ -171,13 +170,6 @@ void nvme_ctrlr_for_each(nvme_ctrlr_for_each_fn fn, void *ctx); void nvme_bdev_dump_trid_json(const struct spdk_nvme_transport_id *trid, struct spdk_json_write_ctx *w); -void nvme_ctrlr_release(struct nvme_ctrlr *nvme_ctrlr); -void nvme_ctrlr_unregister(void *ctx); -void nvme_ctrlr_delete(struct nvme_ctrlr *nvme_ctrlr); - -int bdev_nvme_create_bdev_channel_cb(void *io_device, void *ctx_buf); -void bdev_nvme_destroy_bdev_channel_cb(void *io_device, void *ctx_buf); - struct nvme_ns *nvme_ctrlr_get_ns(struct nvme_ctrlr *nvme_ctrlr, uint32_t nsid); struct nvme_ns *nvme_ctrlr_get_first_active_ns(struct nvme_ctrlr *nvme_ctrlr); struct nvme_ns *nvme_ctrlr_get_next_active_ns(struct nvme_ctrlr *nvme_ctrlr, struct nvme_ns *ns); @@ -208,7 +200,6 @@ struct spdk_nvme_qpair *bdev_nvme_get_io_qpair(struct spdk_io_channel *ctrlr_io_ void bdev_nvme_get_opts(struct spdk_bdev_nvme_opts *opts); int bdev_nvme_set_opts(const struct spdk_bdev_nvme_opts *opts); int bdev_nvme_set_hotplug(bool enabled, uint64_t period_us, spdk_msg_fn cb, void *cb_ctx); -int bdev_nvme_remove_trid(const char *name, struct spdk_nvme_transport_id *trid); int bdev_nvme_create(struct spdk_nvme_transport_id *trid, struct spdk_nvme_host_id *hostid,