Btrfs: make __merge_refs() return type be void
PATCH v2 2/2 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 Wang Shilong <[email protected]>
---
Changelog v1->v2:
- don't make __add_missing_keys() return type to be void so that makes people aware of unhandled BUG_ON() from read_tree block().
- rename title to be more accurate
--- fs/btrfs/backref.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-)
fs/btrfs/backref.c +3 -8
@@ -443,7 +443,7 @@ static int __add_missing_keys(struct btrfs_fs_info *fs_info,* having a parent). * 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;
@@ -489,7 +489,6 @@ static int __merge_refs(struct list_head *head, int mode) } } -return 0 ; }/*
@@ -884,18 +883,14 @@ again:if (ret) goto out; - ret =__merge_refs (&prefs,1 ); -if (ret) - goto out; +__merge_refs (&prefs,1 ); ret =__resolve_indirect_refs (fs_info, search_commit_root, time_seq, &prefs, extent_item_pos);if (ret) goto out; - ret =__merge_refs (&prefs,2 ); -if (ret) - goto out; +__merge_refs (&prefs,2 );while (!list_empty (&prefs)) { ref = list_first_entry(&prefs, struct __prelim_ref, list);
Signature · 1 line
1.7.7.6