From 6d8dd7478d99a52fd5d38ac343a7c2c3a67a31ce Mon Sep 17 00:00:00 2001 From: Wang Shilong Date: Thu, 11 Apr 2013 07:08:55 +0000 Subject: [PATCH] --- yaml --- r: 374862 b: refs/heads/master c: 692206b153ea0d08d6015521ed27a6739cbf6f9f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/btrfs/backref.c | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 3a4a496e920e..a7b75fe316ce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1149ab6bd48cf3b00c59e4f8ff79fbb1cf15b94b +refs/heads/master: 692206b153ea0d08d6015521ed27a6739cbf6f9f diff --git a/trunk/fs/btrfs/backref.c b/trunk/fs/btrfs/backref.c index 66f44c7534d0..7f448b8325a1 100644 --- a/trunk/fs/btrfs/backref.c +++ b/trunk/fs/btrfs/backref.c @@ -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 @@ static int find_parent_nodes(struct btrfs_trans_handle *trans, 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);