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

Commit 2d5cffa1 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 already takes a transaction handle which contains a
reference to fs_info.

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 9a7e0f92

fs/btrfs/free-space-tree.c

+6 −8
Original line number Diff line number Diff line
@@ -976,10 +976,10 @@ static int add_free_space_extent(struct btrfs_trans_handle *trans, 
}



int __add_to_free_space_tree(struct btrfs_trans_handle *trans,

			     struct btrfs_fs_info *fs_info,

			     struct btrfs_block_group_cache *block_group,

			     struct btrfs_path *path, u64 start, u64 size)

{

	struct btrfs_fs_info *fs_info = trans->fs_info;

	struct btrfs_free_space_info *info;

	u32 flags;

	int ret;
@@ -1030,8 +1030,7 @@ int add_to_free_space_tree(struct btrfs_trans_handle *trans, 
	}



	mutex_lock(&block_group->free_space_lock);

	ret = __add_to_free_space_tree(trans, fs_info, block_group, path, start,

				       size);

	ret = __add_to_free_space_tree(trans, block_group, path, start, size);

	mutex_unlock(&block_group->free_space_lock);



	btrfs_put_block_group(block_group);
@@ -1101,7 +1100,7 @@ static int populate_free_space_tree(struct btrfs_trans_handle *trans, 
				break;



			if (start < key.objectid) {

				ret = __add_to_free_space_tree(trans, fs_info,

				ret = __add_to_free_space_tree(trans,

							       block_group,

							       path2, start,

							       key.objectid -
@@ -1126,8 +1125,8 @@ static int populate_free_space_tree(struct btrfs_trans_handle *trans, 
			break;

	}

	if (start < end) {

		ret = __add_to_free_space_tree(trans, fs_info, block_group,

					       path2, start, end - start);

		ret = __add_to_free_space_tree(trans, block_group, path2,

					       start, end - start);

		if (ret)

			goto out_locked;

	}
@@ -1282,8 +1281,7 @@ static int __add_block_group_free_space(struct btrfs_trans_handle *trans, 
	if (ret)

		return ret;



	return __add_to_free_space_tree(trans, trans->fs_info, block_group,

					path,

	return __add_to_free_space_tree(trans, block_group, path,

					block_group->key.objectid,

					block_group->key.offset);

}

fs/btrfs/free-space-tree.h

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ search_free_space_info(struct btrfs_trans_handle *trans, 
		       struct btrfs_block_group_cache *block_group,

		       struct btrfs_path *path, int cow);

int __add_to_free_space_tree(struct btrfs_trans_handle *trans,

			     struct btrfs_fs_info *fs_info,

			     struct btrfs_block_group_cache *block_group,

			     struct btrfs_path *path, u64 start, u64 size);

int __remove_from_free_space_tree(struct btrfs_trans_handle *trans,

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

+13 −13
Original line number Diff line number Diff line
@@ -274,14 +274,14 @@ static int test_merge_left(struct btrfs_trans_handle *trans, 
		return ret;

	}



	ret = __add_to_free_space_tree(trans, fs_info, cache, path,

				       cache->key.objectid, alignment);

	ret = __add_to_free_space_tree(trans, cache, path, cache->key.objectid,

				       alignment);

	if (ret) {

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

		return ret;

	}



	ret = __add_to_free_space_tree(trans, fs_info, cache, path,

	ret = __add_to_free_space_tree(trans, cache, path,

				       cache->key.objectid + alignment,

				       alignment);

	if (ret) {
@@ -312,7 +312,7 @@ static int test_merge_right(struct btrfs_trans_handle *trans, 
		return ret;

	}



	ret = __add_to_free_space_tree(trans, fs_info, cache, path,

	ret = __add_to_free_space_tree(trans, cache, path,

				       cache->key.objectid + 2 * alignment,

				       alignment);

	if (ret) {
@@ -320,7 +320,7 @@ static int test_merge_right(struct btrfs_trans_handle *trans, 
		return ret;

	}



	ret = __add_to_free_space_tree(trans, fs_info, cache, path,

	ret = __add_to_free_space_tree(trans, cache, path,

				       cache->key.objectid + alignment,

				       alignment);

	if (ret) {
@@ -351,14 +351,14 @@ static int test_merge_both(struct btrfs_trans_handle *trans, 
		return ret;

	}



	ret = __add_to_free_space_tree(trans, fs_info, cache, path,

				       cache->key.objectid, alignment);

	ret = __add_to_free_space_tree(trans, cache, path, cache->key.objectid,

				       alignment);

	if (ret) {

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

		return ret;

	}



	ret = __add_to_free_space_tree(trans, fs_info, cache, path,

	ret = __add_to_free_space_tree(trans, cache, path,

				       cache->key.objectid + 2 * alignment,

				       alignment);

	if (ret) {
@@ -366,7 +366,7 @@ static int test_merge_both(struct btrfs_trans_handle *trans, 
		return ret;

	}



	ret = __add_to_free_space_tree(trans, fs_info, cache, path,

	ret = __add_to_free_space_tree(trans, cache, path,

				       cache->key.objectid + alignment,

				       alignment);

	if (ret) {
@@ -399,14 +399,14 @@ static int test_merge_none(struct btrfs_trans_handle *trans, 
		return ret;

	}



	ret = __add_to_free_space_tree(trans, fs_info, cache, path,

				       cache->key.objectid, alignment);

	ret = __add_to_free_space_tree(trans, cache, path, cache->key.objectid,

				       alignment);

	if (ret) {

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

		return ret;

	}



	ret = __add_to_free_space_tree(trans, fs_info, cache, path,

	ret = __add_to_free_space_tree(trans, cache, path,

				       cache->key.objectid + 4 * alignment,

				       alignment);

	if (ret) {
@@ -414,7 +414,7 @@ static int test_merge_none(struct btrfs_trans_handle *trans, 
		return ret;

	}



	ret = __add_to_free_space_tree(trans, fs_info, cache, path,

	ret = __add_to_free_space_tree(trans, cache, path,

				       cache->key.objectid + 2 * alignment,

				       alignment);

	if (ret) {