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

ext4: commit super block if fs record error when journal record without error 

mainline inclusion
from mainline-v6.3-rc2
commit eee00237
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=eee00237fa5ec8f704f7323b54e48cc34e2d9168



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

Now, 'es->s_state' maybe covered by recover journal. And journal errno
maybe not recorded in journal sb as IO error. ext4_update_super() only
update error information when 'sbi->s_add_error_count' large than zero.
Then 'EXT4_ERROR_FS' flag maybe lost.
To solve above issue just recover 'es->s_state' error flag after journal
replay like error info.

Signed-off-by: default avatarYe Bin <yebin10@huawei.com>
Reviewed-by: default avatarBaokun Li <libaokun1@huawei.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20230307061703.245965-2-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 9a3f3952

fs/ext4/super.c

+9 −0
Original line number Diff line number Diff line
@@ -5540,6 +5540,7 @@ static int ext4_load_journal(struct super_block *sb, 
		err = jbd2_journal_wipe(journal, !really_read_only);

	if (!err) {

		char *save = kmalloc(EXT4_S_ERR_LEN, GFP_KERNEL);



		if (save)

			memcpy(save, ((char *) es) +

			       EXT4_S_ERR_START, EXT4_S_ERR_LEN);
@@ -5548,6 +5549,14 @@ static int ext4_load_journal(struct super_block *sb, 
			memcpy(((char *) es) + EXT4_S_ERR_START,

			       save, EXT4_S_ERR_LEN);

		kfree(save);

		es->s_state |= cpu_to_le16(EXT4_SB(sb)->s_mount_state &

					   EXT4_ERROR_FS);

		/* Write out restored error information to the superblock */

		if (!bdev_read_only(sb->s_bdev)) {

			int err2;

			err2 = ext4_commit_super(sb);

			err = err ? : err2;

		}

	}



	if (err) {