From 5c0b8f39a8110380a6cfe73efbe788e3e49edf0e Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Sun, 10 May 2020 12:21:13 -0700 Subject: [PATCH] module/event_nbd: add a map file and remove spdk prefix. Signed-off-by: Seth Howell Change-Id: Id2920389b7cf762cf80006da5dbe582dfdc81438 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2350 Community-CI: Mellanox Build Bot Community-CI: Broadcom CI Tested-by: SPDK CI Jenkins Reviewed-by: Aleksey Marchuk Reviewed-by: Jim Harris --- module/event/subsystems/nbd/Makefile | 2 ++ module/event/subsystems/nbd/nbd.c | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/module/event/subsystems/nbd/Makefile b/module/event/subsystems/nbd/Makefile index 556c0a57d..a8f48f85e 100644 --- a/module/event/subsystems/nbd/Makefile +++ b/module/event/subsystems/nbd/Makefile @@ -41,4 +41,6 @@ SO_SUFFIX := $(SO_VER).$(SO_MINOR) C_SRCS = nbd.c LIBNAME = event_nbd +SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/mk/spdk_blank.map + include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/module/event/subsystems/nbd/nbd.c b/module/event/subsystems/nbd/nbd.c index e244c92e8..dc1c3cfa3 100644 --- a/module/event/subsystems/nbd/nbd.c +++ b/module/event/subsystems/nbd/nbd.c @@ -38,7 +38,7 @@ #include "spdk_internal/event.h" static void -spdk_nbd_subsystem_init(void) +nbd_subsystem_init(void) { int rc; @@ -48,24 +48,24 @@ spdk_nbd_subsystem_init(void) } static void -spdk_nbd_subsystem_fini(void) +nbd_subsystem_fini(void) { spdk_nbd_fini(); spdk_subsystem_fini_next(); } static void -spdk_nbd_subsystem_write_config_json(struct spdk_json_write_ctx *w) +nbd_subsystem_write_config_json(struct spdk_json_write_ctx *w) { spdk_nbd_write_config_json(w); } static struct spdk_subsystem g_spdk_subsystem_nbd = { .name = "nbd", - .init = spdk_nbd_subsystem_init, - .fini = spdk_nbd_subsystem_fini, + .init = nbd_subsystem_init, + .fini = nbd_subsystem_fini, .config = NULL, - .write_config_json = spdk_nbd_subsystem_write_config_json, + .write_config_json = nbd_subsystem_write_config_json, }; SPDK_SUBSYSTEM_REGISTER(g_spdk_subsystem_nbd);