btrfs: return -EROFS for BTRFS_FS_STATE_ERROR cases
PATCH v2 1/1 btrfs: return -EROFS for BTRFS_FS_STATE_ERROR cases
Eric reported seeing this message while running generic/475
BTRFS: error (device dm-3) in btrfs_sync_log:3084: errno=-117 Filesystem corrupted
This ret came from btrfs_write_marked_extents(). If we get an aborted transaction via an -EIO somewhere, we'll see it in btree_write_cache_pages() and return -EUCLEAN, which we spit out as "Filesystem corrupted". Except we shouldn't be returning -EUCLEAN here, we need to be returning -EROFS. -EUCLEAN is reserved for actual corruption, not IO errors.
We are inconsistent about our handling of BTRFS_FS_STATE_ERROR elsewhere, but we want to use -EROFS for this particular case. The original transaction abort has the real error code for why we ended up with an aborted transaction, all subsequent actions just need to return -EROFS because they may not have a trans handle and have no idea about the original cause of the abort.
---v1->v2:
- Fixed this to be -EROFS, fixed other handlers of BTRFS_FS_STATE_ERROR.
fs/btrfs/extent_io.c | 2 +- fs/btrfs/scrub.c | 2 +- fs/btrfs/transaction.c | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-)
fs/btrfs/extent_io.c +1 -1
@@ -4119,7 +4119,7 @@ int btree_write_cache_pages(struct address_space *mapping,if (!test_bit (BTRFS_FS_STATE_ERROR , &fs_info->fs_state)) { ret =flush_write_bio (&epd); }else { - ret = -EUCLEAN ; + ret = -EROFS ;end_write_bio (&epd, ret); }return ret;
fs/btrfs/scrub.c +1 -1
@@ -3691,7 +3691,7 @@ static noinline_for_stack int scrub_supers(struct scrub_ctx *sctx,struct btrfs_fs_info *fs_info = sctx->fs_info;if (test_bit (BTRFS_FS_STATE_ERROR , &fs_info->fs_state)) -return -EIO ; +return -EROFS ;/* Seed devices of a new filesystem has their own generation. */ if (scrub_dev->fs_devices != fs_info->fs_devices)
fs/btrfs/transaction.c +4 -1
@@ -937,7 +937,10 @@ static int __btrfs_end_transaction(struct btrfs_trans_handle *trans,if (TRANS_ABORTED (trans) ||test_bit (BTRFS_FS_STATE_ERROR , &info->fs_state)) {wake_up_process (info->transaction_kthread); - err = -EIO ; +if (TRANS_ABORTED (trans)) + err = trans->aborted; +else + err = -EROFS ; }kmem_cache_free (btrfs_trans_handle_cachep, trans);
Signature · 1 line
2.24.1
Quoted 18 lines · Josef Bacik
Eric reported seeing this message while running generic/475
BTRFS: error (device dm-3) in btrfs_sync_log:3084: errno=-117 Filesystem corrupted
This ret came from
btrfs_write_marked_extents(). If we get an aborted transaction via an-EIOsomewhere, we'll see it inbtree_write_cache_pages()and return-EUCLEAN, which we spit out as "Filesystem corrupted". Except we shouldn't be returning-EUCLEANhere, we need to be returning-EROFS.-EUCLEANis reserved for actual corruption, not IO errors.We are inconsistent about our handling of
BTRFS_FS_STATE_ERRORelsewhere, but we want to use-EROFSfor this particular case. The original transaction abort has the real error code for why we ended up with an aborted transaction, all subsequent actions just need to return-EROFSbecause they may not have a trans handle and have no idea about the original cause of the abort.
Quoted 2 lines
Reported-by Eric Sandeen <[email protected]>Signed-off-by Josef Bacik <[email protected]>
I've added full stacktrace from my logs and the patch is now ordered after patch that filters EROFS in transaction abort. Thanks.