From 37d0433fc3b7f95b55620df27f8656ff9413e9c3 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Thu, 4 May 2023 18:40:49 +0000 Subject: [PATCH] nvmf: use iterator APIs to generate discovery log Signed-off-by: Jim Harris Change-Id: Iedd1c0a92e8b5f839ad4905d8063a04ec47f3d9b Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17938 Tested-by: SPDK CI Jenkins Reviewed-by: Shuhei Matsumoto Reviewed-by: Konrad Sztyber Community-CI: Mellanox Build Bot Reviewed-by: Aleksey Marchuk --- lib/nvmf/ctrlr_discovery.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/nvmf/ctrlr_discovery.c b/lib/nvmf/ctrlr_discovery.c index 2f11f0877..d90662b20 100644 --- a/lib/nvmf/ctrlr_discovery.c +++ b/lib/nvmf/ctrlr_discovery.c @@ -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; }