|
@@ -5048,10 +5048,17 @@ static long _btrfs_ioctl_set_received_subvol(struct file *file,
|
|
|
received_uuid_changed = memcmp(root_item->received_uuid, sa->uuid,
|
|
|
BTRFS_UUID_SIZE);
|
|
|
if (received_uuid_changed &&
|
|
|
- !btrfs_is_empty_uuid(root_item->received_uuid))
|
|
|
- btrfs_uuid_tree_rem(trans, fs_info, root_item->received_uuid,
|
|
|
- BTRFS_UUID_KEY_RECEIVED_SUBVOL,
|
|
|
- root->root_key.objectid);
|
|
|
+ !btrfs_is_empty_uuid(root_item->received_uuid)) {
|
|
|
+ ret = btrfs_uuid_tree_rem(trans, fs_info,
|
|
|
+ root_item->received_uuid,
|
|
|
+ BTRFS_UUID_KEY_RECEIVED_SUBVOL,
|
|
|
+ root->root_key.objectid);
|
|
|
+ if (ret && ret != -ENOENT) {
|
|
|
+ btrfs_abort_transaction(trans, ret);
|
|
|
+ btrfs_end_transaction(trans);
|
|
|
+ goto out;
|
|
|
+ }
|
|
|
+ }
|
|
|
memcpy(root_item->received_uuid, sa->uuid, BTRFS_UUID_SIZE);
|
|
|
btrfs_set_root_stransid(root_item, sa->stransid);
|
|
|
btrfs_set_root_rtransid(root_item, sa->rtransid);
|