Skip to content

Commit ac2f7ca

Browse files
Ye Bintytso
authored andcommitted
ext4: always panic when errors=panic is specified
Before commit 014c9ca ("ext4: make ext4_abort() use __ext4_error()"), the following series of commands would trigger a panic: 1. mount /dev/sda -o ro,errors=panic test 2. mount /dev/sda -o remount,abort test After commit 014c9ca, remounting a file system using the test mount option "abort" will no longer trigger a panic. This commit will restore the behaviour immediately before commit 014c9ca. (However, note that the Linux kernel's behavior has not been consistent; some previous kernel versions, including 5.4 and 4.19 similarly did not panic after using the mount option "abort".) This also makes a change to long-standing behaviour; namely, the following series commands will now cause a panic, when previously it did not: 1. mount /dev/sda -o ro,errors=panic test 2. echo test > /sys/fs/ext4/sda/trigger_fs_error However, this makes ext4's behaviour much more consistent, so this is a good thing. Cc: [email protected] Fixes: 014c9ca ("ext4: make ext4_abort() use __ext4_error()") Signed-off-by: Ye Bin <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Theodore Ts'o <[email protected]>
1 parent 3cd4617 commit ac2f7ca

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

fs/ext4/super.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -667,9 +667,6 @@ static void ext4_handle_error(struct super_block *sb, bool force_ro, int error,
667667
ext4_commit_super(sb);
668668
}
669669

670-
if (sb_rdonly(sb) || continue_fs)
671-
return;
672-
673670
/*
674671
* We force ERRORS_RO behavior when system is rebooting. Otherwise we
675672
* could panic during 'reboot -f' as the underlying device got already
@@ -679,6 +676,10 @@ static void ext4_handle_error(struct super_block *sb, bool force_ro, int error,
679676
panic("EXT4-fs (device %s): panic forced after error\n",
680677
sb->s_id);
681678
}
679+
680+
if (sb_rdonly(sb) || continue_fs)
681+
return;
682+
682683
ext4_msg(sb, KERN_CRIT, "Remounting filesystem read-only");
683684
/*
684685
* Make sure updated value of ->s_mount_flags will be visible before

0 commit comments

Comments
 (0)