btrfs: let merge_reloc_roots return void

Signed-off-by: David Sterba <dsterba@suse.cz>
mariux64 · Oct 2, 2014 · 94404e8 · 94404e8
1 parent 8b9456d
commit 94404e8
Showing 1 changed file with 1 addition and 2 deletions.
diff --git 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)