From: Josef Bacik <josef@toxicpanda.com>
Date: Thu, 20 Jun 2019 15:37:54 -0400
Subject: btrfs: temporarily export inc_block_group_ro
Git-commit: 3b2a78f21d5c53ff34b8e03cba4f904c91d4b3a2
Patch-mainline: v5.4-rc1
References: bsc#1165949
This is used in a few logical parts of the block group code, temporarily
export it so we can move things in pieces.
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Acked-by: Nikolay Borisov <nborisov@suse.com>
---
fs/btrfs/block-group.h | 2 ++
fs/btrfs/extent-tree.c | 14 +++++++-------
2 files changed, 9 insertions(+), 7 deletions(-)
--- a/fs/btrfs/block-group.h
+++ b/fs/btrfs/block-group.h
@@ -185,4 +185,6 @@ static inline int btrfs_block_group_cach
cache->cached == BTRFS_CACHE_ERROR;
}
+int __btrfs_inc_block_group_ro(struct btrfs_block_group_cache *cache, int force);
+
#endif /* BTRFS_BLOCK_GROUP_H */
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -6763,7 +6763,7 @@ static u64 update_block_group_flags(stru
return flags;
}
-static int inc_block_group_ro(struct btrfs_block_group_cache *cache, int force)
+int __inc_block_group_ro(struct btrfs_block_group_cache *cache, int force)
{
struct btrfs_space_info *sinfo = cache->space_info;
u64 num_bytes;
@@ -6868,14 +6868,14 @@ again:
goto out;
}
- ret = inc_block_group_ro(cache, 0);
+ ret = __btrfs_inc_block_group_ro(cache, 0);
if (!ret)
goto out;
alloc_flags = get_alloc_profile(fs_info, cache->space_info->flags);
ret = btrfs_chunk_alloc(trans, alloc_flags, CHUNK_ALLOC_FORCE);
if (ret < 0)
goto out;
- ret = inc_block_group_ro(cache, 0);
+ ret = __btrfs_inc_block_group_ro(cache, 0);
out:
if (cache->flags & BTRFS_BLOCK_GROUP_SYSTEM) {
alloc_flags = update_block_group_flags(fs_info, cache->flags);
@@ -7616,7 +7616,7 @@ int btrfs_read_block_groups(struct btrfs
set_avail_alloc_bits(info, cache->flags);
if (btrfs_chunk_readonly(info, cache->key.objectid)) {
- inc_block_group_ro(cache, 1);
+ __btrfs_inc_block_group_ro(cache, 1);
} else if (btrfs_block_group_used(&cache->item) == 0) {
spin_lock(&info->unused_bgs_lock);
/* Should always be true but just in case. */
@@ -7644,11 +7644,11 @@ int btrfs_read_block_groups(struct btrfs
list_for_each_entry(cache,
&space_info->block_groups[BTRFS_RAID_RAID0],
list)
- inc_block_group_ro(cache, 1);
+ __btrfs_inc_block_group_ro(cache, 1);
list_for_each_entry(cache,
&space_info->block_groups[BTRFS_RAID_SINGLE],
list)
- inc_block_group_ro(cache, 1);
+ __btrfs_inc_block_group_ro(cache, 1);
}
btrfs_add_raid_kobjects(info);
@@ -8187,7 +8187,7 @@ void btrfs_delete_unused_bgs(struct btrf
spin_unlock(&block_group->lock);
/* We don't want to force the issue, only flip if it's ok. */
- ret = inc_block_group_ro(block_group, 0);
+ ret = __btrfs_inc_block_group_ro(block_group, 0);
up_write(&space_info->groups_sem);
if (ret < 0) {
ret = 0;