From: harshad shirwadkar <harshadshirwadkar@gmail.com>
To: Jan Kara <jack@suse.cz>
Cc: Ted Tso <tytso@mit.edu>,
Ext4 Developers List <linux-ext4@vger.kernel.org>
Subject: Re: [PATCH 08/12] ext4: Combine ext4_handle_error() and save_error_info()
Date: Mon, 14 Dec 2020 11:23:04 -0800 [thread overview]
Message-ID: <CAD+ocbwLVsjrB1HRsOm-mD6zm+1Et1C5FcwcGvNmt-AkuZo4Uw@mail.gmail.com> (raw)
In-Reply-To: <20201127113405.26867-9-jack@suse.cz>
On Fri, Nov 27, 2020 at 3:38 AM Jan Kara <jack@suse.cz> wrote:
>
> save_error_info() is always called together with ext4_handle_error().
> Combine them into a single call and move unconditional bits out of
> save_error_info() into ext4_handle_error().
>
> Signed-off-by: Jan Kara <jack@suse.cz>
> ---
> fs/ext4/super.c | 31 +++++++++++++++----------------
> 1 file changed, 15 insertions(+), 16 deletions(-)
>
> diff --git a/fs/ext4/super.c b/fs/ext4/super.c
> index 2d7dc0908cdd..73a09b73fc11 100644
> --- a/fs/ext4/super.c
> +++ b/fs/ext4/super.c
> @@ -592,9 +592,6 @@ static void __save_error_info(struct super_block *sb, int error,
> {
> struct ext4_sb_info *sbi = EXT4_SB(sb);
>
> - EXT4_SB(sb)->s_mount_state |= EXT4_ERROR_FS;
> - if (bdev_read_only(sb->s_bdev))
> - return;
> /* We default to EFSCORRUPTED error... */
> if (error == 0)
> error = EFSCORRUPTED;
> @@ -647,13 +644,19 @@ static void save_error_info(struct super_block *sb, int error,
> * used to deal with unrecoverable failures such as journal IO errors or ENOMEM
> * at a critical moment in log management.
> */
> -static void ext4_handle_error(struct super_block *sb, bool force_ro)
> +static void ext4_handle_error(struct super_block *sb, bool force_ro, int error,
> + __u32 ino, __u64 block,
> + const char *func, unsigned int line)
> {
> journal_t *journal = EXT4_SB(sb)->s_journal;
>
> + EXT4_SB(sb)->s_mount_state |= EXT4_ERROR_FS;
> if (test_opt(sb, WARN_ON_ERROR))
> WARN_ON_ONCE(1);
>
> + if (!bdev_read_only(sb->s_bdev))
> + save_error_info(sb, error, ino, block, func, line);
> +
> if (sb_rdonly(sb) || (!force_ro && test_opt(sb, ERRORS_CONT)))
> return;
>
> @@ -710,8 +713,7 @@ void __ext4_error(struct super_block *sb, const char *function,
> sb->s_id, function, line, current->comm, &vaf);
> va_end(args);
> }
> - save_error_info(sb, error, 0, block, function, line);
> - ext4_handle_error(sb, force_ro);
> + ext4_handle_error(sb, force_ro, error, 0, block, function, line);
> }
>
> void __ext4_error_inode(struct inode *inode, const char *function,
> @@ -741,9 +743,8 @@ void __ext4_error_inode(struct inode *inode, const char *function,
> current->comm, &vaf);
> va_end(args);
> }
> - save_error_info(inode->i_sb, error, inode->i_ino, block,
> - function, line);
> - ext4_handle_error(inode->i_sb, false);
> + ext4_handle_error(inode->i_sb, false, error, inode->i_ino, block,
> + function, line);
> }
>
> void __ext4_error_file(struct file *file, const char *function,
> @@ -780,9 +781,8 @@ void __ext4_error_file(struct file *file, const char *function,
> current->comm, path, &vaf);
> va_end(args);
> }
> - save_error_info(inode->i_sb, EFSCORRUPTED, inode->i_ino, block,
> - function, line);
> - ext4_handle_error(inode->i_sb, false);
> + ext4_handle_error(inode->i_sb, false, EFSCORRUPTED, inode->i_ino, block,
> + function, line);
> }
>
> const char *ext4_decode_error(struct super_block *sb, int errno,
> @@ -849,8 +849,7 @@ void __ext4_std_error(struct super_block *sb, const char *function,
> sb->s_id, function, line, errstr);
> }
>
> - save_error_info(sb, -errno, 0, 0, function, line);
> - ext4_handle_error(sb, false);
> + ext4_handle_error(sb, false, -errno, 0, 0, function, line);
> }
>
> void __ext4_msg(struct super_block *sb,
> @@ -944,13 +943,13 @@ __acquires(bitlock)
> if (test_opt(sb, ERRORS_CONT)) {
> if (test_opt(sb, WARN_ON_ERROR))
> WARN_ON_ONCE(1);
> + EXT4_SB(sb)->s_mount_state |= EXT4_ERROR_FS;
Since you moved the bdev_read_only() check from __save_error_info to
ext4_handle_error(), should we add that check here?
- Harshad
> __save_error_info(sb, EFSCORRUPTED, ino, block, function, line);
> schedule_work(&EXT4_SB(sb)->s_error_work);
> return;
> }
> ext4_unlock_group(sb, grp);
> - save_error_info(sb, EFSCORRUPTED, ino, block, function, line);
> - ext4_handle_error(sb, false);
> + ext4_handle_error(sb, false, EFSCORRUPTED, ino, block, function, line);
> /*
> * We only get here in the ERRORS_RO case; relocking the group
> * may be dangerous, but nothing bad will happen since the
> --
> 2.16.4
>
next prev parent reply other threads:[~2020-12-14 19:24 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-27 11:33 [PATCH 00/12] ext4: Various fixes of ext4 handling of fs errors Jan Kara
2020-11-27 11:33 ` [PATCH 01/12] ext4: Don't remount read-only with errors=continue on reboot Jan Kara
2020-11-29 21:33 ` Andreas Dilger
2020-12-16 4:59 ` Theodore Y. Ts'o
2020-11-27 11:33 ` [PATCH 02/12] ext4: Remove redundant sb checksum recomputation Jan Kara
2020-11-29 22:11 ` Andreas Dilger
2020-11-30 10:59 ` Jan Kara
2020-12-16 5:01 ` Theodore Y. Ts'o
2020-11-27 11:33 ` [PATCH 03/12] ext4: Standardize error message in ext4_protect_reserved_inode() Jan Kara
2020-11-29 21:39 ` Andreas Dilger
2020-12-16 5:04 ` Theodore Y. Ts'o
2020-11-27 11:33 ` [PATCH 04/12] ext4: Make ext4_abort() use __ext4_error() Jan Kara
2020-11-29 22:12 ` Andreas Dilger
2020-12-16 5:07 ` Theodore Y. Ts'o
2020-11-27 11:33 ` [PATCH 05/12] ext4: Move functions in super.c Jan Kara
2020-11-29 22:13 ` Andreas Dilger
2020-12-16 5:09 ` Theodore Y. Ts'o
2020-11-27 11:33 ` [PATCH 06/12] ext4: Simplify ext4 error translation Jan Kara
2020-11-29 21:57 ` Andreas Dilger
2020-12-16 5:11 ` Theodore Y. Ts'o
2020-11-27 11:34 ` [PATCH 07/12] ext4: Defer saving error info from atomic context Jan Kara
2020-12-16 5:31 ` Theodore Y. Ts'o
2020-12-16 5:40 ` Theodore Y. Ts'o
2020-12-16 9:56 ` Jan Kara
2020-11-27 11:34 ` [PATCH 08/12] ext4: Combine ext4_handle_error() and save_error_info() Jan Kara
2020-12-14 19:23 ` harshad shirwadkar [this message]
2020-12-16 10:11 ` Jan Kara
2020-12-16 10:24 ` Jan Kara
2020-11-27 11:34 ` [PATCH 09/12] ext4: Drop sync argument of ext4_commit_super() Jan Kara
2020-12-14 19:25 ` harshad shirwadkar
2020-11-27 11:34 ` [PATCH 10/12] ext4: Protect superblock modifications with a buffer lock Jan Kara
2020-11-27 11:34 ` [PATCH 11/12] ext4: Save error info to sb through journal if available Jan Kara
2020-11-27 11:34 ` [PATCH 12/12] ext4: Use sbi instead of EXT4_SB(sb) in ext4_update_super() Jan Kara
2020-12-14 19:07 ` [PATCH 00/12] ext4: Various fixes of ext4 handling of fs errors harshad shirwadkar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAD+ocbwLVsjrB1HRsOm-mD6zm+1Et1C5FcwcGvNmt-AkuZo4Uw@mail.gmail.com \
--to=harshadshirwadkar@gmail.com \
--cc=jack@suse.cz \
--cc=linux-ext4@vger.kernel.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.