btrfs: abort transaction in do_remap_reloc_trans() on failure

If one of the calls made by do_remap_reloc_trans() fails, we can leave
the remap tree in an inconsistent state. Abort the transaction if this
happens, to prevent the corrupt state from reaching the disk.

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Mark Harmstone <mark@harmstone.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Mark Harmstone
2026-04-21 04:00:52 +02:00
committed by David Sterba
parent 9b8824533d
commit 73db0fad67
+10 -4
View File
@@ -5035,21 +5035,27 @@ static int do_remap_reloc_trans(struct btrfs_fs_info *fs_info,
if (bg_needs_free_space) {
ret = btrfs_add_block_group_free_space(trans, dest_bg);
if (ret)
if (ret) {
btrfs_abort_transaction(trans, ret);
goto fail;
}
}
ret = copy_remapped_data(fs_info, start, new_addr, length);
if (ret)
if (ret) {
btrfs_abort_transaction(trans, ret);
goto fail;
}
ret = btrfs_remove_from_free_space_tree(trans, new_addr, length);
if (ret)
if (ret) {
btrfs_abort_transaction(trans, ret);
goto fail;
}
ret = add_remap_entry(trans, path, src_bg, start, new_addr, length);
if (ret) {
btrfs_add_to_free_space_tree(trans, new_addr, length);
btrfs_abort_transaction(trans, ret);
goto fail;
}