From 938ce5d44ca9124db58b34f1d5ec788e70721163 Mon Sep 17 00:00:00 2001
From: Josef Bacik <josef@redhat.com>
Date: Wed, 8 Dec 2010 12:24:01 -0500
Subject: [PATCH] --- yaml --- r: 223071 b: refs/heads/master c:
 84cd948cb11041f205242de457e680b9bb872a36 h: refs/heads/master i:   223069:
 dcc1d9458ad4be175c19f7840f5f1b78350fdd43   223067:
 52f90006475b4bc7c3cd96f4b9d7d391dc213427   223063:
 43676b78cbf3ba098054932aacef0b51c68df47d   223055:
 83b284b0a69cbc522bd64518f40c660647bbaba4   223039:
 37c86454dd9e4dfc3ebcc375e7dea8b6f822c257 v: v3

---
 [refs]                       |  2 +-
 trunk/fs/btrfs/extent-tree.c | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 8298a416b51a..bb19c656400d 100644
--- 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
index cec05e100142..41133b064d72 100644
--- 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);
 		}
 	}