Commit cfac023d authored by Ye Bin's avatar Ye Bin Committed by Jialin Zhang
Browse files

ext4: make sure fs error flag setted before clear journal error 

mainline inclusion
from mainline-v6.3-rc2
commit f57886ca
category: bugfix
bugzilla: 188471,https://gitee.com/openeuler/kernel/issues/I6MR1V
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f57886ca1606ba74cc4ec4eb5cbf073934ffa559



--------------------------------

Now, jounral error number maybe cleared even though ext4_commit_super()
failed. This may lead to error flag miss, then fsck will miss to check
file system deeply.

Signed-off-by: default avatarYe Bin <yebin10@huawei.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20230307061703.245965-3-yebin@huaweicloud.com


Signed-off-by: default avatarBaokun Li <libaokun1@huawei.com>
Reviewed-by: default avatarZhang Yi <yi.zhang@huawei.com>
Reviewed-by: default avatarYang Erkun <yangerkun@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parent d16e5f83

fs/ext4/super.c

+4 −2
Original line number Diff line number Diff line
@@ -5779,11 +5779,13 @@ static int ext4_clear_journal_err(struct super_block *sb, 
		errstr = ext4_decode_error(sb, j_errno, nbuf);

		ext4_warning(sb, "Filesystem error recorded "

			     "from previous mount: %s", errstr);

		ext4_warning(sb, "Marking fs in need of filesystem check.");



		EXT4_SB(sb)->s_mount_state |= EXT4_ERROR_FS;

		es->s_state |= cpu_to_le16(EXT4_ERROR_FS);

		ext4_commit_super(sb);

		j_errno = ext4_commit_super(sb);

		if (j_errno)

			return j_errno;

		ext4_warning(sb, "Marked fs in need of filesystem check.");



		jbd2_journal_clear_err(journal);

		jbd2_journal_update_sb_errno(journal);