diff --git a/lib/ftl/ftl_band.c b/lib/ftl/ftl_band.c index 86e15f24b..3b6bc88db 100644 --- a/lib/ftl/ftl_band.c +++ b/lib/ftl/ftl_band.c @@ -1122,7 +1122,7 @@ ftl_band_next_operational_zone(struct ftl_band *band, struct ftl_zone *zone) result = ftl_band_next_zone(band, zone); } else { CIRCLEQ_FOREACH_REVERSE(entry, &band->zones, circleq) { - if (entry->pos > zone->pos) { + if (entry->start_addr.pu > zone->start_addr.pu) { result = entry; } else { if (!result) { diff --git a/lib/ftl/ftl_band.h b/lib/ftl/ftl_band.h index ac09e45ad..0af99e544 100644 --- a/lib/ftl/ftl_band.h +++ b/lib/ftl/ftl_band.h @@ -62,9 +62,6 @@ struct ftl_zone { /* First logical block of a zone */ struct ftl_addr start_addr; - /* Position in band's zone_buf */ - uint32_t pos; - CIRCLEQ_ENTRY(ftl_zone) circleq; }; diff --git a/lib/ftl/ftl_init.c b/lib/ftl/ftl_init.c index f8ddd7be5..a05354f17 100644 --- a/lib/ftl/ftl_init.c +++ b/lib/ftl/ftl_init.c @@ -328,7 +328,6 @@ ftl_dev_init_bands(struct spdk_ftl_dev *dev) for (j = 0; j < ftl_dev_num_bands(dev); ++j) { band = &dev->bands[j]; zone = &band->zone_buf[i]; - zone->pos = i; zone->state = ftl_get_zone_state(&info[j]); zone->start_addr.pu = i; zone->start_addr.zone_id = band->id; diff --git a/test/unit/lib/ftl/common/utils.c b/test/unit/lib/ftl/common/utils.c index c6caa2b81..1883e62b0 100644 --- a/test/unit/lib/ftl/common/utils.c +++ b/test/unit/lib/ftl/common/utils.c @@ -97,7 +97,6 @@ test_init_ftl_band(struct spdk_ftl_dev *dev, size_t id) for (size_t i = 0; i < ftl_dev_num_punits(dev); ++i) { zone = &band->zone_buf[i]; - zone->pos = i; zone->state = SPDK_BDEV_ZONE_STATE_CLOSED; zone->start_addr.pu = i; zone->start_addr.zone_id = band->id;