diff options
author | David Sterba <dsterba@suse.cz> | 2014-07-29 19:53:30 -0400 |
---|---|---|
committer | David Sterba <dsterba@suse.cz> | 2014-10-02 11:30:31 -0400 |
commit | 94404e82e5f5452a13ef580b6d3df1483671dff9 (patch) | |
tree | 67a9406c36733c041bd9cae8a982e8aa973cd41c | |
parent | 8b9456da037ab53428d6347fa2fa088933da1424 (diff) |
btrfs: let merge_reloc_roots return void
Signed-off-by: David Sterba <dsterba@suse.cz>
-rw-r--r-- | fs/btrfs/relocation.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index 2d221c46180c..f39abe690bb2 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c | |||
@@ -2316,7 +2316,7 @@ void free_reloc_roots(struct list_head *list) | |||
2316 | } | 2316 | } |
2317 | 2317 | ||
2318 | static noinline_for_stack | 2318 | static noinline_for_stack |
2319 | int merge_reloc_roots(struct reloc_control *rc) | 2319 | void merge_reloc_roots(struct reloc_control *rc) |
2320 | { | 2320 | { |
2321 | struct btrfs_root *root; | 2321 | struct btrfs_root *root; |
2322 | struct btrfs_root *reloc_root; | 2322 | struct btrfs_root *reloc_root; |
@@ -2397,7 +2397,6 @@ out: | |||
2397 | } | 2397 | } |
2398 | 2398 | ||
2399 | BUG_ON(!RB_EMPTY_ROOT(&rc->reloc_root_tree.rb_root)); | 2399 | BUG_ON(!RB_EMPTY_ROOT(&rc->reloc_root_tree.rb_root)); |
2400 | return ret; | ||
2401 | } | 2400 | } |
2402 | 2401 | ||
2403 | static void free_block_list(struct rb_root *blocks) | 2402 | static void free_block_list(struct rb_root *blocks) |