summaryrefslogtreecommitdiff
path: root/fs/btrfs
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.cz>2014-07-30 03:53:30 +0400
committerDavid Sterba <dsterba@suse.cz>2014-10-02 19:30:31 +0400
commit94404e82e5f5452a13ef580b6d3df1483671dff9 (patch)
tree67a9406c36733c041bd9cae8a982e8aa973cd41c /fs/btrfs
parent8b9456da037ab53428d6347fa2fa088933da1424 (diff)
downloadlinux-94404e82e5f5452a13ef580b6d3df1483671dff9.tar.xz
btrfs: let merge_reloc_roots return void
Signed-off-by: David Sterba <dsterba@suse.cz>
Diffstat (limited to 'fs/btrfs')
-rw-r--r--fs/btrfs/relocation.c3
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)
}
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 @@ out:
}
BUG_ON(!RB_EMPTY_ROOT(&rc->reloc_root_tree.rb_root));
- return ret;
}
static void free_block_list(struct rb_root *blocks)