提交 84cd948c 编写于 作者: J Josef Bacik 提交者: Chris Mason

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: NJosef Bacik <josef@redhat.com>
上级 7e1fea73
...@@ -6309,9 +6309,13 @@ int btrfs_drop_snapshot(struct btrfs_root *root, ...@@ -6309,9 +6309,13 @@ int btrfs_drop_snapshot(struct btrfs_root *root,
NULL, NULL); NULL, NULL);
BUG_ON(ret < 0); BUG_ON(ret < 0);
if (ret > 0) { if (ret > 0) {
ret = btrfs_del_orphan_item(trans, tree_root, /* if we fail to delete the orphan item this time
root->root_key.objectid); * around, it'll get picked up the next time.
BUG_ON(ret); *
* The most common failure here is just -ENOENT.
*/
btrfs_del_orphan_item(trans, tree_root,
root->root_key.objectid);
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册