From: Ye Bin Date: Tue, 7 Mar 2023 06:17:03 +0000 (+0800) Subject: ext4: make sure fs error flag setted before clear journal error X-Git-Tag: v6.6.17~5321^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f57886ca1606ba74cc4ec4eb5cbf073934ffa559;p=platform%2Fkernel%2Flinux-rpi.git ext4: make sure fs error flag setted before clear journal error 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: Ye Bin Reviewed-by: Jan Kara Link: https://lore.kernel.org/r/20230307061703.245965-3-yebin@huaweicloud.com --- diff --git a/fs/ext4/super.c b/fs/ext4/super.c index effe5e5..a7495f4 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -6205,11 +6205,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);