For an HMZONED volume, a block group maps to a zone of the device. For
deleted unused block groups, the zone of the block group can be reset to
rewind the zone write pointer at the start of the zone.
Signed-off-by: Naohiro Aota <naota@xxxxxxxxx>
---
fs/btrfs/extent-tree.c | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index a5f5935315c8..26989f6fe591 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -2025,6 +2025,25 @@ int btrfs_discard_extent(struct btrfs_fs_info *fs_info, u64 bytenr,
ASSERT(btrfs_test_opt(fs_info, DEGRADED));
continue;
}
+
+ if (clear == BTRFS_CLEAR_OP_DISCARD &&
+ btrfs_dev_is_sequential(stripe->dev,
+ stripe->physical) &&
+ stripe->length == stripe->dev->zone_size) {
+ ret = blkdev_reset_zones(stripe->dev->bdev,
+ stripe->physical >> 9,
+ stripe->length >> 9,
+ GFP_NOFS);
+ if (ret)
+ discarded_bytes += stripe->length;
+ else
+ break;
+ set_bit(stripe->physical >>
+ stripe->dev->zone_size_shift,
+ stripe->dev->empty_zones);
+ continue;
+ }
+
req_q = bdev_get_queue(stripe->dev->bdev);
if (clear == BTRFS_CLEAR_OP_DISCARD &&
!blk_queue_discard(req_q))
@@ -10958,7 +10977,8 @@ void btrfs_delete_unused_bgs(struct btrfs_fs_info *fs_info)
spin_unlock(&space_info->lock);
/* DISCARD can flip during remount */
- trimming = btrfs_test_opt(fs_info, DISCARD);
+ trimming = btrfs_test_opt(fs_info, DISCARD) ||
+ btrfs_fs_incompat(fs_info, HMZONED);
/* Implicit trim during transaction commit. */
if (trimming)
--
2.18.0
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
