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

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

btrfs: Remove fs_info argument from add_block_group_free_space 



We also pass in a transaction handle which has a reference to the
fs_info. Just remove the extraneous 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 483bce06

fs/btrfs/extent-tree.c

+1 −1
Original line number Diff line number Diff line
@@ -10259,7 +10259,7 @@ void btrfs_create_pending_block_groups(struct btrfs_trans_handle *trans) 
					       key.offset);

		if (ret)

			btrfs_abort_transaction(trans, ret);

		add_block_group_free_space(trans, fs_info, block_group);

		add_block_group_free_space(trans, block_group);

		/* already aborted the transaction if it failed. */

next:

		list_del_init(&block_group->bg_list);

fs/btrfs/free-space-tree.c

+1 −1
Original line number Diff line number Diff line
@@ -1292,9 +1292,9 @@ static int __add_block_group_free_space(struct btrfs_trans_handle *trans, 
}



int add_block_group_free_space(struct btrfs_trans_handle *trans,

			       struct btrfs_fs_info *fs_info,

			       struct btrfs_block_group_cache *block_group)

{

	struct btrfs_fs_info *fs_info = trans->fs_info;

	struct btrfs_path *path = NULL;

	int ret = 0;

fs/btrfs/free-space-tree.h

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ int btrfs_create_free_space_tree(struct btrfs_fs_info *fs_info); 
int btrfs_clear_free_space_tree(struct btrfs_fs_info *fs_info);

int load_free_space_tree(struct btrfs_caching_control *caching_ctl);

int add_block_group_free_space(struct btrfs_trans_handle *trans,

			       struct btrfs_fs_info *fs_info,

			       struct btrfs_block_group_cache *block_group);

int remove_block_group_free_space(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
@@ -491,7 +491,7 @@ static int run_test(test_func_t test_func, int bitmaps, u32 sectorsize, 
		goto out;

	}



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

	ret = add_block_group_free_space(&trans, cache);

	if (ret) {

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

		goto out;