Btrfs: do not BUG if we fail to remove the orphan item for dead snapshots UPDATED

Commit Message

Josef Bacik Dec. 10, 2010, 3:06 p.m. UTC

None

Patch

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 8aed05e..d2add51 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -6352,9 +6352,14 @@  int btrfs_drop_snapshot(struct btrfs_root *root,
 					   NULL, NULL);
 		BUG_ON(ret < 0);
 		if (ret > 0) {
+			/*
+			 * Don't bother checking the return value, either we
+			 * succeeded or we did not, either way the orphan item
+			 * will get cleaned up properly, wether its now or on
+			 * the next mount.
+			 */
 			ret = btrfs_del_orphan_item(trans, tree_root,
 						    root->root_key.objectid);
-			BUG_ON(ret);
 		}
 	}