---

yaml --- r: 223071 b: refs/heads/master c: 84cd948 h: refs/heads/master i: 223069: dcc1d94 223067: 52f9000 223063: 43676b7 223055: 83b284b 223039: 37c8645 v: v3
git-mirror · Dec 10, 2010 · 938ce5d · 938ce5d
1 parent 666f861
commit 938ce5d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e1fea731da8c1b5fcf5d8e157befd389b030760
+refs/heads/master: 84cd948cb11041f205242de457e680b9bb872a36
diff --git a/trunk/fs/btrfs/extent-tree.c b/trunk/fs/btrfs/extent-tree.c
@@ -6309,9 +6309,13 @@ int btrfs_drop_snapshot(struct btrfs_root *root,
 					   NULL, NULL);
 		BUG_ON(ret < 0);
 		if (ret > 0) {
-			ret = btrfs_del_orphan_item(trans, tree_root,
-						    root->root_key.objectid);
-			BUG_ON(ret);
+			/* if we fail to delete the orphan item this time
+			 * around, it'll get picked up the next time.
+			 *
+			 * The most common failure here is just -ENOENT.
+			 */
+			btrfs_del_orphan_item(trans, tree_root,
+					      root->root_key.objectid);
 		}
 	}