btrfs: let merge_reloc_roots return void

Signed-off-by: David Sterba <dsterba@suse.cz>

btrfs: let merge_reloc_roots return void
Signed-off-by: David Sterba <dsterba@suse.cz>
94404e82 · David Sterba · 8b9456da · 94404e82
Commit 94404e82 authored Jul 30, 2014 by David Sterba
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

fs/btrfs/relocation.c fs/btrfs/relocation.c +1 -2

No files found.
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -2316,7 +2316,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;
@@ -2397,7 +2397,6 @@ int merge_reloc_roots(struct reloc_control *rc)
 	}

 	BUG_ON(!RB_EMPTY_ROOT(&rc->reloc_root_tree.rb_root));
-	return ret;
 }

 static void free_block_list(struct rb_root *blocks)