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

btrfs: Remove fs_info parameter from remove_block_group_free_space 

This function always takes a trans handle which contains a reference to
the fs_info. Use that and remove the extra argument.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Nikolay Borisov 2018-05-10 15:44:46 +03:00 committed by David Sterba
parent 4457c1c702
commit f3f7277995
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10638,7 +10638,7 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,
mutex_unlock(&fs_info->chunk_mutex); mutex_unlock(&fs_info->chunk_mutex);
ret = remove_block_group_free_space(trans, fs_info, block_group); ret = remove_block_group_free_space(trans, block_group);
if (ret) if (ret)
goto out; goto out;

5
fs/btrfs/free-space-tree.c
View File

@ -1316,10 +1316,9 @@ out:
} }
int remove_block_group_free_space(struct btrfs_trans_handle *trans, int remove_block_group_free_space(struct btrfs_trans_handle *trans,
struct btrfs_fs_info *fs_info,
struct btrfs_block_group_cache *block_group) struct btrfs_block_group_cache *block_group)
{ {
struct btrfs_root *root = fs_info->free_space_root; struct btrfs_root *root = trans->fs_info->free_space_root;
struct btrfs_path *path; struct btrfs_path *path;
struct btrfs_key key, found_key; struct btrfs_key key, found_key;
struct extent_buffer *leaf; struct extent_buffer *leaf;
@ -1327,7 +1326,7 @@ int remove_block_group_free_space(struct btrfs_trans_handle *trans,
int done = 0, nr; int done = 0, nr;
int ret; int ret;
if (!btrfs_fs_compat_ro(fs_info, FREE_SPACE_TREE)) if (!btrfs_fs_compat_ro(trans->fs_info, FREE_SPACE_TREE))
return 0; return 0;
if (block_group->needs_free_space) { if (block_group->needs_free_space) {

1
fs/btrfs/free-space-tree.h
View File

@ -21,7 +21,6 @@ int load_free_space_tree(struct btrfs_caching_control *caching_ctl);
int add_block_group_free_space(struct btrfs_trans_handle *trans, int add_block_group_free_space(struct btrfs_trans_handle *trans,
struct btrfs_block_group_cache *block_group); struct btrfs_block_group_cache *block_group);
int remove_block_group_free_space(struct btrfs_trans_handle *trans, int remove_block_group_free_space(struct btrfs_trans_handle *trans,
struct btrfs_fs_info *fs_info,
struct btrfs_block_group_cache *block_group); struct btrfs_block_group_cache *block_group);
int add_to_free_space_tree(struct btrfs_trans_handle *trans, int add_to_free_space_tree(struct btrfs_trans_handle *trans,
struct btrfs_fs_info *fs_info, struct btrfs_fs_info *fs_info,

2
fs/btrfs/tests/free-space-tree-tests.c
View File

@ -510,7 +510,7 @@ static int run_test(test_func_t test_func, int bitmaps, u32 sectorsize,
if (ret) if (ret)
goto out; goto out;
ret = remove_block_group_free_space(&trans, root->fs_info, cache); ret = remove_block_group_free_space(&trans, cache);
if (ret) { if (ret) {
test_msg("Could not remove block group free space\n"); test_msg("Could not remove block group free space\n");
goto out; goto out;