Commit 84cd948c authored Dec 08, 2010 by Josef Bacik Committed by Chris Mason Dec 10, 2010

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

Not being able to delete an orphan item isn't a horrible thing. The worst that
happens is the next time around we try and do the orphan cleanup and we can't
find the referenced object and just delete the item and move on.

Signed-off-by: Josef Bacik <josef@redhat.com>

parent 7e1fea73

fs/btrfs/extent-tree.c

+7 −3

Original line number	Diff line number	Diff line
		@@ -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,
		/* 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);
		BUG_ON(ret);
		}
		}

Admin message