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

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

btrfs: Remove fs_info argument from add_to_free_space_tree 



This function takes a transaction handle which already contains a
reference to the fs_info. So use it and remove the extra function
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 25a356d3

fs/btrfs/extent-tree.c

+1 −1
Original line number Diff line number Diff line
@@ -7127,7 +7127,7 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans, 
			}

		}



		ret = add_to_free_space_tree(trans, info, bytenr, num_bytes);

		ret = add_to_free_space_tree(trans, bytenr, num_bytes);

		if (ret) {

			btrfs_abort_transaction(trans, ret);

			goto out;

fs/btrfs/free-space-tree.c

+2 −3
Original line number Diff line number Diff line
@@ -999,14 +999,13 @@ 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,

			   u64 start, u64 size)

{

	struct btrfs_block_group_cache *block_group;

	struct btrfs_path *path;

	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;



	path = btrfs_alloc_path();
@@ -1015,7 +1014,7 @@ int add_to_free_space_tree(struct btrfs_trans_handle *trans, 
		goto out;

	}



	block_group = btrfs_lookup_block_group(fs_info, start);

	block_group = btrfs_lookup_block_group(trans->fs_info, start);

	if (!block_group) {

		ASSERT(0);

		ret = -ENOENT;

fs/btrfs/free-space-tree.h

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ int add_block_group_free_space(struct btrfs_trans_handle *trans, 
int remove_block_group_free_space(struct btrfs_trans_handle *trans,

				  struct btrfs_block_group_cache *block_group);

int add_to_free_space_tree(struct btrfs_trans_handle *trans,

			   struct btrfs_fs_info *fs_info,

			   u64 start, u64 size);

int remove_from_free_space_tree(struct btrfs_trans_handle *trans,

				u64 start, u64 size);