diff --git a/lib/ftl/ftl_band.c b/lib/ftl/ftl_band.c index 504034a72..757b80a4a 100644 --- a/lib/ftl/ftl_band.c +++ b/lib/ftl/ftl_band.c @@ -511,7 +511,7 @@ ftl_band_user_lbks(const struct ftl_band *band) struct ftl_band * ftl_band_from_addr(struct spdk_ftl_dev *dev, struct ftl_addr addr) { - assert(addr.zone_id < ftl_dev_num_bands(dev)); + assert(addr.zone_id < ftl_get_num_bands(dev)); return &dev->bands[addr.zone_id]; } diff --git a/lib/ftl/ftl_core.c b/lib/ftl/ftl_core.c index 049ee3483..abefe7624 100644 --- a/lib/ftl/ftl_core.c +++ b/lib/ftl/ftl_core.c @@ -264,7 +264,7 @@ ftl_md_write_cb(struct ftl_io *io, void *arg, int status) * onto current band and update their counters to allow them to be used for writing * (once they're closed and empty). */ - for (id = 0; id < ftl_dev_num_bands(dev); ++id) { + for (id = 0; id < ftl_get_num_bands(dev); ++id) { if (spdk_bit_array_get(band->reloc_bitmap, id)) { assert(dev->bands[id].num_reloc_bands > 0); dev->bands[id].num_reloc_bands--; diff --git a/lib/ftl/ftl_core.h b/lib/ftl/ftl_core.h index 241ea9378..4263c27f8 100644 --- a/lib/ftl/ftl_core.h +++ b/lib/ftl/ftl_core.h @@ -451,7 +451,7 @@ ftl_l2p_get(struct spdk_ftl_dev *dev, uint64_t lba) } } static inline size_t -ftl_dev_num_bands(const struct spdk_ftl_dev *dev) +ftl_get_num_bands(const struct spdk_ftl_dev *dev) { return dev->geo.num_chk; } diff --git a/lib/ftl/ftl_debug.c b/lib/ftl/ftl_debug.c index 57ad70213..aaad26ce5 100644 --- a/lib/ftl/ftl_debug.c +++ b/lib/ftl/ftl_debug.c @@ -101,7 +101,7 @@ ftl_dev_dump_bands(struct spdk_ftl_dev *dev) } ftl_debug("Bands validity:\n"); - for (i = 0; i < ftl_dev_num_bands(dev); ++i) { + for (i = 0; i < ftl_get_num_bands(dev); ++i) { if (dev->bands[i].state == FTL_BAND_STATE_FREE && dev->bands[i].wr_cnt == 0) { continue; @@ -146,7 +146,7 @@ ftl_dev_dump_stats(const struct spdk_ftl_dev *dev) } /* Count the number of valid LBAs */ - for (i = 0; i < ftl_dev_num_bands(dev); ++i) { + for (i = 0; i < ftl_get_num_bands(dev); ++i) { total += dev->bands[i].lba_map.num_vld; } diff --git a/lib/ftl/ftl_init.c b/lib/ftl/ftl_init.c index a82b68364..22ee6ab5b 100644 --- a/lib/ftl/ftl_init.c +++ b/lib/ftl/ftl_init.c @@ -273,8 +273,8 @@ ftl_dev_init_bands(struct spdk_ftl_dev *dev) LIST_INIT(&dev->shut_bands); dev->num_free = 0; - dev->num_bands = ftl_dev_num_bands(dev); - dev->bands = calloc(ftl_dev_num_bands(dev), sizeof(*dev->bands)); + dev->num_bands = ftl_get_num_bands(dev); + dev->bands = calloc(ftl_get_num_bands(dev), sizeof(*dev->bands)); if (!dev->bands) { return -1; } @@ -284,7 +284,7 @@ ftl_dev_init_bands(struct spdk_ftl_dev *dev) return -1; } - for (i = 0; i < ftl_dev_num_bands(dev); ++i) { + for (i = 0; i < ftl_get_num_bands(dev); ++i) { band = &dev->bands[i]; band->id = i; band->dev = dev; @@ -311,7 +311,7 @@ ftl_dev_init_bands(struct spdk_ftl_dev *dev) goto out; } - band->reloc_bitmap = spdk_bit_array_create(ftl_dev_num_bands(dev)); + band->reloc_bitmap = spdk_bit_array_create(ftl_get_num_bands(dev)); if (!band->reloc_bitmap) { SPDK_ERRLOG("Failed to allocate band relocation bitmap\n"); goto out; @@ -324,7 +324,7 @@ ftl_dev_init_bands(struct spdk_ftl_dev *dev) goto out; } - for (j = 0; j < ftl_dev_num_bands(dev); ++j) { + for (j = 0; j < ftl_get_num_bands(dev); ++j) { band = &dev->bands[j]; zone = &band->zone_buf[i]; zone->state = ftl_get_zone_state(&info[j]); @@ -339,7 +339,7 @@ ftl_dev_init_bands(struct spdk_ftl_dev *dev) } } - for (i = 0; i < ftl_dev_num_bands(dev); ++i) { + for (i = 0; i < ftl_get_num_bands(dev); ++i) { band = &dev->bands[i]; band->tail_md_addr = ftl_band_tail_md_addr(band); } @@ -861,7 +861,7 @@ ftl_setup_initial_state(struct spdk_ftl_dev *dev) spdk_uuid_generate(&dev->uuid); dev->num_lbas = 0; - for (i = 0; i < ftl_dev_num_bands(dev); ++i) { + for (i = 0; i < ftl_get_num_bands(dev); ++i) { dev->num_lbas += ftl_band_num_usable_lbks(&dev->bands[i]); } @@ -1168,7 +1168,7 @@ ftl_dev_free_sync(struct spdk_ftl_dev *dev) } if (dev->bands) { - for (i = 0; i < ftl_dev_num_bands(dev); ++i) { + for (i = 0; i < ftl_get_num_bands(dev); ++i) { free(dev->bands[i].zone_buf); spdk_bit_array_free(&dev->bands[i].lba_map.vld); spdk_bit_array_free(&dev->bands[i].reloc_bitmap); diff --git a/lib/ftl/ftl_reloc.c b/lib/ftl/ftl_reloc.c index 90c7a2c58..496910a47 100644 --- a/lib/ftl/ftl_reloc.c +++ b/lib/ftl/ftl_reloc.c @@ -692,12 +692,12 @@ ftl_reloc_init(struct spdk_ftl_dev *dev) goto error; } - reloc->brelocs = calloc(ftl_dev_num_bands(dev), sizeof(*reloc->brelocs)); + reloc->brelocs = calloc(ftl_get_num_bands(dev), sizeof(*reloc->brelocs)); if (!reloc->brelocs) { goto error; } - for (i = 0; i < ftl_dev_num_bands(reloc->dev); ++i) { + for (i = 0; i < ftl_get_num_bands(reloc->dev); ++i) { if (ftl_band_reloc_init(reloc, &reloc->brelocs[i], &dev->bands[i])) { goto error; } @@ -722,7 +722,7 @@ ftl_reloc_free(struct ftl_reloc *reloc) return; } - for (i = 0; i < ftl_dev_num_bands(reloc->dev); ++i) { + for (i = 0; i < ftl_get_num_bands(reloc->dev); ++i) { ftl_band_reloc_free(&reloc->brelocs[i]); } diff --git a/lib/ftl/ftl_restore.c b/lib/ftl/ftl_restore.c index 46d3bec8b..23f6d433e 100644 --- a/lib/ftl/ftl_restore.c +++ b/lib/ftl/ftl_restore.c @@ -175,14 +175,14 @@ ftl_restore_init(struct spdk_ftl_dev *dev, ftl_restore_fn cb) restore->cb = cb; restore->final_phase = false; - restore->bands = calloc(ftl_dev_num_bands(dev), sizeof(*restore->bands)); + restore->bands = calloc(ftl_get_num_bands(dev), sizeof(*restore->bands)); if (!restore->bands) { goto error; } STAILQ_INIT(&restore->pad_bands); - for (i = 0; i < ftl_dev_num_bands(dev); ++i) { + for (i = 0; i < ftl_get_num_bands(dev); ++i) { rband = &restore->bands[i]; rband->band = &dev->bands[i]; rband->parent = restore; @@ -190,7 +190,7 @@ ftl_restore_init(struct spdk_ftl_dev *dev, ftl_restore_fn cb) } /* Allocate buffer capable of holding head mds of all bands */ - restore->md_buf = spdk_dma_zmalloc(ftl_dev_num_bands(dev) * ftl_head_md_num_lbks(dev) * + restore->md_buf = spdk_dma_zmalloc(ftl_get_num_bands(dev) * ftl_head_md_num_lbks(dev) * FTL_BLOCK_SIZE, 0, NULL); if (!restore->md_buf) { goto error; @@ -235,7 +235,7 @@ ftl_restore_check_seq(const struct ftl_restore *restore) const struct ftl_band *next_band; size_t i; - for (i = 0; i < ftl_dev_num_bands(dev); ++i) { + for (i = 0; i < ftl_get_num_bands(dev); ++i) { rband = &restore->bands[i]; if (rband->md_status != FTL_MD_SUCCESS) { continue; @@ -256,7 +256,7 @@ ftl_restore_head_valid(struct spdk_ftl_dev *dev, struct ftl_restore *restore, si struct ftl_restore_band *rband; size_t i; - for (i = 0; i < ftl_dev_num_bands(dev); ++i) { + for (i = 0; i < ftl_get_num_bands(dev); ++i) { rband = &restore->bands[i]; if (rband->md_status != FTL_MD_SUCCESS && @@ -292,7 +292,7 @@ ftl_restore_head_complete(struct ftl_restore *restore) } /* Sort bands in sequence number ascending order */ - qsort(restore->bands, ftl_dev_num_bands(dev), sizeof(struct ftl_restore_band), + qsort(restore->bands, ftl_get_num_bands(dev), sizeof(struct ftl_restore_band), ftl_band_cmp); if (ftl_restore_check_seq(restore)) { @@ -332,9 +332,9 @@ ftl_restore_head_md(void *ctx) unsigned int num_failed = 0, num_ios; size_t i; - restore->num_ios = ftl_dev_num_bands(dev); + restore->num_ios = ftl_get_num_bands(dev); - for (i = 0; i < ftl_dev_num_bands(dev); ++i) { + for (i = 0; i < ftl_get_num_bands(dev); ++i) { rband = &restore->bands[i]; lba_map = &rband->band->lba_map; @@ -416,7 +416,7 @@ ftl_restore_next_band(struct ftl_restore *restore) { struct ftl_restore_band *rband; - for (; restore->current < ftl_dev_num_bands(restore->dev); ++restore->current) { + for (; restore->current < ftl_get_num_bands(restore->dev); ++restore->current) { rband = &restore->bands[restore->current]; if (spdk_likely(rband->band->num_zones) && diff --git a/test/unit/lib/ftl/common/utils.c b/test/unit/lib/ftl/common/utils.c index 06af70056..dbf5dc423 100644 --- a/test/unit/lib/ftl/common/utils.c +++ b/test/unit/lib/ftl/common/utils.c @@ -92,7 +92,7 @@ test_init_ftl_band(struct spdk_ftl_dev *dev, size_t id) band->zone_buf = calloc(ftl_get_num_punits(dev), sizeof(*band->zone_buf)); SPDK_CU_ASSERT_FATAL(band->zone_buf != NULL); - band->reloc_bitmap = spdk_bit_array_create(ftl_dev_num_bands(dev)); + band->reloc_bitmap = spdk_bit_array_create(ftl_get_num_bands(dev)); SPDK_CU_ASSERT_FATAL(band->reloc_bitmap != NULL); for (size_t i = 0; i < ftl_get_num_punits(dev); ++i) { diff --git a/test/unit/lib/ftl/ftl_reloc.c/ftl_reloc_ut.c b/test/unit/lib/ftl/ftl_reloc.c/ftl_reloc_ut.c index df5080987..88674f845 100644 --- a/test/unit/lib/ftl/ftl_reloc.c/ftl_reloc_ut.c +++ b/test/unit/lib/ftl/ftl_reloc.c/ftl_reloc_ut.c @@ -209,9 +209,9 @@ setup_reloc(struct spdk_ftl_dev **_dev, struct ftl_reloc **_reloc, dev->conf.max_active_relocs = MAX_ACTIVE_RELOCS; dev->conf.max_reloc_qdepth = MAX_RELOC_QDEPTH; - SPDK_CU_ASSERT_FATAL(ftl_dev_num_bands(dev) > 0); + SPDK_CU_ASSERT_FATAL(ftl_get_num_bands(dev) > 0); - for (i = 0; i < ftl_dev_num_bands(dev); ++i) { + for (i = 0; i < ftl_get_num_bands(dev); ++i) { test_init_ftl_band(dev, i); } @@ -229,13 +229,13 @@ cleanup_reloc(struct spdk_ftl_dev *dev, struct ftl_reloc *reloc) { size_t i; - for (i = 0; i < ftl_dev_num_bands(reloc->dev); ++i) { + for (i = 0; i < ftl_get_num_bands(reloc->dev); ++i) { SPDK_CU_ASSERT_FATAL(reloc->brelocs[i].state == FTL_BAND_RELOC_STATE_INACTIVE); } ftl_reloc_free(reloc); - for (i = 0; i < ftl_dev_num_bands(dev); ++i) { + for (i = 0; i < ftl_get_num_bands(dev); ++i) { test_free_ftl_band(&dev->bands[i]); } test_free_ftl_dev(dev); diff --git a/test/unit/lib/ftl/ftl_wptr/ftl_wptr_ut.c b/test/unit/lib/ftl/ftl_wptr/ftl_wptr_ut.c index 6b8e991d8..064407d23 100644 --- a/test/unit/lib/ftl/ftl_wptr/ftl_wptr_ut.c +++ b/test/unit/lib/ftl/ftl_wptr/ftl_wptr_ut.c @@ -111,7 +111,7 @@ setup_wptr_test(struct spdk_ftl_dev **dev, const struct spdk_ocssd_geometry_data t_dev = test_init_ftl_dev(geo); - for (i = 0; i < ftl_dev_num_bands(t_dev); ++i) { + for (i = 0; i < ftl_get_num_bands(t_dev); ++i) { test_init_ftl_band(t_dev, i); t_dev->bands[i].state = FTL_BAND_STATE_CLOSED; ftl_band_set_state(&t_dev->bands[i], FTL_BAND_STATE_FREE); @@ -125,7 +125,7 @@ cleanup_wptr_test(struct spdk_ftl_dev *dev) { size_t i; - for (i = 0; i < ftl_dev_num_bands(dev); ++i) { + for (i = 0; i < ftl_get_num_bands(dev); ++i) { dev->bands[i].lba_map.segments = NULL; test_free_ftl_band(&dev->bands[i]); } @@ -148,7 +148,7 @@ test_wptr(void) xfer_size = dev->xfer_size; ftl_add_wptr(dev); - for (i = 0; i < ftl_dev_num_bands(dev); ++i) { + for (i = 0; i < ftl_get_num_bands(dev); ++i) { wptr = LIST_FIRST(&dev->wptr_list); band = wptr->band; ftl_band_set_state(band, FTL_BAND_STATE_OPENING); @@ -180,7 +180,7 @@ test_wptr(void) /* There are no free bands during the last iteration, so */ /* there'll be no new wptr allocation */ - if (i == (ftl_dev_num_bands(dev) - 1)) { + if (i == (ftl_get_num_bands(dev) - 1)) { CU_ASSERT_EQUAL(rc, -1); } else { CU_ASSERT_EQUAL(rc, 0);