Commit 3b2a78f2 authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba

btrfs: temporarily export inc_block_group_ro

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: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 9f21246d
...@@ -185,4 +185,6 @@ static inline int btrfs_block_group_cache_done( ...@@ -185,4 +185,6 @@ static inline int btrfs_block_group_cache_done(
cache->cached == BTRFS_CACHE_ERROR; cache->cached == BTRFS_CACHE_ERROR;
} }
int __btrfs_inc_block_group_ro(struct btrfs_block_group_cache *cache, int force);
#endif /* BTRFS_BLOCK_GROUP_H */ #endif /* BTRFS_BLOCK_GROUP_H */
...@@ -6697,7 +6697,7 @@ static u64 update_block_group_flags(struct btrfs_fs_info *fs_info, u64 flags) ...@@ -6697,7 +6697,7 @@ static u64 update_block_group_flags(struct btrfs_fs_info *fs_info, u64 flags)
* data in this block group. That check should be done by relocation routine, * data in this block group. That check should be done by relocation routine,
* not this function. * not this function.
*/ */
static int inc_block_group_ro(struct btrfs_block_group_cache *cache, int force) int __btrfs_inc_block_group_ro(struct btrfs_block_group_cache *cache, int force)
{ {
struct btrfs_space_info *sinfo = cache->space_info; struct btrfs_space_info *sinfo = cache->space_info;
u64 num_bytes; u64 num_bytes;
...@@ -6807,14 +6807,14 @@ int btrfs_inc_block_group_ro(struct btrfs_block_group_cache *cache) ...@@ -6807,14 +6807,14 @@ int btrfs_inc_block_group_ro(struct btrfs_block_group_cache *cache)
goto out; goto out;
} }
ret = inc_block_group_ro(cache, 0); ret = __btrfs_inc_block_group_ro(cache, 0);
if (!ret) if (!ret)
goto out; goto out;
alloc_flags = get_alloc_profile(fs_info, cache->space_info->flags); alloc_flags = get_alloc_profile(fs_info, cache->space_info->flags);
ret = btrfs_chunk_alloc(trans, alloc_flags, CHUNK_ALLOC_FORCE); ret = btrfs_chunk_alloc(trans, alloc_flags, CHUNK_ALLOC_FORCE);
if (ret < 0) if (ret < 0)
goto out; goto out;
ret = inc_block_group_ro(cache, 0); ret = __btrfs_inc_block_group_ro(cache, 0);
out: out:
if (cache->flags & BTRFS_BLOCK_GROUP_SYSTEM) { if (cache->flags & BTRFS_BLOCK_GROUP_SYSTEM) {
alloc_flags = update_block_group_flags(fs_info, cache->flags); alloc_flags = update_block_group_flags(fs_info, cache->flags);
...@@ -7347,7 +7347,7 @@ int btrfs_read_block_groups(struct btrfs_fs_info *info) ...@@ -7347,7 +7347,7 @@ int btrfs_read_block_groups(struct btrfs_fs_info *info)
set_avail_alloc_bits(info, cache->flags); set_avail_alloc_bits(info, cache->flags);
if (btrfs_chunk_readonly(info, cache->key.objectid)) { 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) { } else if (btrfs_block_group_used(&cache->item) == 0) {
ASSERT(list_empty(&cache->bg_list)); ASSERT(list_empty(&cache->bg_list));
btrfs_mark_bg_unused(cache); btrfs_mark_bg_unused(cache);
...@@ -7368,11 +7368,11 @@ int btrfs_read_block_groups(struct btrfs_fs_info *info) ...@@ -7368,11 +7368,11 @@ int btrfs_read_block_groups(struct btrfs_fs_info *info)
list_for_each_entry(cache, list_for_each_entry(cache,
&space_info->block_groups[BTRFS_RAID_RAID0], &space_info->block_groups[BTRFS_RAID_RAID0],
list) list)
inc_block_group_ro(cache, 1); __btrfs_inc_block_group_ro(cache, 1);
list_for_each_entry(cache, list_for_each_entry(cache,
&space_info->block_groups[BTRFS_RAID_SINGLE], &space_info->block_groups[BTRFS_RAID_SINGLE],
list) list)
inc_block_group_ro(cache, 1); __btrfs_inc_block_group_ro(cache, 1);
} }
btrfs_init_global_block_rsv(info); btrfs_init_global_block_rsv(info);
...@@ -7911,7 +7911,7 @@ void btrfs_delete_unused_bgs(struct btrfs_fs_info *fs_info) ...@@ -7911,7 +7911,7 @@ void btrfs_delete_unused_bgs(struct btrfs_fs_info *fs_info)
spin_unlock(&block_group->lock); spin_unlock(&block_group->lock);
/* We don't want to force the issue, only flip if it's ok. */ /* 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); up_write(&space_info->groups_sem);
if (ret < 0) { if (ret < 0) {
ret = 0; ret = 0;
......
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