ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvmf: use iterator APIs in nvmf_tgt_destroy_cb

Browse Source 
Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I27b1b851fc8f47150670636cb65ccba40d1a57d6
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17961
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
Community-CI: Mellanox Build Bot
This commit is contained in:
Jim Harris 2023-05-04 19:03:06 +00:00 committed by David Ko
parent c4ce596187
commit 8de18d3ccb
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/nvmf/nvmf.c
View File

@ -360,8 +360,7 @@ static void
nvmf_tgt_destroy_cb(void *io_device) nvmf_tgt_destroy_cb(void *io_device)
{ {
struct spdk_nvmf_tgt *tgt = io_device; struct spdk_nvmf_tgt *tgt = io_device;
struct spdk_nvmf_subsystem *subsystem; struct spdk_nvmf_subsystem *subsystem, *subsystem_next;
uint32_t i;
int rc; int rc;
if (tgt->subsystems == NULL) { if (tgt->subsystems == NULL) {
@ -369,11 +368,14 @@ nvmf_tgt_destroy_cb(void *io_device)
return; return;
} }
for (i = 0; i < tgt->max_subsystems; i++) { /* We will be freeing subsystems in this loop, so we always need to get the next one
subsystem = tgt->subsystems[i]; * ahead of time, since we can't call get_next() on a subsystem that's been freed.
if (subsystem == NULL) { */
continue; for (subsystem = spdk_nvmf_subsystem_get_first(tgt),
} subsystem_next = spdk_nvmf_subsystem_get_next(subsystem);
subsystem != NULL;
subsystem = subsystem_next,
subsystem_next = spdk_nvmf_subsystem_get_next(subsystem_next)) {
nvmf_subsystem_remove_all_listeners(subsystem, true); nvmf_subsystem_remove_all_listeners(subsystem, true);
rc = spdk_nvmf_subsystem_destroy(subsystem, nvmf_tgt_destroy_cb, tgt); rc = spdk_nvmf_subsystem_destroy(subsystem, nvmf_tgt_destroy_cb, tgt);