From: Josef Bacik Date: Tue, 21 Jul 2020 15:24:27 +0000 (-0400) Subject: btrfs: don't WARN if we abort a transaction with EROFS X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1172198efce9701620be0673a7f23eda23e11a3f;p=linux btrfs: don't WARN if we abort a transaction with EROFS commit f95ebdbed46a4d8b9fdb7bff109fdbb6fc9a6dc8 upstream. 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. CC: stable@vger.kernel.org # 5.4+ Signed-off-by: Josef Bacik Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman (cherry picked from commit ee6373070108cab313ddcb4ab6a6415cf11c69b0) --- diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 06a0f7e991e4..86610c400088 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -3221,7 +3221,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)); \