Commit 8d2e6b67 authored by Jim Harris's avatar Jim Harris Committed by Konrad Sztyber
Browse files

nvmf: use iterator APIs to generate discovery log 



Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: Iedd1c0a92e8b5f839ad4905d8063a04ec47f3d9b
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17938


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
parent 5cf6cd5f

lib/nvmf/ctrlr_discovery.c

+4 −5
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ nvmf_generate_discovery_log(struct spdk_nvmf_tgt *tgt, const char *hostnqn, size 
	struct spdk_nvmf_discovery_log_page_entry *entry;

	struct spdk_nvmf_discovery_log_page *disc_log;

	size_t cur_size;

	uint32_t sid;



	SPDK_DEBUGLOG(nvmf, "Generating log page for genctr %" PRIu64 "\n",

		      tgt->discovery_genctr);
@@ -86,10 +85,10 @@ nvmf_generate_discovery_log(struct spdk_nvmf_tgt *tgt, const char *hostnqn, size 
		return NULL;

	}



	for (sid = 0; sid < tgt->max_subsystems; sid++) {

		subsystem = tgt->subsystems[sid];

		if ((subsystem == NULL) ||

		    (subsystem->state == SPDK_NVMF_SUBSYSTEM_INACTIVE) ||

	for (subsystem = spdk_nvmf_subsystem_get_first(tgt);

	     subsystem != NULL;

	     subsystem = spdk_nvmf_subsystem_get_next(subsystem)) {

		if ((subsystem->state == SPDK_NVMF_SUBSYSTEM_INACTIVE) ||

		    (subsystem->state == SPDK_NVMF_SUBSYSTEM_DEACTIVATING)) {

			continue;

		}