Commit 11b66fa6 authored by Anand Jain's avatar Anand Jain Committed by David Sterba
Browse files

btrfs: reduce btrfs_update_block_group alloc argument to bool 



btrfs_update_block_group() accounts for the number of bytes allocated or
freed. Argument @alloc specifies whether the call is for alloc or free.
Convert the argument @alloc type from int to bool.

Reviewed-by: default avatarSu Yue <l@damenly.su>
Signed-off-by: default avatarAnand Jain <anand.jain@oracle.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent eed2037f

fs/btrfs/block-group.c

+1 −1
Original line number Diff line number Diff line
@@ -3160,7 +3160,7 @@ int btrfs_write_dirty_block_groups(struct btrfs_trans_handle *trans) 
}



int btrfs_update_block_group(struct btrfs_trans_handle *trans,

			     u64 bytenr, u64 num_bytes, int alloc)

			     u64 bytenr, u64 num_bytes, bool alloc)

{

	struct btrfs_fs_info *info = trans->fs_info;

	struct btrfs_block_group *cache = NULL;

fs/btrfs/block-group.h

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ int btrfs_start_dirty_block_groups(struct btrfs_trans_handle *trans); 
int btrfs_write_dirty_block_groups(struct btrfs_trans_handle *trans);

int btrfs_setup_space_cache(struct btrfs_trans_handle *trans);

int btrfs_update_block_group(struct btrfs_trans_handle *trans,

			     u64 bytenr, u64 num_bytes, int alloc);

			     u64 bytenr, u64 num_bytes, bool alloc);

int btrfs_add_reserved_bytes(struct btrfs_block_group *cache,

			     u64 ram_bytes, u64 num_bytes, int delalloc);

void btrfs_free_reserved_bytes(struct btrfs_block_group *cache,

fs/btrfs/extent-tree.c

+3 −3
Original line number Diff line number Diff line
@@ -3193,7 +3193,7 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans, 
			goto out;

		}



		ret = btrfs_update_block_group(trans, bytenr, num_bytes, 0);

		ret = btrfs_update_block_group(trans, bytenr, num_bytes, false);

		if (ret) {

			btrfs_abort_transaction(trans, ret);

			goto out;
@@ -4627,7 +4627,7 @@ static int alloc_reserved_file_extent(struct btrfs_trans_handle *trans, 
	if (ret)

		return ret;



	ret = btrfs_update_block_group(trans, ins->objectid, ins->offset, 1);

	ret = btrfs_update_block_group(trans, ins->objectid, ins->offset, true);

	if (ret) { /* -ENOENT, logic error */

		btrfs_err(fs_info, "update block group failed for %llu %llu",

			ins->objectid, ins->offset);
@@ -4716,7 +4716,7 @@ static int alloc_reserved_tree_block(struct btrfs_trans_handle *trans, 
		return ret;



	ret = btrfs_update_block_group(trans, extent_key.objectid,

				       fs_info->nodesize, 1);

				       fs_info->nodesize, true);

	if (ret) { /* -ENOENT, logic error */

		btrfs_err(fs_info, "update block group failed for %llu %llu",

			extent_key.objectid, extent_key.offset);