commit 94404e82e5f5452a13ef580b6d3df1483671dff9
author David Sterba <dsterba@suse.cz> Wed Jul 30 01:53:30 2014 +0200
committer David Sterba <dsterba@suse.cz> Thu Oct 02 17:30:31 2014 +0200
tree 67a9406c36733c041bd9cae8a982e8aa973cd41c
parent 8b9456da037ab53428d6347fa2fa088933da1424

btrfs: let merge_reloc_roots return void

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

fs/btrfs/relocation.c

diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 2d221c4..f39abe6 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -2316,7 +2316,7 @@
 }
 
 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 @@
 	}
 
 	BUG_ON(!RB_EMPTY_ROOT(&rc->reloc_root_tree.rb_root));
-	return ret;
 }
 
 static void free_block_list(struct rb_root *blocks)