diff options
| author | Josef Bacik <josef@redhat.com> | 2010-12-08 12:24:01 -0500 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2010-12-10 16:29:04 -0500 |
| commit | 84cd948cb11041f205242de457e680b9bb872a36 (patch) | |
| tree | 479ac0dc057044a8b399c8c32f1c78641bd33740 /fs | |
| parent | 7e1fea731da8c1b5fcf5d8e157befd389b030760 (diff) | |
| download | linux-3.10-84cd948cb11041f205242de457e680b9bb872a36.tar.gz linux-3.10-84cd948cb11041f205242de457e680b9bb872a36.tar.bz2 linux-3.10-84cd948cb11041f205242de457e680b9bb872a36.zip | |
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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/extent-tree.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index cec05e10014..41133b064d7 100644 --- a/fs/btrfs/extent-tree.c +++ b/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); } } |