UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

btrfs: temporarily export fragment_free_space 

This is used in caching and reading block groups, so export it while we
move these chunks independently.

Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Josef Bacik 2019-06-20 15:37:51 -04:00 committed by David Sterba
parent e3cb339fa5
commit caa4efafcf
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fs/btrfs/block-group.h
View File

@ -149,6 +149,7 @@ static inline int btrfs_should_fragment_free_space(
(btrfs_test_opt(fs_info, FRAGMENT_DATA) && (btrfs_test_opt(fs_info, FRAGMENT_DATA) &&
block_group->flags & BTRFS_BLOCK_GROUP_DATA); block_group->flags & BTRFS_BLOCK_GROUP_DATA);
} }
void btrfs_fragment_free_space(struct btrfs_block_group_cache *block_group);
#endif #endif
struct btrfs_block_group_cache *btrfs_lookup_first_block_group( struct btrfs_block_group_cache *btrfs_lookup_first_block_group(

8
fs/btrfs/extent-tree.c
View File

@ -206,7 +206,7 @@ void btrfs_put_caching_control(struct btrfs_caching_control *ctl)
} }
#ifdef CONFIG_BTRFS_DEBUG #ifdef CONFIG_BTRFS_DEBUG
static void fragment_free_space(struct btrfs_block_group_cache *block_group) void btrfs_fragment_free_space(struct btrfs_block_group_cache *block_group)
{ {
struct btrfs_fs_info *fs_info = block_group->fs_info; struct btrfs_fs_info *fs_info = block_group->fs_info;
u64 start = block_group->key.objectid; u64 start = block_group->key.objectid;
@ -443,7 +443,7 @@ static noinline void caching_thread(struct btrfs_work *work)
block_group->space_info->bytes_used += bytes_used >> 1; block_group->space_info->bytes_used += bytes_used >> 1;
spin_unlock(&block_group->lock); spin_unlock(&block_group->lock);
spin_unlock(&block_group->space_info->lock); spin_unlock(&block_group->space_info->lock);
fragment_free_space(block_group); btrfs_fragment_free_space(block_group);
} }
#endif #endif
@ -550,7 +550,7 @@ int btrfs_cache_block_group(struct btrfs_block_group_cache *cache,
cache->space_info->bytes_used += bytes_used >> 1; cache->space_info->bytes_used += bytes_used >> 1;
spin_unlock(&cache->lock); spin_unlock(&cache->lock);
spin_unlock(&cache->space_info->lock); spin_unlock(&cache->space_info->lock);
fragment_free_space(cache); btrfs_fragment_free_space(cache);
} }
#endif #endif
mutex_unlock(&caching_ctl->mutex); mutex_unlock(&caching_ctl->mutex);
@ -7968,7 +7968,7 @@ int btrfs_make_block_group(struct btrfs_trans_handle *trans, u64 bytes_used,
u64 new_bytes_used = size - bytes_used; u64 new_bytes_used = size - bytes_used;
bytes_used += new_bytes_used >> 1; bytes_used += new_bytes_used >> 1;
fragment_free_space(cache); btrfs_fragment_free_space(cache);
} }
#endif #endif
/* /*