From d5570379db2f41a6a3a3261d878dc9d18401e7c2 Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Sun, 10 May 2020 12:40:38 -0700 Subject: [PATCH] module/event_scsi: add a map file and remove spdk prefix. Signed-off-by: Seth Howell Change-Id: Idb31b8e98bfd12f69519e174b1ef27065ddc035a Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2353 Community-CI: Mellanox Build Bot Community-CI: Broadcom CI Reviewed-by: Jim Harris Reviewed-by: Aleksey Marchuk Tested-by: SPDK CI Jenkins --- module/event/subsystems/scsi/Makefile | 2 ++ module/event/subsystems/scsi/scsi.c | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/module/event/subsystems/scsi/Makefile b/module/event/subsystems/scsi/Makefile index e4eef3d0b..91202c933 100644 --- a/module/event/subsystems/scsi/Makefile +++ b/module/event/subsystems/scsi/Makefile @@ -41,4 +41,6 @@ SO_SUFFIX := $(SO_VER).$(SO_MINOR) C_SRCS = scsi.c LIBNAME = event_scsi +SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/mk/spdk_blank.map + include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/module/event/subsystems/scsi/scsi.c b/module/event/subsystems/scsi/scsi.c index a37ebf61e..f63dc783b 100644 --- a/module/event/subsystems/scsi/scsi.c +++ b/module/event/subsystems/scsi/scsi.c @@ -38,7 +38,7 @@ #include "spdk_internal/event.h" static void -spdk_scsi_subsystem_init(void) +scsi_subsystem_init(void) { int rc; @@ -48,7 +48,7 @@ spdk_scsi_subsystem_init(void) } static void -spdk_scsi_subsystem_fini(void) +scsi_subsystem_fini(void) { spdk_scsi_fini(); spdk_subsystem_fini_next(); @@ -56,8 +56,8 @@ spdk_scsi_subsystem_fini(void) static struct spdk_subsystem g_spdk_subsystem_scsi = { .name = "scsi", - .init = spdk_scsi_subsystem_init, - .fini = spdk_scsi_subsystem_fini, + .init = scsi_subsystem_init, + .fini = scsi_subsystem_fini, .config = NULL, };