Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 316063bf authored by Jan Kara's avatar Jan Kara Committed by Greg Kroah-Hartman
Browse files

ext4: avoid panic during forced reboot due to aborted journal 



commit 2c1d0e3631e5732dba98ef49ac0bec1388776793 upstream.

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: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Cc: stable@kernel.org # 5.1
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c19db366

fs/ext4/super.c

+1 −1
Original line number Diff line number Diff line
@@ -698,7 +698,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;