summaryrefslogtreecommitdiff
path: root/fs/btrfs/extent-tree.c
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.com>2019-10-23 19:48:11 +0300
committerDavid Sterba <dsterba@suse.com>2019-11-18 19:51:44 +0300
commitbf38be65f3703d5ef3661c0a2802bc28e76b8f19 (patch)
tree3b1d7c392be5bde0fadd429c5024f1350de764ec /fs/btrfs/extent-tree.c
parent34b127aecd4fe8e6a3903e10f204a7b7ffddca22 (diff)
downloadlinux-bf38be65f3703d5ef3661c0a2802bc28e76b8f19.tar.xz
btrfs: move block_group_item::used to block group
For unknown reasons, the member 'used' in the block group struct is stored in the b-tree item and accessed everywhere using the special accessor helper. Let's unify it and make it a regular member and only update the item before writing it to the tree. The item is still being used for flags and chunk_objectid, there's some duplication until the item is removed in following patches. Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de> Reviewed-by: Nikolay Borisov <nborisov@suse.com> Reviewed-by: Qu Wenruo <wqu@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/extent-tree.c')
-rw-r--r--fs/btrfs/extent-tree.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 569fd2adecaa..e3fd4b0ca905 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -5498,8 +5498,7 @@ u64 btrfs_account_ro_block_groups_free_space(struct btrfs_space_info *sinfo)
factor = btrfs_bg_type_to_factor(block_group->flags);
free_bytes += (block_group->key.offset -
- btrfs_block_group_used(&block_group->item)) *
- factor;
+ block_group->used) * factor;
spin_unlock(&block_group->lock);
}