btrfs: let merge_reloc_roots return void

Signed-off-by: David Sterba <dsterba@suse.cz>
(cherry picked from commit 94404e82e5f5452a13ef580b6d3df1483671dff9)

diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 45a1ee6c16bd33e31f4d94d6168dcbb763f1918c..74257d6436adda1b772d8658be41202093ef577a 100644 (file)
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -2346,7 +2346,7 @@ void free_reloc_roots(struct list_head *list)
 }
 
 static noinline_for_stack
-int merge_reloc_roots(struct reloc_control *rc)
+void merge_reloc_roots(struct reloc_control *rc)
 {
        struct btrfs_root *root;
        struct btrfs_root *reloc_root;
@@ -2427,7 +2427,6 @@ out:
        }
 
        BUG_ON(!RB_EMPTY_ROOT(&rc->reloc_root_tree.rb_root));
-       return ret;
 }
 
 static void free_block_list(struct rb_root *blocks)