nvmf: use iterator APIs to generate discovery log

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: Iedd1c0a92e8b5f839ad4905d8063a04ec47f3d9b
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17938
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: Aleksey Marchuk <alexeymar@nvidia.com>
This commit is contained in:
Jim Harris 2023-05-04 18:40:49 +00:00 committed by David Ko
parent 35a3cfd51e
commit 37d0433fc3

View File

@ -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_entry *entry;
struct spdk_nvmf_discovery_log_page *disc_log; struct spdk_nvmf_discovery_log_page *disc_log;
size_t cur_size; size_t cur_size;
uint32_t sid;
SPDK_DEBUGLOG(nvmf, "Generating log page for genctr %" PRIu64 "\n", SPDK_DEBUGLOG(nvmf, "Generating log page for genctr %" PRIu64 "\n",
tgt->discovery_genctr); tgt->discovery_genctr);
@ -86,10 +85,10 @@ nvmf_generate_discovery_log(struct spdk_nvmf_tgt *tgt, const char *hostnqn, size
return NULL; return NULL;
} }
for (sid = 0; sid < tgt->max_subsystems; sid++) { for (subsystem = spdk_nvmf_subsystem_get_first(tgt);
subsystem = tgt->subsystems[sid]; subsystem != NULL;
if ((subsystem == NULL) || subsystem = spdk_nvmf_subsystem_get_next(subsystem)) {
(subsystem->state == SPDK_NVMF_SUBSYSTEM_INACTIVE) || if ((subsystem->state == SPDK_NVMF_SUBSYSTEM_INACTIVE) ||
(subsystem->state == SPDK_NVMF_SUBSYSTEM_DEACTIVATING)) { (subsystem->state == SPDK_NVMF_SUBSYSTEM_DEACTIVATING)) {
continue; continue;
} }