github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-22 12:44:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

btrfs: abort transaction on error in write_all_supers()

Browse Source 
We are in a transaction context and have an handle, so instead of using
the less preferred btrfs_handle_fs_error(), abort the transaction and
log an error to give some context information.

Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Filipe Manana 2026-02-03 17:31:58 +00:00 committed by David Sterba
parent 98d9df2515
commit 3810ab40af
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fs/btrfs/disk-io.c
View File

@ -4071,8 +4071,8 @@ int write_all_supers(struct btrfs_trans_handle *trans, int max_mirrors)
if (ret) { if (ret) {
mutex_unlock( mutex_unlock(
&fs_info->fs_devices->device_list_mutex); &fs_info->fs_devices->device_list_mutex);
btrfs_handle_fs_error(fs_info, ret, btrfs_abort_transaction(trans, ret);
"errors while submitting device barriers."); btrfs_err(fs_info, "error while submitting device barriers");
return ret; return ret;
} }
} }
@ -4106,9 +4106,10 @@ int write_all_supers(struct btrfs_trans_handle *trans, int max_mirrors)
ret = btrfs_validate_write_super(fs_info, sb); ret = btrfs_validate_write_super(fs_info, sb);
if (unlikely(ret < 0)) { if (unlikely(ret < 0)) {
mutex_unlock(&fs_info->fs_devices->device_list_mutex); mutex_unlock(&fs_info->fs_devices->device_list_mutex);
btrfs_handle_fs_error(fs_info, -EUCLEAN, btrfs_abort_transaction(trans, ret);
"unexpected superblock corruption detected"); btrfs_err(fs_info,
return -EUCLEAN; "unexpected superblock corruption before writing it");
return ret;
} }
ret = write_dev_supers(dev, sb, max_mirrors); ret = write_dev_supers(dev, sb, max_mirrors);
@ -4121,9 +4122,8 @@ int write_all_supers(struct btrfs_trans_handle *trans, int max_mirrors)
mutex_unlock(&fs_info->fs_devices->device_list_mutex); mutex_unlock(&fs_info->fs_devices->device_list_mutex);
/* FUA is masked off if unsupported and can't be the reason */ /* FUA is masked off if unsupported and can't be the reason */
btrfs_handle_fs_error(fs_info, -EIO, btrfs_abort_transaction(trans, -EIO);
"%d errors while writing supers", btrfs_err(fs_info, "%d errors while writing supers", total_errors);
total_errors);
return -EIO; return -EIO;
} }
@ -4141,9 +4141,8 @@ int write_all_supers(struct btrfs_trans_handle *trans, int max_mirrors)
} }
mutex_unlock(&fs_info->fs_devices->device_list_mutex); mutex_unlock(&fs_info->fs_devices->device_list_mutex);
if (unlikely(total_errors > max_errors)) { if (unlikely(total_errors > max_errors)) {
btrfs_handle_fs_error(fs_info, -EIO, btrfs_abort_transaction(trans, -EIO);
"%d errors while writing supers", btrfs_err(fs_info, "%d errors while writing supers", total_errors);
total_errors);
return -EIO; return -EIO;
} }
return 0; return 0;