On Nov 27, 2020, at 4:33 AM, Jan Kara <jack@xxxxxxx> wrote:
>
> ext4_handle_error() with errors=continue mount option can accidentally
> remount the filesystem read-only when the system is rebooting. Fix that.
>
> Fixes: 1dc1097ff60e ("ext4: avoid panic during forced reboot")
> Signed-off-by: Jan Kara <jack@xxxxxxx>
Reviewed-by: Andreas Dilger <adilger@xxxxxxxxx>
> ---
> fs/ext4/super.c | 14 ++++++--------
> 1 file changed, 6 insertions(+), 8 deletions(-)
>
> diff --git a/fs/ext4/super.c b/fs/ext4/super.c
> index 94472044f4c1..2b08b162075c 100644
> --- a/fs/ext4/super.c
> +++ b/fs/ext4/super.c
> @@ -666,19 +666,17 @@ static bool system_going_down(void)
>
> static void ext4_handle_error(struct super_block *sb)
> {
> + journal_t *journal = EXT4_SB(sb)->s_journal;
> +
> if (test_opt(sb, WARN_ON_ERROR))
> WARN_ON_ONCE(1);
>
> - if (sb_rdonly(sb))
> + if (sb_rdonly(sb) || test_opt(sb, ERRORS_CONT))
> return;
>
> - if (!test_opt(sb, ERRORS_CONT)) {
> - journal_t *journal = EXT4_SB(sb)->s_journal;
> -
> - ext4_set_mount_flag(sb, EXT4_MF_FS_ABORTED);
> - if (journal)
> - jbd2_journal_abort(journal, -EIO);
> - }
> + ext4_set_mount_flag(sb, EXT4_MF_FS_ABORTED);
> + if (journal)
> + jbd2_journal_abort(journal, -EIO);
> /*
> * We force ERRORS_RO behavior when system is rebooting. Otherwise we
> * could panic during 'reboot -f' as the underlying device got already
> --
> 2.16.4
>
Cheers, Andreas
Attachment:
signature.asc
Description: Message signed with OpenPGP
