Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3f72779 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

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: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 4457c1c7

fs/btrfs/extent-tree.c

+1 −1
Original line number Diff line number Diff line
@@ -10638,7 +10638,7 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans, 


	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)

		goto out;

fs/btrfs/free-space-tree.c

+2 −3
Original line number Diff line number Diff line
@@ -1316,10 +1316,9 @@ int add_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_root *root = fs_info->free_space_root;

	struct btrfs_root *root = trans->fs_info->free_space_root;

	struct btrfs_path *path;

	struct btrfs_key key, found_key;

	struct extent_buffer *leaf;
@@ -1327,7 +1326,7 @@ int remove_block_group_free_space(struct btrfs_trans_handle *trans, 
	int done = 0, nr;

	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;



	if (block_group->needs_free_space) {

fs/btrfs/free-space-tree.h

+0 −1
Original line number Diff line number Diff line
@@ -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,

			       struct btrfs_block_group_cache *block_group);

int remove_block_group_free_space(struct btrfs_trans_handle *trans,

				  struct btrfs_fs_info *fs_info,

				  struct btrfs_block_group_cache *block_group);

int add_to_free_space_tree(struct btrfs_trans_handle *trans,

			   struct btrfs_fs_info *fs_info,

fs/btrfs/tests/free-space-tree-tests.c

+1 −1
Original line number Diff line number Diff line
@@ -510,7 +510,7 @@ static int run_test(test_func_t test_func, int bitmaps, u32 sectorsize, 
	if (ret)

		goto out;



	ret = remove_block_group_free_space(&trans, root->fs_info, cache);

	ret = remove_block_group_free_space(&trans, cache);

	if (ret) {

		test_msg("Could not remove block group free space\n");

		goto out;