Commit 3725b448 authored by Wojciech Malikowski's avatar Wojciech Malikowski Committed by Tomasz Zawadzki
Browse files

lib/ftl: Rename ftl_num_band_lbks() to ftl_get_num_blocks_in_band() 



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

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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Community-CI: Broadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
parent 2ff623b5

lib/ftl/ftl_band.c

+6 −6
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ ftl_vld_map_num_lbks(const struct spdk_ftl_dev *dev) 
size_t

ftl_lba_map_num_lbks(const struct spdk_ftl_dev *dev)

{

	return spdk_divide_round_up(ftl_num_band_lbks(dev) * sizeof(uint64_t), FTL_BLOCK_SIZE);

	return spdk_divide_round_up(ftl_get_num_blocks_in_band(dev) * sizeof(uint64_t), FTL_BLOCK_SIZE);

}



size_t
@@ -139,7 +139,7 @@ ftl_band_write_failed(struct ftl_band *band) 


	band->high_prio = 1;



	ftl_reloc_add(dev->reloc, band, 0, ftl_num_band_lbks(dev), 1, true);

	ftl_reloc_add(dev->reloc, band, 0, ftl_get_num_blocks_in_band(dev), 1, true);

	ftl_band_set_state(band, FTL_BAND_STATE_CLOSED);

}
@@ -288,7 +288,7 @@ ftl_pack_tail_md(struct ftl_band *band) 


	/* Clear out the buffer */

	memset(tail, 0, ftl_tail_md_hdr_num_lbks() * FTL_BLOCK_SIZE);

	tail->num_lbks = ftl_num_band_lbks(dev);

	tail->num_lbks = ftl_get_num_blocks_in_band(dev);



	pthread_spin_lock(&lba_map->lock);

	spdk_bit_array_store_mask(lba_map->vld, vld_offset);
@@ -343,7 +343,7 @@ ftl_unpack_tail_md(struct ftl_band *band) 
		return FTL_MD_NO_MD;

	}



	if (tail->num_lbks != ftl_num_band_lbks(dev)) {

	if (tail->num_lbks != ftl_get_num_blocks_in_band(dev)) {

		return FTL_MD_INVALID_SIZE;

	}
@@ -1147,7 +1147,7 @@ ftl_band_clear_lba_map(struct ftl_band *band) 


	/* For open band all lba map segments are already cached */

	assert(band->state == FTL_BAND_STATE_PREP);

	num_segments = spdk_divide_round_up(ftl_num_band_lbks(band->dev), FTL_NUM_LBA_IN_BLOCK);

	num_segments = spdk_divide_round_up(ftl_get_num_blocks_in_band(band->dev), FTL_NUM_LBA_IN_BLOCK);

	ftl_lba_map_set_segment_state(&band->lba_map, 0, num_segments, FTL_LBA_MAP_SEG_CACHED);



	lba_map->num_vld = 0;
@@ -1158,5 +1158,5 @@ ftl_lba_map_pool_elem_size(struct spdk_ftl_dev *dev) 
{

	/* Map pool element holds the whole tail md + segments map */

	return ftl_tail_md_num_lbks(dev) * FTL_BLOCK_SIZE +

	       spdk_divide_round_up(ftl_num_band_lbks(dev), FTL_NUM_LBA_IN_BLOCK);

	       spdk_divide_round_up(ftl_get_num_blocks_in_band(dev), FTL_NUM_LBA_IN_BLOCK);

}

lib/ftl/ftl_core.c

+1 −1
Original line number Diff line number Diff line
@@ -1866,7 +1866,7 @@ ftl_process_relocs(struct spdk_ftl_dev *dev) 
	if (ftl_dev_needs_defrag(dev)) {

		band = ftl_select_defrag_band(dev);

		if (band) {

			ftl_reloc_add(dev->reloc, band, 0, ftl_num_band_lbks(dev), 0, true);

			ftl_reloc_add(dev->reloc, band, 0, ftl_get_num_blocks_in_band(dev), 0, true);

			ftl_trace_defrag_band(dev, band);

		}

	}

lib/ftl/ftl_core.h

+2 −2
Original line number Diff line number Diff line
@@ -469,7 +469,7 @@ ftl_dev_num_punits(const struct spdk_ftl_dev *dev) 
}



static inline uint64_t

ftl_num_band_lbks(const struct spdk_ftl_dev *dev)

ftl_get_num_blocks_in_band(const struct spdk_ftl_dev *dev)

{

	return ftl_dev_num_punits(dev) * ftl_dev_lbks_in_zone(dev);

}
@@ -477,7 +477,7 @@ ftl_num_band_lbks(const struct spdk_ftl_dev *dev) 
static inline size_t

ftl_vld_map_size(const struct spdk_ftl_dev *dev)

{

	return (size_t)spdk_divide_round_up(ftl_num_band_lbks(dev), CHAR_BIT);

	return (size_t)spdk_divide_round_up(ftl_get_num_blocks_in_band(dev), CHAR_BIT);

}



static inline bool

lib/ftl/ftl_debug.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ ftl_band_validate_md(struct ftl_band *band) 
	size_t i, size, seg_off;

	bool valid = true;



	size = ftl_num_band_lbks(dev);

	size = ftl_get_num_blocks_in_band(dev);



	pthread_spin_lock(&lba_map->lock);

	for (i = 0; i < size; ++i) {

lib/ftl/ftl_init.c

+4 −4
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ ftl_band_init_md(struct ftl_band *band) 
{

	struct ftl_lba_map *lba_map = &band->lba_map;



	lba_map->vld = spdk_bit_array_create(ftl_num_band_lbks(band->dev));

	lba_map->vld = spdk_bit_array_create(ftl_get_num_blocks_in_band(band->dev));

	if (!lba_map->vld) {

		return -ENOMEM;

	}
@@ -474,10 +474,10 @@ ftl_dev_init_nv_cache(struct spdk_ftl_dev *dev, struct spdk_bdev_desc *bdev_desc 
	 * inside the cache can be overwritten, the band it's stored on has to be closed. Plus one

	 * extra block is needed to store the header.

	 */

	if (spdk_bdev_get_num_blocks(bdev) < ftl_num_band_lbks(dev) * 2 + 1) {

	if (spdk_bdev_get_num_blocks(bdev) < ftl_get_num_blocks_in_band(dev) * 2 + 1) {

		SPDK_ERRLOG("Insufficient number of blocks for write buffer cache (available: %"

			    PRIu64", required: %"PRIu64")\n", spdk_bdev_get_num_blocks(bdev),

			    ftl_num_band_lbks(dev) * 2 + 1);

			    ftl_get_num_blocks_in_band(dev) * 2 + 1);

		return -1;

	}
@@ -529,7 +529,7 @@ ftl_lba_map_request_ctor(struct spdk_mempool *mp, void *opaque, void *obj, unsig 
	struct spdk_ftl_dev *dev = opaque;



	request->segments = spdk_bit_array_create(spdk_divide_round_up(

				    ftl_num_band_lbks(dev), FTL_NUM_LBA_IN_BLOCK));

				    ftl_get_num_blocks_in_band(dev), FTL_NUM_LBA_IN_BLOCK));

}



static int