From: Andreas Dilger <adilger@dilger.ca> To: Jan Kara <jack@suse.cz> Cc: Ted Tso <tytso@mit.edu>, linux-ext4@vger.kernel.org Subject: Re: [PATCH 05/12] ext4: Move functions in super.c Date: Sun, 29 Nov 2020 15:13:51 -0700 [thread overview] Message-ID: <3D0D6321-5CFD-4AE0-B88D-B8ED12F97739@dilger.ca> (raw) In-Reply-To: <20201127113405.26867-6-jack@suse.cz> [-- Attachment #1: Type: text/plain, Size: 6878 bytes --] On Nov 27, 2020, at 4:33 AM, Jan Kara <jack@suse.cz> wrote: > > Just move error info related functions in super.c close to > ext4_handle_error(). We'll want to combine save_error_info() with > ext4_handle_error() and this makes change more obvious and saves a > forward declaration as well. No functional change. > > Signed-off-by: Jan Kara <jack@suse.cz> Reviewed-by: Andreas Dilger <adilger@dilger.ca> > --- > fs/ext4/super.c | 196 ++++++++++++++++++++++++++++---------------------------- > 1 file changed, 98 insertions(+), 98 deletions(-) > > diff --git a/fs/ext4/super.c b/fs/ext4/super.c > index dddaadc55475..7948c07d0a90 100644 > --- a/fs/ext4/super.c > +++ b/fs/ext4/super.c > @@ -423,104 +423,6 @@ static time64_t __ext4_get_tstamp(__le32 *lo, __u8 *hi) > #define ext4_get_tstamp(es, tstamp) \ > __ext4_get_tstamp(&(es)->tstamp, &(es)->tstamp ## _hi) > > -static void __save_error_info(struct super_block *sb, int error, > - __u32 ino, __u64 block, > - const char *func, unsigned int line) > -{ > - struct ext4_super_block *es = EXT4_SB(sb)->s_es; > - int err; > - > - EXT4_SB(sb)->s_mount_state |= EXT4_ERROR_FS; > - if (bdev_read_only(sb->s_bdev)) > - return; > - es->s_state |= cpu_to_le16(EXT4_ERROR_FS); > - ext4_update_tstamp(es, s_last_error_time); > - strncpy(es->s_last_error_func, func, sizeof(es->s_last_error_func)); > - es->s_last_error_line = cpu_to_le32(line); > - es->s_last_error_ino = cpu_to_le32(ino); > - es->s_last_error_block = cpu_to_le64(block); > - switch (error) { > - case EIO: > - err = EXT4_ERR_EIO; > - break; > - case ENOMEM: > - err = EXT4_ERR_ENOMEM; > - break; > - case EFSBADCRC: > - err = EXT4_ERR_EFSBADCRC; > - break; > - case 0: > - case EFSCORRUPTED: > - err = EXT4_ERR_EFSCORRUPTED; > - break; > - case ENOSPC: > - err = EXT4_ERR_ENOSPC; > - break; > - case ENOKEY: > - err = EXT4_ERR_ENOKEY; > - break; > - case EROFS: > - err = EXT4_ERR_EROFS; > - break; > - case EFBIG: > - err = EXT4_ERR_EFBIG; > - break; > - case EEXIST: > - err = EXT4_ERR_EEXIST; > - break; > - case ERANGE: > - err = EXT4_ERR_ERANGE; > - break; > - case EOVERFLOW: > - err = EXT4_ERR_EOVERFLOW; > - break; > - case EBUSY: > - err = EXT4_ERR_EBUSY; > - break; > - case ENOTDIR: > - err = EXT4_ERR_ENOTDIR; > - break; > - case ENOTEMPTY: > - err = EXT4_ERR_ENOTEMPTY; > - break; > - case ESHUTDOWN: > - err = EXT4_ERR_ESHUTDOWN; > - break; > - case EFAULT: > - err = EXT4_ERR_EFAULT; > - break; > - default: > - err = EXT4_ERR_UNKNOWN; > - } > - es->s_last_error_errcode = err; > - if (!es->s_first_error_time) { > - es->s_first_error_time = es->s_last_error_time; > - es->s_first_error_time_hi = es->s_last_error_time_hi; > - strncpy(es->s_first_error_func, func, > - sizeof(es->s_first_error_func)); > - es->s_first_error_line = cpu_to_le32(line); > - es->s_first_error_ino = es->s_last_error_ino; > - es->s_first_error_block = es->s_last_error_block; > - es->s_first_error_errcode = es->s_last_error_errcode; > - } > - /* > - * Start the daily error reporting function if it hasn't been > - * started already > - */ > - if (!es->s_error_count) > - mod_timer(&EXT4_SB(sb)->s_err_report, jiffies + 24*60*60*HZ); > - le32_add_cpu(&es->s_error_count, 1); > -} > - > -static void save_error_info(struct super_block *sb, int error, > - __u32 ino, __u64 block, > - const char *func, unsigned int line) > -{ > - __save_error_info(sb, error, ino, block, func, line); > - if (!bdev_read_only(sb->s_bdev)) > - ext4_commit_super(sb, 1); > -} > - > /* > * The del_gendisk() function uninitializes the disk-specific data > * structures, including the bdi structure, without telling anyone > @@ -649,6 +551,104 @@ static bool system_going_down(void) > || system_state == SYSTEM_RESTART; > } > > +static void __save_error_info(struct super_block *sb, int error, > + __u32 ino, __u64 block, > + const char *func, unsigned int line) > +{ > + struct ext4_super_block *es = EXT4_SB(sb)->s_es; > + int err; > + > + EXT4_SB(sb)->s_mount_state |= EXT4_ERROR_FS; > + if (bdev_read_only(sb->s_bdev)) > + return; > + es->s_state |= cpu_to_le16(EXT4_ERROR_FS); > + ext4_update_tstamp(es, s_last_error_time); > + strncpy(es->s_last_error_func, func, sizeof(es->s_last_error_func)); > + es->s_last_error_line = cpu_to_le32(line); > + es->s_last_error_ino = cpu_to_le32(ino); > + es->s_last_error_block = cpu_to_le64(block); > + switch (error) { > + case EIO: > + err = EXT4_ERR_EIO; > + break; > + case ENOMEM: > + err = EXT4_ERR_ENOMEM; > + break; > + case EFSBADCRC: > + err = EXT4_ERR_EFSBADCRC; > + break; > + case 0: > + case EFSCORRUPTED: > + err = EXT4_ERR_EFSCORRUPTED; > + break; > + case ENOSPC: > + err = EXT4_ERR_ENOSPC; > + break; > + case ENOKEY: > + err = EXT4_ERR_ENOKEY; > + break; > + case EROFS: > + err = EXT4_ERR_EROFS; > + break; > + case EFBIG: > + err = EXT4_ERR_EFBIG; > + break; > + case EEXIST: > + err = EXT4_ERR_EEXIST; > + break; > + case ERANGE: > + err = EXT4_ERR_ERANGE; > + break; > + case EOVERFLOW: > + err = EXT4_ERR_EOVERFLOW; > + break; > + case EBUSY: > + err = EXT4_ERR_EBUSY; > + break; > + case ENOTDIR: > + err = EXT4_ERR_ENOTDIR; > + break; > + case ENOTEMPTY: > + err = EXT4_ERR_ENOTEMPTY; > + break; > + case ESHUTDOWN: > + err = EXT4_ERR_ESHUTDOWN; > + break; > + case EFAULT: > + err = EXT4_ERR_EFAULT; > + break; > + default: > + err = EXT4_ERR_UNKNOWN; > + } > + es->s_last_error_errcode = err; > + if (!es->s_first_error_time) { > + es->s_first_error_time = es->s_last_error_time; > + es->s_first_error_time_hi = es->s_last_error_time_hi; > + strncpy(es->s_first_error_func, func, > + sizeof(es->s_first_error_func)); > + es->s_first_error_line = cpu_to_le32(line); > + es->s_first_error_ino = es->s_last_error_ino; > + es->s_first_error_block = es->s_last_error_block; > + es->s_first_error_errcode = es->s_last_error_errcode; > + } > + /* > + * Start the daily error reporting function if it hasn't been > + * started already > + */ > + if (!es->s_error_count) > + mod_timer(&EXT4_SB(sb)->s_err_report, jiffies + 24*60*60*HZ); > + le32_add_cpu(&es->s_error_count, 1); > +} > + > +static void save_error_info(struct super_block *sb, int error, > + __u32 ino, __u64 block, > + const char *func, unsigned int line) > +{ > + __save_error_info(sb, error, ino, block, func, line); > + if (!bdev_read_only(sb->s_bdev)) > + ext4_commit_super(sb, 1); > +} > + > /* Deal with the reporting of failure conditions on a filesystem such as > * inconsistencies detected or read IO failures. > * > -- > 2.16.4 > Cheers, Andreas [-- Attachment #2: Message signed with OpenPGP --] [-- Type: application/pgp-signature, Size: 873 bytes --]
next prev parent reply other threads:[~2020-11-29 22:14 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 [this message] 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 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=3D0D6321-5CFD-4AE0-B88D-B8ED12F97739@dilger.ca \ --to=adilger@dilger.ca \ --cc=jack@suse.cz \ --cc=linux-ext4@vger.kernel.org \ --cc=tytso@mit.edu \ --subject='Re: [PATCH 05/12] ext4: Move functions in super.c' \ /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
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.