diff --git a/module/event/subsystems/net/Makefile b/module/event/subsystems/net/Makefile index 0bfe7e9bd..5544257b6 100644 --- a/module/event/subsystems/net/Makefile +++ b/module/event/subsystems/net/Makefile @@ -41,4 +41,6 @@ SO_SUFFIX := $(SO_VER).$(SO_MINOR) C_SRCS = net.c LIBNAME = event_net +SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/mk/spdk_blank.map + include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/module/event/subsystems/net/net.c b/module/event/subsystems/net/net.c index 62d65dbdb..76694238a 100644 --- a/module/event/subsystems/net/net.c +++ b/module/event/subsystems/net/net.c @@ -38,7 +38,7 @@ #include "spdk_internal/event.h" static void -spdk_interface_subsystem_init(void) +interface_subsystem_init(void) { int rc; @@ -48,7 +48,7 @@ spdk_interface_subsystem_init(void) } static void -spdk_interface_subsystem_destroy(void) +interface_subsystem_destroy(void) { spdk_interface_destroy(); spdk_subsystem_fini_next(); @@ -56,41 +56,41 @@ spdk_interface_subsystem_destroy(void) static struct spdk_subsystem g_spdk_subsystem_interface = { .name = "interface", - .init = spdk_interface_subsystem_init, - .fini = spdk_interface_subsystem_destroy, + .init = interface_subsystem_init, + .fini = interface_subsystem_destroy, .config = NULL, }; SPDK_SUBSYSTEM_REGISTER(g_spdk_subsystem_interface); static void -spdk_net_start_complete(void *cb_arg, int rc) +net_start_complete(void *cb_arg, int rc) { spdk_subsystem_init_next(rc); } static void -spdk_net_subsystem_start(void) +net_subsystem_start(void) { - spdk_net_framework_start(spdk_net_start_complete, NULL); + spdk_net_framework_start(net_start_complete, NULL); } static void -spdk_net_fini_done(void *cb_arg) +net_fini_done(void *cb_arg) { spdk_subsystem_fini_next(); } static void -spdk_net_subsystem_fini(void) +net_subsystem_fini(void) { - spdk_net_framework_fini(spdk_net_fini_done, NULL); + spdk_net_framework_fini(net_fini_done, NULL); } static struct spdk_subsystem g_spdk_subsystem_net_framework = { .name = "net_framework", - .init = spdk_net_subsystem_start, - .fini = spdk_net_subsystem_fini, + .init = net_subsystem_start, + .fini = net_subsystem_fini, .config = NULL, };