From 6b8096d815d02a6ed06c8992e46aeb95f6c7bac3 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Mon, 11 Sep 2017 17:09:11 -0700 Subject: [PATCH] nvmf: remove subsystem IDs These are not used in the current code. We introduced the concept of a subsystem ID to prepare for a future scaling strategy, but the poll group scaling strategy turns out to not need subsystem IDs. Change-Id: Ibd27cc0d446c7cda34db76787e1e9c233c399f44 Signed-off-by: Daniel Verkamp Reviewed-on: https://review.gerrithub.io/378015 Reviewed-by: Changpeng Liu Reviewed-by: Jim Harris Reviewed-by: Ben Walker Reviewed-by: Ziye Yang Tested-by: SPDK Automated Test System --- lib/nvmf/nvmf.c | 1 - lib/nvmf/nvmf_internal.h | 2 -- lib/nvmf/subsystem.c | 4 ---- 3 files changed, 7 deletions(-) diff --git a/lib/nvmf/nvmf.c b/lib/nvmf/nvmf.c index 0e67a0253..8454a0481 100644 --- a/lib/nvmf/nvmf.c +++ b/lib/nvmf/nvmf.c @@ -87,7 +87,6 @@ spdk_nvmf_tgt_create(struct spdk_nvmf_tgt_opts *opts) tgt->discovery_genctr = 0; tgt->discovery_log_page = NULL; tgt->discovery_log_page_size = 0; - tgt->current_subsystem_id = 0; TAILQ_INIT(&tgt->subsystems); TAILQ_INIT(&tgt->transports); diff --git a/lib/nvmf/nvmf_internal.h b/lib/nvmf/nvmf_internal.h index f06606423..8e1b416ce 100644 --- a/lib/nvmf/nvmf_internal.h +++ b/lib/nvmf/nvmf_internal.h @@ -54,7 +54,6 @@ struct spdk_nvmf_tgt { TAILQ_HEAD(, spdk_nvmf_subsystem) subsystems; struct spdk_nvmf_discovery_log_page *discovery_log_page; size_t discovery_log_page_size; - uint32_t current_subsystem_id; TAILQ_HEAD(, spdk_nvmf_transport) transports; }; @@ -172,7 +171,6 @@ struct spdk_nvmf_ctrlr { }; struct spdk_nvmf_subsystem { - uint32_t id; char subnqn[SPDK_NVMF_NQN_MAX_LEN + 1]; enum spdk_nvmf_subtype subtype; uint16_t next_cntlid; diff --git a/lib/nvmf/subsystem.c b/lib/nvmf/subsystem.c index e757908ce..3d56bdf79 100644 --- a/lib/nvmf/subsystem.c +++ b/lib/nvmf/subsystem.c @@ -110,10 +110,6 @@ spdk_nvmf_create_subsystem(struct spdk_nvmf_tgt *tgt, } subsystem->tgt = tgt; - - tgt->current_subsystem_id++; - - subsystem->id = tgt->current_subsystem_id; subsystem->subtype = type; subsystem->max_nsid = num_ns; subsystem->num_allocated_nsid = 0;