Commit 7ef136d3 authored by Wojciech Malikowski's avatar Wojciech Malikowski Committed by Tomasz Zawadzki
Browse files

lib/ftl: Remove punit from ftl_zone struct 



Parallel unit is not needed anymore in ftl_zone
structure.

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


Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarMateusz Kozlowski <mateusz.kozlowski@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent aea8e78d

lib/ftl/ftl_band.c

+3 −3
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ ftl_band_tail_md_addr(struct ftl_band *band) 


	addr.offset = (num_req / band->num_zones) * xfer_size;

	addr.zone_id = band->id;

	addr.pu = zone->punit->start_addr.pu;

	addr.pu = zone->start_addr.pu;



	return addr;

}
@@ -414,13 +414,13 @@ ftl_band_tail_md_addr(struct ftl_band *band) 
struct ftl_addr

ftl_band_head_md_addr(struct ftl_band *band)

{

	struct ftl_addr addr;

	struct ftl_addr addr = {};



	if (spdk_unlikely(!band->num_zones)) {

		return ftl_to_addr(FTL_ADDR_INVALID);

	}



	addr = CIRCLEQ_FIRST(&band->zones)->punit->start_addr;

	addr.pu = CIRCLEQ_FIRST(&band->zones)->start_addr.pu;

	addr.zone_id = band->id;



	return addr;

lib/ftl/ftl_band.h

+0 −3
Original line number Diff line number Diff line
@@ -62,9 +62,6 @@ struct ftl_zone { 
	/* First logical block of a zone */

	struct ftl_addr				start_addr;



	/* Pointer to parallel unit */

	struct ftl_punit			*punit;



	/* Position in band's zone_buf */

	uint32_t				pos;

lib/ftl/ftl_init.c

+1 −2
Original line number Diff line number Diff line
@@ -337,8 +337,7 @@ ftl_dev_init_bands(struct spdk_ftl_dev *dev) 
			zone = &band->zone_buf[i];

			zone->pos = i;

			zone->state = ftl_get_zone_state(&info[j]);

			zone->punit = punit;

			zone->start_addr = punit->start_addr;

			zone->start_addr.pu = i;

			zone->start_addr.zone_id = band->id;

			zone->write_offset = ftl_dev_lbks_in_zone(dev);

test/unit/lib/ftl/common/utils.c

+0 −1
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ test_init_ftl_band(struct spdk_ftl_dev *dev, size_t id) 
		zone = &band->zone_buf[i];

		zone->pos = i;

		zone->state = SPDK_BDEV_ZONE_STATE_CLOSED;

		zone->punit = &dev->punits[i];

		zone->start_addr = dev->punits[i].start_addr;

		zone->start_addr.zone_id = band->id;

		CIRCLEQ_INSERT_TAIL(&band->zones, zone, circleq);