Commit 5758d1bd authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba
Browse files

btrfs: remove bytes_used argument from btrfs_make_block_group() 



The only caller of btrfs_make_block_group() always passes 0 as the value
for the bytes_used argument, so remove it.

Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarFilipe Manana <fdmanana@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 04fb3285

fs/btrfs/block-group.c

+2 −5
Original line number Diff line number Diff line
@@ -2672,7 +2672,7 @@ static u64 calculate_global_root_id(struct btrfs_fs_info *fs_info, u64 offset) 
}



struct btrfs_block_group *btrfs_make_block_group(struct btrfs_trans_handle *trans,

						 u64 bytes_used, u64 type,

						 u64 type,

						 u64 chunk_offset, u64 size)

{

	struct btrfs_fs_info *fs_info = trans->fs_info;
@@ -2687,7 +2687,6 @@ struct btrfs_block_group *btrfs_make_block_group(struct btrfs_trans_handle *tran 


	cache->length = size;

	set_free_space_tree_thresholds(cache);

	cache->used = bytes_used;

	cache->flags = type;

	cache->cached = BTRFS_CACHE_FINISHED;

	cache->global_root_id = calculate_global_root_id(fs_info, cache->start);
@@ -2738,9 +2737,7 @@ struct btrfs_block_group *btrfs_make_block_group(struct btrfs_trans_handle *tran 


#ifdef CONFIG_BTRFS_DEBUG

	if (btrfs_should_fragment_free_space(cache)) {

		u64 new_bytes_used = size - bytes_used;



		cache->space_info->bytes_used += new_bytes_used >> 1;

		cache->space_info->bytes_used += size >> 1;

		fragment_free_space(cache);

	}

#endif

fs/btrfs/block-group.h

+1 −1
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ void btrfs_reclaim_bgs(struct btrfs_fs_info *fs_info); 
void btrfs_mark_bg_to_reclaim(struct btrfs_block_group *bg);

int btrfs_read_block_groups(struct btrfs_fs_info *info);

struct btrfs_block_group *btrfs_make_block_group(struct btrfs_trans_handle *trans,

						 u64 bytes_used, u64 type,

						 u64 type,

						 u64 chunk_offset, u64 size);

void btrfs_create_pending_block_groups(struct btrfs_trans_handle *trans);

int btrfs_inc_block_group_ro(struct btrfs_block_group *cache,

fs/btrfs/volumes.c

+1 −1
Original line number Diff line number Diff line
@@ -5437,7 +5437,7 @@ static struct btrfs_block_group *create_chunk(struct btrfs_trans_handle *trans, 
	}

	write_unlock(&em_tree->lock);



	block_group = btrfs_make_block_group(trans, 0, type, start, ctl->chunk_size);

	block_group = btrfs_make_block_group(trans, type, start, ctl->chunk_size);

	if (IS_ERR(block_group))

		goto error_del_extent;