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

Commit 3a584174 authored by Lu Fengqi's avatar Lu Fengqi Committed by David Sterba
Browse files

btrfs: switch update_size to bool in btrfs_block_rsv_migrate and btrfs_rsv_add_bytes 



Using true and false here is closer to the expected semantic than using
0 and 1.  No functional change.

Signed-off-by: default avatarLu Fengqi <lufq.fnst@cn.fujitsu.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent a7176f74

fs/btrfs/ctree.h

+1 −1
Original line number Diff line number Diff line
@@ -2771,7 +2771,7 @@ int btrfs_block_rsv_refill(struct btrfs_root *root, 
			   enum btrfs_reserve_flush_enum flush);

int btrfs_block_rsv_migrate(struct btrfs_block_rsv *src_rsv,

			    struct btrfs_block_rsv *dst_rsv, u64 num_bytes,

			    int update_size);

			    bool update_size);

int btrfs_cond_migrate_bytes(struct btrfs_fs_info *fs_info,

			     struct btrfs_block_rsv *dest, u64 num_bytes,

			     int min_factor);

fs/btrfs/delayed-inode.c

+2 −2
Original line number Diff line number Diff line
@@ -559,7 +559,7 @@ static int btrfs_delayed_item_reserve_metadata(struct btrfs_trans_handle *trans, 
	 * reserved space when starting a transaction.  So no need to reserve

	 * qgroup space here.

	 */

	ret = btrfs_block_rsv_migrate(src_rsv, dst_rsv, num_bytes, 1);

	ret = btrfs_block_rsv_migrate(src_rsv, dst_rsv, num_bytes, true);

	if (!ret) {

		trace_btrfs_space_reservation(fs_info, "delayed_item",

					      item->key.objectid,
@@ -647,7 +647,7 @@ static int btrfs_delayed_inode_reserve_metadata( 
		return ret;

	}



	ret = btrfs_block_rsv_migrate(src_rsv, dst_rsv, num_bytes, 1);

	ret = btrfs_block_rsv_migrate(src_rsv, dst_rsv, num_bytes, true);

	if (!ret) {

		trace_btrfs_space_reservation(fs_info, "delayed_inode",

					      btrfs_ino(inode), num_bytes, 1);

fs/btrfs/extent-tree.c

+8 −8
Original line number Diff line number Diff line
@@ -5284,7 +5284,7 @@ static int block_rsv_use_bytes(struct btrfs_block_rsv *block_rsv, 
}



static void block_rsv_add_bytes(struct btrfs_block_rsv *block_rsv,

				u64 num_bytes, int update_size)

				u64 num_bytes, bool update_size)

{

	spin_lock(&block_rsv->lock);

	block_rsv->reserved += num_bytes;
@@ -5316,7 +5316,7 @@ int btrfs_cond_migrate_bytes(struct btrfs_fs_info *fs_info, 
		global_rsv->full = 0;

	spin_unlock(&global_rsv->lock);



	block_rsv_add_bytes(dest, num_bytes, 1);

	block_rsv_add_bytes(dest, num_bytes, true);

	return 0;

}
@@ -5479,7 +5479,7 @@ static u64 block_rsv_release_bytes(struct btrfs_fs_info *fs_info, 


int btrfs_block_rsv_migrate(struct btrfs_block_rsv *src,

			    struct btrfs_block_rsv *dst, u64 num_bytes,

			    int update_size)

			    bool update_size)

{

	int ret;
@@ -5540,7 +5540,7 @@ int btrfs_block_rsv_add(struct btrfs_root *root, 


	ret = reserve_metadata_bytes(root, block_rsv, num_bytes, flush);

	if (!ret) {

		block_rsv_add_bytes(block_rsv, num_bytes, 1);

		block_rsv_add_bytes(block_rsv, num_bytes, true);

		return 0;

	}
@@ -5587,7 +5587,7 @@ int btrfs_block_rsv_refill(struct btrfs_root *root, 


	ret = reserve_metadata_bytes(root, block_rsv, num_bytes, flush);

	if (!ret) {

		block_rsv_add_bytes(block_rsv, num_bytes, 0);

		block_rsv_add_bytes(block_rsv, num_bytes, false);

		return 0;

	}
@@ -5629,7 +5629,7 @@ static int btrfs_inode_rsv_refill(struct btrfs_inode *inode, 
		return ret;

	ret = reserve_metadata_bytes(root, block_rsv, num_bytes, flush);

	if (!ret) {

		block_rsv_add_bytes(block_rsv, num_bytes, 0);

		block_rsv_add_bytes(block_rsv, num_bytes, false);

		trace_btrfs_space_reservation(root->fs_info, "delalloc",

					      btrfs_ino(inode), num_bytes, 1);
@@ -5835,7 +5835,7 @@ int btrfs_subvolume_reserve_metadata(struct btrfs_root *root, 
				  BTRFS_RESERVE_FLUSH_ALL);



	if (ret == -ENOSPC && use_global_rsv)

		ret = btrfs_block_rsv_migrate(global_rsv, rsv, num_bytes, 1);

		ret = btrfs_block_rsv_migrate(global_rsv, rsv, num_bytes, true);



	if (ret && qgroup_num_bytes)

		btrfs_qgroup_free_meta_prealloc(root, qgroup_num_bytes);
@@ -8215,7 +8215,7 @@ use_block_rsv(struct btrfs_trans_handle *trans, 
static void unuse_block_rsv(struct btrfs_fs_info *fs_info,

			    struct btrfs_block_rsv *block_rsv, u32 blocksize)

{

	block_rsv_add_bytes(block_rsv, blocksize, 0);

	block_rsv_add_bytes(block_rsv, blocksize, false);

	block_rsv_release_bytes(fs_info, block_rsv, NULL, 0, NULL);

}

fs/btrfs/file.c

+2 −2
Original line number Diff line number Diff line
@@ -2544,7 +2544,7 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len) 
	}



	ret = btrfs_block_rsv_migrate(&fs_info->trans_block_rsv, rsv,

				      min_size, 0);

				      min_size, false);

	BUG_ON(ret);

	trans->block_rsv = rsv;
@@ -2594,7 +2594,7 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len) 
		}



		ret = btrfs_block_rsv_migrate(&fs_info->trans_block_rsv,

					      rsv, min_size, 0);

					      rsv, min_size, false);

		BUG_ON(ret);	/* shouldn't happen */

		trans->block_rsv = rsv;

fs/btrfs/inode.c

+3 −3
Original line number Diff line number Diff line
@@ -5334,7 +5334,7 @@ static struct btrfs_trans_handle *evict_refill_and_join(struct btrfs_root *root, 
		 * it.

		 */

		if (!btrfs_check_space_for_delayed_refs(trans, fs_info) &&

		    !btrfs_block_rsv_migrate(global_rsv, rsv, min_size, 0))

		    !btrfs_block_rsv_migrate(global_rsv, rsv, min_size, false))

			return trans;



		/* If not, commit and try again. */
@@ -9020,7 +9020,7 @@ static int btrfs_truncate(struct inode *inode, bool skip_writeback) 


	/* Migrate the slack space for the truncate to our reserve */

	ret = btrfs_block_rsv_migrate(&fs_info->trans_block_rsv, rsv,

				      min_size, 0);

				      min_size, false);

	BUG_ON(ret);



	/*
@@ -9057,7 +9057,7 @@ static int btrfs_truncate(struct inode *inode, bool skip_writeback) 


		btrfs_block_rsv_release(fs_info, rsv, -1);

		ret = btrfs_block_rsv_migrate(&fs_info->trans_block_rsv,

					      rsv, min_size, 0);

					      rsv, min_size, false);

		BUG_ON(ret);	/* shouldn't happen */

		trans->block_rsv = rsv;

	}