]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
btrfs: drop unused argument of calcu_metadata_size()
authorNaohiro Aota <naohiro.aota@wdc.com>
Tue, 23 Apr 2024 10:10:29 +0000 (12:10 +0200)
committerDavid Sterba <dsterba@suse.com>
Tue, 7 May 2024 19:31:08 +0000 (21:31 +0200)
calcu_metadata_size() has a "reserve" argument, but the only caller always
set it to "1". The other usage (reserve = 0) is dropped by a commit
0647bf564f1e ("Btrfs: improve forever loop when doing balance relocation"),
which is more than 10 years ago. Drop the argument and simplify the code.

Reviewed-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Naohiro Aota <naohiro.aota@wdc.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/relocation.c

index bd573a0ec270d7e770c33aec03a6de0033a1bf51..5cf5718c3b1facea66c885de125ad9fcc47ea432 100644 (file)
@@ -2280,9 +2280,8 @@ struct btrfs_root *select_one_root(struct btrfs_backref_node *node)
        return fs_root;
 }
 
-static noinline_for_stack
-u64 calcu_metadata_size(struct reloc_control *rc,
-                       struct btrfs_backref_node *node, int reserve)
+static noinline_for_stack u64 calcu_metadata_size(struct reloc_control *rc,
+                                                 struct btrfs_backref_node *node)
 {
        struct btrfs_fs_info *fs_info = rc->extent_root->fs_info;
        struct btrfs_backref_node *next = node;
@@ -2291,12 +2290,12 @@ u64 calcu_metadata_size(struct reloc_control *rc,
        u64 num_bytes = 0;
        int index = 0;
 
-       BUG_ON(reserve && node->processed);
+       BUG_ON(node->processed);
 
        while (next) {
                cond_resched();
                while (1) {
-                       if (next->processed && (reserve || next != node))
+                       if (next->processed)
                                break;
 
                        num_bytes += fs_info->nodesize;
@@ -2324,7 +2323,7 @@ static int reserve_metadata_space(struct btrfs_trans_handle *trans,
        int ret;
        u64 tmp;
 
-       num_bytes = calcu_metadata_size(rc, node, 1) * 2;
+       num_bytes = calcu_metadata_size(rc, node) * 2;
 
        trans->block_rsv = rc->block_rsv;
        rc->reserved_bytes += num_bytes;