Commit 6b8096d8 authored by Daniel Verkamp's avatar Daniel Verkamp
Browse files

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: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/378015


Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarZiye Yang <optimistyzy@gmail.com>
Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
parent f4a4ddd8

lib/nvmf/nvmf.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

lib/nvmf/nvmf_internal.h

+0 −2
Original line number Diff line number Diff line
@@ -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;

lib/nvmf/subsystem.c

+0 −4
Original line number Diff line number Diff line
@@ -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;