2023-02-14 02:05:36

by Ye Bin

Subject: [PATCH v3 2/2] ext4: make sure fs error flag setted before clear journal error

From: Ye Bin <[email protected]>

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 <[email protected]>
---
fs/ext4/super.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index b94754ba8556..619ef6d021d4 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -6163,11 +6163,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);
--
2.31.1

2023-02-16 07:18:07

by Baokun Li

Subject: Re: [PATCH v3 2/2] ext4: make sure fs error flag setted before clear journal error

On 2023/2/14 10:29, Ye Bin wrote:
> From: Ye Bin <[email protected]>
>
> 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 <[email protected]>
Looks good to me.

Reviewed-by: Baokun Li <[email protected]>
> ---
> fs/ext4/super.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/fs/ext4/super.c b/fs/ext4/super.c
> index b94754ba8556..619ef6d021d4 100644
> --- a/fs/ext4/super.c
> +++ b/fs/ext4/super.c
> @@ -6163,11 +6163,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);
--
With Best Regards,
Baokun Li
.

2023-02-16 17:20:57

by Jan Kara

Subject: Re: [PATCH v3 2/2] ext4: make sure fs error flag setted before clear journal error

On Tue 14-02-23 10:29:05, Ye Bin wrote:
> From: Ye Bin <[email protected]>
>
> 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 <[email protected]>

Looks good to me. Feel free to add:

Reviewed-by: Jan Kara <[email protected]>

Honza

> ---
> fs/ext4/super.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/fs/ext4/super.c b/fs/ext4/super.c
> index b94754ba8556..619ef6d021d4 100644
> --- a/fs/ext4/super.c
> +++ b/fs/ext4/super.c
> @@ -6163,11 +6163,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);
> --
> 2.31.1
>
--
Jan Kara <[email protected]>
SUSE Labs, CR