summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2019-05-17 17:37:18 -0400
committerTheodore Ts'o <tytso@mit.edu>2019-05-17 17:37:18 -0400
commit2c1d0e3631e5732dba98ef49ac0bec1388776793 (patch)
tree6bd37706c433de9323cf7b7a7ac8e8224702ea05
parent170417c8c7bb2cbbdd949bf5c443c0c8f24a203b (diff)
downloadlinux-stable-2c1d0e3631e5732dba98ef49ac0bec1388776793.tar.gz
linux-stable-2c1d0e3631e5732dba98ef49ac0bec1388776793.tar.bz2
linux-stable-2c1d0e3631e5732dba98ef49ac0bec1388776793.zip
ext4: avoid panic during forced reboot due to aborted journal
Handling of aborted journal is a special code path different from standard ext4_error() one and it can call panic() as well. Commit 1dc1097ff60e ("ext4: avoid panic during forced reboot") forgot to update this path so fix that omission. Fixes: 1dc1097ff60e ("ext4: avoid panic during forced reboot") Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Cc: stable@kernel.org # 5.1
-rw-r--r--fs/ext4/super.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 5013d04b41fd..272e1881b5f8 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -699,7 +699,7 @@ void __ext4_abort(struct super_block *sb, const char *function,
jbd2_journal_abort(EXT4_SB(sb)->s_journal, -EIO);
save_error_info(sb, function, line);
}
- if (test_opt(sb, ERRORS_PANIC)) {
+ if (test_opt(sb, ERRORS_PANIC) && !system_going_down()) {
if (EXT4_SB(sb)->s_journal &&
!(EXT4_SB(sb)->s_journal->j_flags & JBD2_REC_ERR))
return;