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

Commit f6373bf3 authored by Liu Bo's avatar Liu Bo Committed by Josef Bacik
Browse files

Btrfs: kill unused arguments of cache_block_group 



Argument 'trans' and 'root' are not used any more.

Signed-off-by: default avatarLiu Bo <bo.li.liu@oracle.com>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
parent 17b85495

fs/btrfs/extent-tree.c

+5 −8
Original line number Original line Diff line number Diff line
@@ -468,8 +468,6 @@ static noinline void caching_thread(struct btrfs_work *work) 
}

}





static int cache_block_group(struct btrfs_block_group_cache *cache,

static int cache_block_group(struct btrfs_block_group_cache *cache,

			     struct btrfs_trans_handle *trans,

			     struct btrfs_root *root,

			     int load_cache_only)

			     int load_cache_only)

{

{

	DEFINE_WAIT(wait);

	DEFINE_WAIT(wait);
@@ -4802,7 +4800,7 @@ static int update_block_group(struct btrfs_trans_handle *trans, 
		 * space back to the block group, otherwise we will leak space.

		 * space back to the block group, otherwise we will leak space.

		 */

		 */

		if (!alloc && cache->cached == BTRFS_CACHE_NO)

		if (!alloc && cache->cached == BTRFS_CACHE_NO)

			cache_block_group(cache, trans, NULL, 1);

			cache_block_group(cache, 1);





		byte_in_group = bytenr - cache->key.objectid;

		byte_in_group = bytenr - cache->key.objectid;

		WARN_ON(byte_in_group > cache->key.offset);

		WARN_ON(byte_in_group > cache->key.offset);
@@ -4917,7 +4915,7 @@ int btrfs_pin_extent_for_log_replay(struct btrfs_trans_handle *trans, 
	 * to one because the slow code to read in the free extents does check

	 * to one because the slow code to read in the free extents does check

	 * the pinned extents.

	 * the pinned extents.

	 */

	 */

	cache_block_group(cache, trans, root, 1);

	cache_block_group(cache, 1);





	pin_down_extent(root, cache, bytenr, num_bytes, 0);

	pin_down_extent(root, cache, bytenr, num_bytes, 0);
@@ -5707,8 +5705,7 @@ static noinline int find_free_extent(struct btrfs_trans_handle *trans, 
		cached = block_group_cache_done(block_group);

		cached = block_group_cache_done(block_group);

		if (unlikely(!cached)) {

		if (unlikely(!cached)) {

			found_uncached_bg = true;

			found_uncached_bg = true;

			ret = cache_block_group(block_group, trans,

			ret = cache_block_group(block_group, 0);

						orig_root, 0);

			BUG_ON(ret < 0);

			BUG_ON(ret < 0);

			ret = 0;

			ret = 0;

		}

		}
@@ -6244,7 +6241,7 @@ int btrfs_alloc_logged_file_extent(struct btrfs_trans_handle *trans, 
	u64 num_bytes = ins->offset;

	u64 num_bytes = ins->offset;





	block_group = btrfs_lookup_block_group(root->fs_info, ins->objectid);

	block_group = btrfs_lookup_block_group(root->fs_info, ins->objectid);

	cache_block_group(block_group, trans, NULL, 0);

	cache_block_group(block_group, 0);

	caching_ctl = get_caching_control(block_group);

	caching_ctl = get_caching_control(block_group);





	if (!caching_ctl) {

	if (!caching_ctl) {
@@ -8187,7 +8184,7 @@ int btrfs_trim_fs(struct btrfs_root *root, struct fstrim_range *range) 




		if (end - start >= range->minlen) {

		if (end - start >= range->minlen) {

			if (!block_group_cache_done(cache)) {

			if (!block_group_cache_done(cache)) {

				ret = cache_block_group(cache, NULL, root, 0);

				ret = cache_block_group(cache, 0);

				if (!ret)

				if (!ret)

					wait_block_group_cache_done(cache);

					wait_block_group_cache_done(cache);

			}

			}