btrfs: don't WARN_ON() if we abort a transaction with -EROFS
PATCH 1/2 btrfs: don't WARN_ON() if we abort a transaction with -EROFS
If we got some sort of corruption via a read and call btrfs_handle_fs_error() we'll set BTRFS_FS_STATE_ERROR on the fs and complain. If a subsequent trans handle trips over this it'll get -EROFS and then abort. However at that point we're not aborting for the original reason, we're aborting because we've been flipped read only. We do not need to WARN_ON() here.
--- fs/btrfs/ctree.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/ctree.h +1 -1
@@ -3279,7 +3279,7 @@ do { \/* Report first abort since mount */ \if (!test_and_set_bit (BTRFS_FS_STATE_TRANS_ABORTED , \ &((trans)->fs_info->fs_state))) { \ -if ((errno) != -EIO ) { \ +if ((errno) != -EIO && (errno) != -EROFS ) { \WARN (1 ,KERN_DEBUG \"BTRFS: Transaction aborted (error %d)\n" , \ (errno)); \
Signature · 1 line
2.24.1
PATCH 2/2 btrfs: document special case error codes for fs errors
We've had some discussions about what to do in certain scenarios for error codes, specifically -EUCLEAN and -EROFS. Document these near the error handling code so its clear what their intentions are.
--- fs/btrfs/super.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
fs/btrfs/super.c +15 -0
@@ -67,6 +67,21 @@ static struct file_system_type btrfs_root_fs_type;static int btrfs_remount (struct super_block *sb,int *flags,char *data); +/* +* Generally the error codes correspond to their respective errors, but there's +* a few special cases. +* +* -EUCLEAN: Any sort of corruption that we encounter. The tree-checker for +* instance will return -EUCLEAN if any of the blocks are corrupted in a way +* that is problematic. We want to reserve -EUCLEAN for these sort of +* corruptions. +* +* -EROFS: If we check BTRFS_FS_STATE_ERROR and fail out with a return error, we +* need to use -EROFS for this case. We will have no idea of the original +* failure, that will have been reported at the time we tripped over the error. +* Each subsequent error that doesn't have any context of the original error +* should use -EROFS when handling BTRFS_FS_STATE_ERROR. +*/ const char * __attribute_const__ btrfs_decode_error(int errno) {char *errstr ="unknown" ;
Signature · 1 line
2.24.1
Quoted 8 lines · Josef Bacik
If we got some sort of corruption via a read and call
btrfs_handle_fs_error()we'll setBTRFS_FS_STATE_ERRORon the fs and complain. If a subsequent trans handle trips over this it'll get-EROFSand then abort. However at that point we're not aborting for the original reason, we're aborting because we've been flipped read only. We do not need toWARN_ON()here.Signed-off-by Josef Bacik <[email protected]>
1 and 2 added to misc-next, thanks.