Commit 2c1d0e36 authored May 17, 2019 by Jan Kara Committed by Theodore Ts'o May 17, 2019

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
1dc1097f ("ext4: avoid panic during forced reboot") forgot to update
this path so fix that omission.

Fixes: 1dc1097f ("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

parent 170417c8

fs/ext4/super.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

Admin message