---

yaml --- r: 360483 b: refs/heads/master c: ca60ebf h: refs/heads/master i: 360481: 0bce22a 360479: de80d9d v: v3
git-mirror · Feb 26, 2013 · 3398a32 · 3398a32
1 parent 4a3fabd
commit 3398a32
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git 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
@@ -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);