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

lib/ftl: Remove punit from ftl_zone struct

Browse Source 
Parallel unit is not needed anymore in ftl_zone
structure.

Change-Id: Ie8d78e3ccf64db84aff19ad2ce11e662d4f3f724
Signed-off-by: Wojciech Malikowski <wojciech.malikowski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/468345
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: Mateusz Kozlowski <mateusz.kozlowski@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Wojciech Malikowski 2019-09-12 10:00:52 -04:00 committed by Tomasz Zawadzki
parent aea8e78df2
commit 7ef136d3f4
4 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ftl/ftl_band.c
View File

@ -406,7 +406,7 @@ ftl_band_tail_md_addr(struct ftl_band *band)
addr.offset = (num_req / band->num_zones) * xfer_size; addr.offset = (num_req / band->num_zones) * xfer_size;
addr.zone_id = band->id; addr.zone_id = band->id;
addr.pu = zone->punit->start_addr.pu; addr.pu = zone->start_addr.pu;
return addr; return addr;
} }
@ -414,13 +414,13 @@ ftl_band_tail_md_addr(struct ftl_band *band)
struct ftl_addr struct ftl_addr
ftl_band_head_md_addr(struct ftl_band *band) ftl_band_head_md_addr(struct ftl_band *band)
{ {
struct ftl_addr addr; struct ftl_addr addr = {};
if (spdk_unlikely(!band->num_zones)) { if (spdk_unlikely(!band->num_zones)) {
return ftl_to_addr(FTL_ADDR_INVALID); 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; addr.zone_id = band->id;
return addr; return addr;

3
lib/ftl/ftl_band.h
View File

@ -62,9 +62,6 @@ struct ftl_zone {
/* First logical block of a zone */ /* First logical block of a zone */
struct ftl_addr start_addr; struct ftl_addr start_addr;
/* Pointer to parallel unit */
struct ftl_punit *punit;
/* Position in band's zone_buf */ /* Position in band's zone_buf */
uint32_t pos; uint32_t pos;

3
lib/ftl/ftl_init.c
View File

@ -337,8 +337,7 @@ ftl_dev_init_bands(struct spdk_ftl_dev *dev)
zone = &band->zone_buf[i]; zone = &band->zone_buf[i];
zone->pos = i; zone->pos = i;
zone->state = ftl_get_zone_state(&info[j]); zone->state = ftl_get_zone_state(&info[j]);
zone->punit = punit; zone->start_addr.pu = i;
zone->start_addr = punit->start_addr;
zone->start_addr.zone_id = band->id; zone->start_addr.zone_id = band->id;
zone->write_offset = ftl_dev_lbks_in_zone(dev); zone->write_offset = ftl_dev_lbks_in_zone(dev);

1
test/unit/lib/ftl/common/utils.c
View File

@ -107,7 +107,6 @@ test_init_ftl_band(struct spdk_ftl_dev *dev, size_t id)
zone = &band->zone_buf[i]; zone = &band->zone_buf[i];
zone->pos = i; zone->pos = i;
zone->state = SPDK_BDEV_ZONE_STATE_CLOSED; zone->state = SPDK_BDEV_ZONE_STATE_CLOSED;
zone->punit = &dev->punits[i];
zone->start_addr = dev->punits[i].start_addr; zone->start_addr = dev->punits[i].start_addr;
zone->start_addr.zone_id = band->id; zone->start_addr.zone_id = band->id;
CIRCLEQ_INSERT_TAIL(&band->zones, zone, circleq); CIRCLEQ_INSERT_TAIL(&band->zones, zone, circleq);