diff options
| author |   Naohiro Aota <naohiro.aota@wdc.com> | 2021-08-19 21:19:10 +0900 |
|---|---|---|
| committer |   David Sterba <dsterba@suse.com> | 2021-10-26 19:07:58 +0200 |
| commit | 98173255bddd24cb7d50b5da936f8dff76f5a732 (patch) | |
| tree | 43219dba06bb13edcbfbb9aa3904760ebefbeb04 /fs/btrfs/block-group.c | |
| parent | btrfs: zoned: move btrfs_free_excluded_extents out of btrfs_calc_zone_unusable (diff) | |
| download | linux-dev-98173255bddd24cb7d50b5da936f8dff76f5a732.tar.xz linux-dev-98173255bddd24cb7d50b5da936f8dff76f5a732.zip | |
btrfs: zoned: calculate free space from zone capacity
Now that we introduced capacity in a block group, we need to calculate free
space using the capacity instead of the length. Thus, bytes we account
capacity - alloc_pointer as free, and account bytes [capacity, length] as
zone unusable.
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Naohiro Aota <naohiro.aota@wdc.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/block-group.c')
| -rw-r--r-- | fs/btrfs/block-group.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c index 4f43825ac754..e9295e3c2cb3 100644 --- a/fs/btrfs/block-group.c +++ b/fs/btrfs/block-group.c @@ -2484,7 +2484,8 @@ struct btrfs_block_group *btrfs_make_block_group(struct btrfs_trans_handle *tran */ trace_btrfs_add_block_group(fs_info, cache, 1); btrfs_update_space_info(fs_info, cache->flags, size, bytes_used, - cache->bytes_super, 0, &cache->space_info); + cache->bytes_super, cache->zone_unusable, + &cache->space_info); btrfs_update_global_block_rsv(fs_info); link_block_group(cache); @@ -2599,7 +2600,9 @@ void btrfs_dec_block_group_ro(struct btrfs_block_group *cache) if (!--cache->ro) { if (btrfs_is_zoned(cache->fs_info)) { /* Migrate zone_unusable bytes back */ - cache->zone_unusable = cache->alloc_offset - cache->used; + cache->zone_unusable = + (cache->alloc_offset - cache->used) + + (cache->length - cache->zone_capacity); sinfo->bytes_zone_unusable += cache->zone_unusable; sinfo->bytes_readonly -= cache->zone_unusable; } |