ext4: Avoid panic during forced reboot due to aborted journal
Jan Kara
reviewerPATCH 1/1 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 <[email protected]>
--- fs/ext4/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ext4/super.c +1 -1
@@ -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 ;
Signature · 1 line
2.16.4
Quoted 7 lines · Jan Kara
Handling of aborted journal is a special code path different from standard
ext4_error()one and it can callpanic()as well. Commit1dc1097ff60e("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 <[email protected]>
Thanks, applied.
- Ted