Commit 692206b1 authored by Wang Shilong's avatar Wang Shilong Committed by Josef Bacik

Btrfs: make __merge_refs() return type be void

__merge_refs() always return 0, it is unnecessary
for the caller to check the return value.
Signed-off-by: default avatarWang Shilong <wangsl-fnst@cn.fujitsu.com>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
parent 1149ab6b
...@@ -443,7 +443,7 @@ static int __add_missing_keys(struct btrfs_fs_info *fs_info, ...@@ -443,7 +443,7 @@ static int __add_missing_keys(struct btrfs_fs_info *fs_info,
* having a parent). * having a parent).
* mode = 2: merge identical parents * mode = 2: merge identical parents
*/ */
static int __merge_refs(struct list_head *head, int mode) static void __merge_refs(struct list_head *head, int mode)
{ {
struct list_head *pos1; struct list_head *pos1;
...@@ -489,7 +489,6 @@ static int __merge_refs(struct list_head *head, int mode) ...@@ -489,7 +489,6 @@ static int __merge_refs(struct list_head *head, int mode)
} }
} }
return 0;
} }
/* /*
...@@ -884,18 +883,14 @@ static int find_parent_nodes(struct btrfs_trans_handle *trans, ...@@ -884,18 +883,14 @@ static int find_parent_nodes(struct btrfs_trans_handle *trans,
if (ret) if (ret)
goto out; goto out;
ret = __merge_refs(&prefs, 1); __merge_refs(&prefs, 1);
if (ret)
goto out;
ret = __resolve_indirect_refs(fs_info, search_commit_root, time_seq, ret = __resolve_indirect_refs(fs_info, search_commit_root, time_seq,
&prefs, extent_item_pos); &prefs, extent_item_pos);
if (ret) if (ret)
goto out; goto out;
ret = __merge_refs(&prefs, 2); __merge_refs(&prefs, 2);
if (ret)
goto out;
while (!list_empty(&prefs)) { while (!list_empty(&prefs)) {
ref = list_first_entry(&prefs, struct __prelim_ref, list); ref = list_first_entry(&prefs, struct __prelim_ref, list);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment