From 3398a32682fedce0691358603590ebcd74a2000a Mon Sep 17 00:00:00 2001
From: Jan Schmidt <list.btrfs@jan-o-sch.net>
Date: Thu, 21 Feb 2013 15:35:27 +0000
Subject: [PATCH] --- yaml --- r: 360483 b: refs/heads/master c:
 ca60ebfa303ca6d9f3cad5028c10f0a17d571a4c h: refs/heads/master i:   360481:
 0bce22afc60eaca6afcd5ec0f1609c57c3cd8b7b   360479:
 de80d9d5c72df6c1d43576bb8b8a40d359f6059c v: v3

---
 [refs]                   | 2 +-
 trunk/fs/btrfs/backref.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index fbeb673b86fd..6d674ff371aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2bdf9a8f79052e9577936cbe5696c0e232aa0e3
+refs/heads/master: ca60ebfa303ca6d9f3cad5028c10f0a17d571a4c
diff --git a/trunk/fs/btrfs/backref.c b/trunk/fs/btrfs/backref.c
index 04edf69be875..bd605c87adfd 100644
--- a/trunk/fs/btrfs/backref.c
+++ b/trunk/fs/btrfs/backref.c
@@ -352,11 +352,8 @@ static int __resolve_indirect_refs(struct btrfs_fs_info *fs_info,
 		err = __resolve_indirect_ref(fs_info, search_commit_root,
 					     time_seq, ref, parents,
 					     extent_item_pos);
-		if (err) {
-			if (ret == 0)
-				ret = err;
+		if (err)
 			continue;
-		}
 
 		/* we put the first parent into the ref at hand */
 		ULIST_ITER_INIT(&uiter);