From 3f987aa84d83b4925556791533a8047e5e46db00 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Fri, 9 Mar 2018 17:06:25 -0700 Subject: [PATCH] nvmf: remove spdk_nvmf_construct_subsystem() After the previous cleanup patches, this function was just calling nvmf_tgt_create_subsystem() with no other functionality. Change-Id: I1b20887cade7496093e0b69778df30f818eeb764 Signed-off-by: Daniel Verkamp Reviewed-on: https://review.gerrithub.io/403379 Reviewed-by: Jim Harris Tested-by: SPDK Automated Test System Reviewed-by: Shuhei Matsumoto Reviewed-by: Changpeng Liu --- lib/event/subsystems/nvmf/conf.c | 21 +-------------------- lib/event/subsystems/nvmf/event_nvmf.h | 2 -- lib/event/subsystems/nvmf/nvmf_rpc.c | 2 +- 3 files changed, 2 insertions(+), 23 deletions(-) diff --git a/lib/event/subsystems/nvmf/conf.c b/lib/event/subsystems/nvmf/conf.c index f29b8102e..52af6f939 100644 --- a/lib/event/subsystems/nvmf/conf.c +++ b/lib/event/subsystems/nvmf/conf.c @@ -183,7 +183,7 @@ spdk_nvmf_parse_subsystem(struct spdk_conf_section *sp) return -1; } - subsystem = spdk_nvmf_construct_subsystem(nqn); + subsystem = nvmf_tgt_create_subsystem(nqn, SPDK_NVMF_SUBTYPE_NVME, 0); if (subsystem == NULL) { goto done; } @@ -354,22 +354,3 @@ spdk_nvmf_parse_conf(void) return 0; } - -struct spdk_nvmf_subsystem * - spdk_nvmf_construct_subsystem(const char *name) -{ - struct spdk_nvmf_subsystem *subsystem; - - if (name == NULL) { - SPDK_ERRLOG("No NQN specified for subsystem\n"); - return NULL; - } - - subsystem = nvmf_tgt_create_subsystem(name, SPDK_NVMF_SUBTYPE_NVME, 0); - if (subsystem == NULL) { - SPDK_ERRLOG("Subsystem creation failed\n"); - return NULL; - } - - return subsystem; -} diff --git a/lib/event/subsystems/nvmf/event_nvmf.h b/lib/event/subsystems/nvmf/event_nvmf.h index 0db610fc9..9150e90e4 100644 --- a/lib/event/subsystems/nvmf/event_nvmf.h +++ b/lib/event/subsystems/nvmf/event_nvmf.h @@ -77,6 +77,4 @@ int spdk_nvmf_parse_conf(void); struct spdk_nvmf_subsystem *nvmf_tgt_create_subsystem(const char *name, enum spdk_nvmf_subtype subtype, uint32_t num_ns); -struct spdk_nvmf_subsystem *spdk_nvmf_construct_subsystem(const char *name); - #endif diff --git a/lib/event/subsystems/nvmf/nvmf_rpc.c b/lib/event/subsystems/nvmf/nvmf_rpc.c index bd42a2483..2586d393d 100644 --- a/lib/event/subsystems/nvmf/nvmf_rpc.c +++ b/lib/event/subsystems/nvmf/nvmf_rpc.c @@ -605,7 +605,7 @@ spdk_rpc_construct_nvmf_subsystem(struct spdk_jsonrpc_request *request, SPDK_NOTICELOG("Ignoring it and continuing.\n"); } - subsystem = spdk_nvmf_construct_subsystem(req.nqn); + subsystem = nvmf_tgt_create_subsystem(req.nqn, SPDK_NVMF_SUBTYPE_NVME, 0); if (!subsystem) { goto invalid; }