From 0a52f4e5fcfadb91f234664a6f5a479c78d834e9 Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Sun, 10 May 2020 12:14:01 -0700 Subject: [PATCH] module/event_bdev: add a map file and remove spdk prefix. Signed-off-by: Seth Howell Change-Id: I7f82a634ee9c8a28fd52ab288cd1195f7a1ef9c3 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2348 Community-CI: Mellanox Build Bot Community-CI: Broadcom CI Reviewed-by: Jim Harris Reviewed-by: Tomasz Zawadzki Tested-by: SPDK CI Jenkins --- module/event/subsystems/bdev/Makefile | 2 ++ module/event/subsystems/bdev/bdev.c | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/module/event/subsystems/bdev/Makefile b/module/event/subsystems/bdev/Makefile index f8a54f7b1..5392abef3 100644 --- a/module/event/subsystems/bdev/Makefile +++ b/module/event/subsystems/bdev/Makefile @@ -41,4 +41,6 @@ SO_SUFFIX := $(SO_VER).$(SO_MINOR) C_SRCS = bdev.c LIBNAME = event_bdev +SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/mk/spdk_blank.map + include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/module/event/subsystems/bdev/bdev.c b/module/event/subsystems/bdev/bdev.c index 28099531b..a7926f936 100644 --- a/module/event/subsystems/bdev/bdev.c +++ b/module/event/subsystems/bdev/bdev.c @@ -41,41 +41,41 @@ #include "spdk/env.h" static void -spdk_bdev_initialize_complete(void *cb_arg, int rc) +bdev_initialize_complete(void *cb_arg, int rc) { spdk_subsystem_init_next(rc); } static void -spdk_bdev_subsystem_initialize(void) +bdev_subsystem_initialize(void) { - spdk_bdev_initialize(spdk_bdev_initialize_complete, NULL); + spdk_bdev_initialize(bdev_initialize_complete, NULL); } static void -spdk_bdev_subsystem_finish_done(void *cb_arg) +bdev_subsystem_finish_done(void *cb_arg) { spdk_subsystem_fini_next(); } static void -spdk_bdev_subsystem_finish(void) +bdev_subsystem_finish(void) { - spdk_bdev_finish(spdk_bdev_subsystem_finish_done, NULL); + spdk_bdev_finish(bdev_subsystem_finish_done, NULL); } static void -_spdk_bdev_subsystem_config_json(struct spdk_json_write_ctx *w) +bdev_subsystem_config_json(struct spdk_json_write_ctx *w) { spdk_bdev_subsystem_config_json(w); } static struct spdk_subsystem g_spdk_subsystem_bdev = { .name = "bdev", - .init = spdk_bdev_subsystem_initialize, - .fini = spdk_bdev_subsystem_finish, + .init = bdev_subsystem_initialize, + .fini = bdev_subsystem_finish, .config = spdk_bdev_config_text, - .write_config_json = _spdk_bdev_subsystem_config_json, + .write_config_json = bdev_subsystem_config_json, }; SPDK_SUBSYSTEM_REGISTER(g_spdk_subsystem_bdev);