summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLu Fengqi <lufq.fnst@cn.fujitsu.com>2018-08-04 09:10:55 -0400
committerDavid Sterba <dsterba@suse.com>2018-10-15 11:23:25 -0400
commit3a58417486ca99a3bfef40e309f38adb45a5171d (patch)
tree5efe3aee55b065defda7aa3a10692167a6affc0d
parenta7176f74fa570c83a48e66435b77651ad8fc5aee (diff)
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: Lu Fengqi <lufq.fnst@cn.fujitsu.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r--fs/btrfs/ctree.h2
-rw-r--r--fs/btrfs/delayed-inode.c4
-rw-r--r--fs/btrfs/extent-tree.c16
-rw-r--r--fs/btrfs/file.c4
-rw-r--r--fs/btrfs/inode.c6
-rw-r--r--fs/btrfs/relocation.c2
6 files changed, 17 insertions, 17 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 2cddfe7806a4..3dd4d0cb0c7e 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -2771,7 +2771,7 @@ int btrfs_block_rsv_refill(struct btrfs_root *root,
2771 enum btrfs_reserve_flush_enum flush); 2771 enum btrfs_reserve_flush_enum flush);
2772int btrfs_block_rsv_migrate(struct btrfs_block_rsv *src_rsv, 2772int btrfs_block_rsv_migrate(struct btrfs_block_rsv *src_rsv,
2773 struct btrfs_block_rsv *dst_rsv, u64 num_bytes, 2773 struct btrfs_block_rsv *dst_rsv, u64 num_bytes,
2774 int update_size); 2774 bool update_size);
2775int btrfs_cond_migrate_bytes(struct btrfs_fs_info *fs_info, 2775int btrfs_cond_migrate_bytes(struct btrfs_fs_info *fs_info,
2776 struct btrfs_block_rsv *dest, u64 num_bytes, 2776 struct btrfs_block_rsv *dest, u64 num_bytes,
2777 int min_factor); 2777 int min_factor);
diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
index f51b509f2d9b..584cb103955e 100644
--- a/fs/btrfs/delayed-inode.c
+++ b/fs/btrfs/delayed-inode.c
@@ -559,7 +559,7 @@ static int btrfs_delayed_item_reserve_metadata(struct btrfs_trans_handle *trans,
559 * reserved space when starting a transaction. So no need to reserve 559 * reserved space when starting a transaction. So no need to reserve
560 * qgroup space here. 560 * qgroup space here.
561 */ 561 */
562 ret = btrfs_block_rsv_migrate(src_rsv, dst_rsv, num_bytes, 1); 562 ret = btrfs_block_rsv_migrate(src_rsv, dst_rsv, num_bytes, true);
563 if (!ret) { 563 if (!ret) {
564 trace_btrfs_space_reservation(fs_info, "delayed_item", 564 trace_btrfs_space_reservation(fs_info, "delayed_item",
565 item->key.objectid, 565 item->key.objectid,
@@ -647,7 +647,7 @@ static int btrfs_delayed_inode_reserve_metadata(
647 return ret; 647 return ret;
648 } 648 }
649 649
650 ret = btrfs_block_rsv_migrate(src_rsv, dst_rsv, num_bytes, 1); 650 ret = btrfs_block_rsv_migrate(src_rsv, dst_rsv, num_bytes, true);
651 if (!ret) { 651 if (!ret) {
652 trace_btrfs_space_reservation(fs_info, "delayed_inode", 652 trace_btrfs_space_reservation(fs_info, "delayed_inode",
653 btrfs_ino(inode), num_bytes, 1); 653 btrfs_ino(inode), num_bytes, 1);
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 2d9074295d7f..26616712de13 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -5284,7 +5284,7 @@ static int block_rsv_use_bytes(struct btrfs_block_rsv *block_rsv,
5284} 5284}
5285 5285
5286static void block_rsv_add_bytes(struct btrfs_block_rsv *block_rsv, 5286static void block_rsv_add_bytes(struct btrfs_block_rsv *block_rsv,
5287 u64 num_bytes, int update_size) 5287 u64 num_bytes, bool update_size)
5288{ 5288{
5289 spin_lock(&block_rsv->lock); 5289 spin_lock(&block_rsv->lock);
5290 block_rsv->reserved += num_bytes; 5290 block_rsv->reserved += num_bytes;
@@ -5316,7 +5316,7 @@ int btrfs_cond_migrate_bytes(struct btrfs_fs_info *fs_info,
5316 global_rsv->full = 0; 5316 global_rsv->full = 0;
5317 spin_unlock(&global_rsv->lock); 5317 spin_unlock(&global_rsv->lock);
5318 5318
5319 block_rsv_add_bytes(dest, num_bytes, 1); 5319 block_rsv_add_bytes(dest, num_bytes, true);
5320 return 0; 5320 return 0;
5321} 5321}
5322 5322
@@ -5479,7 +5479,7 @@ static u64 block_rsv_release_bytes(struct btrfs_fs_info *fs_info,
5479 5479
5480int btrfs_block_rsv_migrate(struct btrfs_block_rsv *src, 5480int btrfs_block_rsv_migrate(struct btrfs_block_rsv *src,
5481 struct btrfs_block_rsv *dst, u64 num_bytes, 5481 struct btrfs_block_rsv *dst, u64 num_bytes,
5482 int update_size) 5482 bool update_size)
5483{ 5483{
5484 int ret; 5484 int ret;
5485 5485
@@ -5540,7 +5540,7 @@ int btrfs_block_rsv_add(struct btrfs_root *root,
5540 5540
5541 ret = reserve_metadata_bytes(root, block_rsv, num_bytes, flush); 5541 ret = reserve_metadata_bytes(root, block_rsv, num_bytes, flush);
5542 if (!ret) { 5542 if (!ret) {
5543 block_rsv_add_bytes(block_rsv, num_bytes, 1); 5543 block_rsv_add_bytes(block_rsv, num_bytes, true);
5544 return 0; 5544 return 0;
5545 } 5545 }
5546 5546
@@ -5587,7 +5587,7 @@ int btrfs_block_rsv_refill(struct btrfs_root *root,
5587 5587
5588 ret = reserve_metadata_bytes(root, block_rsv, num_bytes, flush); 5588 ret = reserve_metadata_bytes(root, block_rsv, num_bytes, flush);
5589 if (!ret) { 5589 if (!ret) {
5590 block_rsv_add_bytes(block_rsv, num_bytes, 0); 5590 block_rsv_add_bytes(block_rsv, num_bytes, false);
5591 return 0; 5591 return 0;
5592 } 5592 }
5593 5593
@@ -5629,7 +5629,7 @@ static int btrfs_inode_rsv_refill(struct btrfs_inode *inode,
5629 return ret; 5629 return ret;
5630 ret = reserve_metadata_bytes(root, block_rsv, num_bytes, flush); 5630 ret = reserve_metadata_bytes(root, block_rsv, num_bytes, flush);
5631 if (!ret) { 5631 if (!ret) {
5632 block_rsv_add_bytes(block_rsv, num_bytes, 0); 5632 block_rsv_add_bytes(block_rsv, num_bytes, false);
5633 trace_btrfs_space_reservation(root->fs_info, "delalloc", 5633 trace_btrfs_space_reservation(root->fs_info, "delalloc",
5634 btrfs_ino(inode), num_bytes, 1); 5634 btrfs_ino(inode), num_bytes, 1);
5635 5635
@@ -5835,7 +5835,7 @@ int btrfs_subvolume_reserve_metadata(struct btrfs_root *root,
5835 BTRFS_RESERVE_FLUSH_ALL); 5835 BTRFS_RESERVE_FLUSH_ALL);
5836 5836
5837 if (ret == -ENOSPC && use_global_rsv) 5837 if (ret == -ENOSPC && use_global_rsv)
5838 ret = btrfs_block_rsv_migrate(global_rsv, rsv, num_bytes, 1); 5838 ret = btrfs_block_rsv_migrate(global_rsv, rsv, num_bytes, true);
5839 5839
5840 if (ret && qgroup_num_bytes) 5840 if (ret && qgroup_num_bytes)
5841 btrfs_qgroup_free_meta_prealloc(root, qgroup_num_bytes); 5841 btrfs_qgroup_free_meta_prealloc(root, qgroup_num_bytes);
@@ -8215,7 +8215,7 @@ try_reserve:
8215static void unuse_block_rsv(struct btrfs_fs_info *fs_info, 8215static void unuse_block_rsv(struct btrfs_fs_info *fs_info,
8216 struct btrfs_block_rsv *block_rsv, u32 blocksize) 8216 struct btrfs_block_rsv *block_rsv, u32 blocksize)
8217{ 8217{
8218 block_rsv_add_bytes(block_rsv, blocksize, 0); 8218 block_rsv_add_bytes(block_rsv, blocksize, false);
8219 block_rsv_release_bytes(fs_info, block_rsv, NULL, 0, NULL); 8219 block_rsv_release_bytes(fs_info, block_rsv, NULL, 0, NULL);
8220} 8220}
8221 8221
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 2be00e873e92..d254cf94545f 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -2544,7 +2544,7 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len)
2544 } 2544 }
2545 2545
2546 ret = btrfs_block_rsv_migrate(&fs_info->trans_block_rsv, rsv, 2546 ret = btrfs_block_rsv_migrate(&fs_info->trans_block_rsv, rsv,
2547 min_size, 0); 2547 min_size, false);
2548 BUG_ON(ret); 2548 BUG_ON(ret);
2549 trans->block_rsv = rsv; 2549 trans->block_rsv = rsv;
2550 2550
@@ -2594,7 +2594,7 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len)
2594 } 2594 }
2595 2595
2596 ret = btrfs_block_rsv_migrate(&fs_info->trans_block_rsv, 2596 ret = btrfs_block_rsv_migrate(&fs_info->trans_block_rsv,
2597 rsv, min_size, 0); 2597 rsv, min_size, false);
2598 BUG_ON(ret); /* shouldn't happen */ 2598 BUG_ON(ret); /* shouldn't happen */
2599 trans->block_rsv = rsv; 2599 trans->block_rsv = rsv;
2600 2600
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 8b3d719e229d..bc3d0e0c43a5 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -5334,7 +5334,7 @@ static struct btrfs_trans_handle *evict_refill_and_join(struct btrfs_root *root,
5334 * it. 5334 * it.
5335 */ 5335 */
5336 if (!btrfs_check_space_for_delayed_refs(trans, fs_info) && 5336 if (!btrfs_check_space_for_delayed_refs(trans, fs_info) &&
5337 !btrfs_block_rsv_migrate(global_rsv, rsv, min_size, 0)) 5337 !btrfs_block_rsv_migrate(global_rsv, rsv, min_size, false))
5338 return trans; 5338 return trans;
5339 5339
5340 /* If not, commit and try again. */ 5340 /* If not, commit and try again. */
@@ -9020,7 +9020,7 @@ static int btrfs_truncate(struct inode *inode, bool skip_writeback)
9020 9020
9021 /* Migrate the slack space for the truncate to our reserve */ 9021 /* Migrate the slack space for the truncate to our reserve */
9022 ret = btrfs_block_rsv_migrate(&fs_info->trans_block_rsv, rsv, 9022 ret = btrfs_block_rsv_migrate(&fs_info->trans_block_rsv, rsv,
9023 min_size, 0); 9023 min_size, false);
9024 BUG_ON(ret); 9024 BUG_ON(ret);
9025 9025
9026 /* 9026 /*
@@ -9057,7 +9057,7 @@ static int btrfs_truncate(struct inode *inode, bool skip_writeback)
9057 9057
9058 btrfs_block_rsv_release(fs_info, rsv, -1); 9058 btrfs_block_rsv_release(fs_info, rsv, -1);
9059 ret = btrfs_block_rsv_migrate(&fs_info->trans_block_rsv, 9059 ret = btrfs_block_rsv_migrate(&fs_info->trans_block_rsv,
9060 rsv, min_size, 0); 9060 rsv, min_size, false);
9061 BUG_ON(ret); /* shouldn't happen */ 9061 BUG_ON(ret); /* shouldn't happen */
9062 trans->block_rsv = rsv; 9062 trans->block_rsv = rsv;
9063 } 9063 }
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 8783a1776540..995a28a724ce 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -4669,7 +4669,7 @@ int btrfs_reloc_post_snapshot(struct btrfs_trans_handle *trans,
4669 if (rc->merge_reloc_tree) { 4669 if (rc->merge_reloc_tree) {
4670 ret = btrfs_block_rsv_migrate(&pending->block_rsv, 4670 ret = btrfs_block_rsv_migrate(&pending->block_rsv,
4671 rc->block_rsv, 4671 rc->block_rsv,
4672 rc->nodes_relocated, 1); 4672 rc->nodes_relocated, true);
4673 if (ret) 4673 if (ret)
4674 return ret; 4674 return ret;
4675 } 4675 }