Commit 5daaf552 authored by Naohiro Aota's avatar Naohiro Aota Committed by David Sterba

btrfs: zoned: consider zone as full when no more SB can be written

We cannot write beyond zone capacity. So, we should consider a zone as
"full" when the write pointer goes beyond capacity - the size of super
info.

Also, take this opportunity to replace a subtle duplicated code with a loop
and fix a typo in comment.
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarNaohiro Aota <naohiro.aota@wdc.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent d8da0e85
...@@ -45,6 +45,14 @@ ...@@ -45,6 +45,14 @@
*/ */
#define BTRFS_MAX_ZONE_SIZE SZ_8G #define BTRFS_MAX_ZONE_SIZE SZ_8G
#define SUPER_INFO_SECTORS ((u64)BTRFS_SUPER_INFO_SIZE >> SECTOR_SHIFT)
static inline bool sb_zone_is_full(const struct blk_zone *zone)
{
return (zone->cond == BLK_ZONE_COND_FULL) ||
(zone->wp + SUPER_INFO_SECTORS > zone->start + zone->capacity);
}
static int copy_zone_info_cb(struct blk_zone *zone, unsigned int idx, void *data) static int copy_zone_info_cb(struct blk_zone *zone, unsigned int idx, void *data)
{ {
struct blk_zone *zones = data; struct blk_zone *zones = data;
...@@ -60,14 +68,13 @@ static int sb_write_pointer(struct block_device *bdev, struct blk_zone *zones, ...@@ -60,14 +68,13 @@ static int sb_write_pointer(struct block_device *bdev, struct blk_zone *zones,
bool empty[BTRFS_NR_SB_LOG_ZONES]; bool empty[BTRFS_NR_SB_LOG_ZONES];
bool full[BTRFS_NR_SB_LOG_ZONES]; bool full[BTRFS_NR_SB_LOG_ZONES];
sector_t sector; sector_t sector;
int i;
ASSERT(zones[0].type != BLK_ZONE_TYPE_CONVENTIONAL && for (i = 0; i < BTRFS_NR_SB_LOG_ZONES; i++) {
zones[1].type != BLK_ZONE_TYPE_CONVENTIONAL); ASSERT(zones[i].type != BLK_ZONE_TYPE_CONVENTIONAL);
empty[i] = (zones[i].cond == BLK_ZONE_COND_EMPTY);
empty[0] = (zones[0].cond == BLK_ZONE_COND_EMPTY); full[i] = sb_zone_is_full(&zones[i]);
empty[1] = (zones[1].cond == BLK_ZONE_COND_EMPTY); }
full[0] = (zones[0].cond == BLK_ZONE_COND_FULL);
full[1] = (zones[1].cond == BLK_ZONE_COND_FULL);
/* /*
* Possible states of log buffer zones * Possible states of log buffer zones
...@@ -664,7 +671,7 @@ static int sb_log_location(struct block_device *bdev, struct blk_zone *zones, ...@@ -664,7 +671,7 @@ static int sb_log_location(struct block_device *bdev, struct blk_zone *zones,
reset = &zones[1]; reset = &zones[1];
if (reset && reset->cond != BLK_ZONE_COND_EMPTY) { if (reset && reset->cond != BLK_ZONE_COND_EMPTY) {
ASSERT(reset->cond == BLK_ZONE_COND_FULL); ASSERT(sb_zone_is_full(reset));
ret = blkdev_zone_mgmt(bdev, REQ_OP_ZONE_RESET, ret = blkdev_zone_mgmt(bdev, REQ_OP_ZONE_RESET,
reset->start, reset->len, reset->start, reset->len,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment