Commit 0637e2d9 authored by Wojciech Malikowski's avatar Wojciech Malikowski Committed by Tomasz Zawadzki
Browse files

lib/ftl: Rename ftl_dev_num_bands() to ftl_get_num_bands() 



This patch is part of name refactoring associated
with moving FTL to work with zone bdev API.

Change-Id: Ia4c6ec7b245600bca895f7802fb7f68c8d0400e4
Signed-off-by: default avatarWojciech Malikowski <wojciech.malikowski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/479845


Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
parent 2c2a0056

lib/ftl/ftl_band.c

+1 −1
Original line number Diff line number Diff line
@@ -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];

}

lib/ftl/ftl_core.c

+1 −1
Original line number Diff line number Diff line
@@ -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--;

lib/ftl/ftl_core.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

lib/ftl/ftl_debug.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}

lib/ftl/ftl_init.c

+8 −8
Original line number Diff line number Diff line
@@ -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);