Skip to content

Commit 2c1d0e3

Browse files
jankaratytso
authored andcommitted
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 1dc1097 ("ext4: avoid panic during forced reboot") forgot to update this path so fix that omission. Fixes: 1dc1097 ("ext4: avoid panic during forced reboot") Signed-off-by: Jan Kara <[email protected]> Signed-off-by: Theodore Ts'o <[email protected]> Cc: [email protected] # 5.1
1 parent 170417c commit 2c1d0e3

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

fs/ext4/super.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -699,7 +699,7 @@ void __ext4_abort(struct super_block *sb, const char *function,
699699
jbd2_journal_abort(EXT4_SB(sb)->s_journal, -EIO);
700700
save_error_info(sb, function, line);
701701
}
702-
if (test_opt(sb, ERRORS_PANIC)) {
702+
if (test_opt(sb, ERRORS_PANIC) && !system_going_down()) {
703703
if (EXT4_SB(sb)->s_journal &&
704704
!(EXT4_SB(sb)->s_journal->j_flags & JBD2_REC_ERR))
705705
return;

0 commit comments

Comments
 (0)