lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Btrfs: make __merge_refs() return type be void

Browse Source 
__merge_refs() always return 0, it is unnecessary
for the caller to check the return value.

Signed-off-by: Wang Shilong <wangsl-fnst@cn.fujitsu.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
This commit is contained in:
Wang Shilong
2013-04-11 07:08:55 +00:00
committed by Josef Bacik
parent 1149ab6bd4
commit 692206b153
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
fs/btrfs/backref.c
View File

@@ -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)
} }
} }
return 0;
} }
/* /*
@@ -884,18 +883,14 @@ again:
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);