mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-01 00:58:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

btrfs: move transaction aborts to the error site in convert_free_space_to_extents()

Browse source 
Transaction aborts should be done next to the place the error happens,
which was not done in convert_free_space_to_extents().  The DEBUG_WARN()
is removed because we get the abort message.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2025-04-30 18:45:19 +02:00
parent 14338d4661
commit addaa67e33
1 changed files with 12 additions and 6 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

18
fs/btrfs/free-space-tree.c
View file

@ -364,6 +364,7 @@ int convert_free_space_to_extents(struct btrfs_trans_handle *trans,
bitmap = alloc_bitmap(bitmap_size); bitmap = alloc_bitmap(bitmap_size);
if (!bitmap) { if (!bitmap) {
ret = -ENOMEM; ret = -ENOMEM;
btrfs_abort_transaction(trans, ret);
goto out; goto out;
} }
@ -376,8 +377,10 @@ int convert_free_space_to_extents(struct btrfs_trans_handle *trans,
while (!done) { while (!done) {
ret = btrfs_search_prev_slot(trans, root, &key, path, -1, 1); ret = btrfs_search_prev_slot(trans, root, &key, path, -1, 1);
if (ret) if (ret) {
btrfs_abort_transaction(trans, ret);
goto out; goto out;
}
leaf = path->nodes[0]; leaf = path->nodes[0];
nr = 0; nr = 0;
@ -418,14 +421,17 @@ int convert_free_space_to_extents(struct btrfs_trans_handle *trans,
} }
ret = btrfs_del_items(trans, root, path, path->slots[0], nr); ret = btrfs_del_items(trans, root, path, path->slots[0], nr);
if (ret) if (ret) {
btrfs_abort_transaction(trans, ret);
goto out; goto out;
}
btrfs_release_path(path); btrfs_release_path(path);
} }
info = search_free_space_info(trans, block_group, path, 1); info = search_free_space_info(trans, block_group, path, 1);
if (IS_ERR(info)) { if (IS_ERR(info)) {
ret = PTR_ERR(info); ret = PTR_ERR(info);
btrfs_abort_transaction(trans, ret);
goto out; goto out;
} }
leaf = path->nodes[0]; leaf = path->nodes[0];
@ -447,8 +453,10 @@ int convert_free_space_to_extents(struct btrfs_trans_handle *trans,
key.offset = (end_bit - start_bit) * block_group->fs_info->sectorsize; key.offset = (end_bit - start_bit) * block_group->fs_info->sectorsize;
ret = btrfs_insert_empty_item(trans, root, path, &key, 0); ret = btrfs_insert_empty_item(trans, root, path, &key, 0);
if (ret) if (ret) {
btrfs_abort_transaction(trans, ret);
goto out; goto out;
}
btrfs_release_path(path); btrfs_release_path(path);
extent_count++; extent_count++;
@ -461,16 +469,14 @@ int convert_free_space_to_extents(struct btrfs_trans_handle *trans,
"incorrect extent count for %llu; counted %u, expected %u", "incorrect extent count for %llu; counted %u, expected %u",
block_group->start, extent_count, block_group->start, extent_count,
expected_extent_count); expected_extent_count);
DEBUG_WARN();
ret = -EIO; ret = -EIO;
btrfs_abort_transaction(trans, ret);
goto out; goto out;
} }
ret = 0; ret = 0;
out: out:
kvfree(bitmap); kvfree(bitmap);
if (ret)
btrfs_abort_transaction(trans, ret);
return ret; return ret;
} }