* [PATCH] ext4: super.c: Update logging style using PR_CONT
@ 2016-10-12 1:57 Joe Perches
2016-10-12 10:41 ` Jan Kara
0 siblings, 1 reply; 5+ messages in thread
From: Joe Perches @ 2016-10-12 1:57 UTC (permalink / raw)
To: Theodore Ts'o, Andreas Dilger; +Cc: linux-ext4, linux-kernel
Recent commit require line continuing printks to use PR_CONT.
Update super.c to use PR_CONT and use vsprintf extension %pV
to avoid a printk/vprintk/printk("\n") sequence as well.
Signed-off-by: Joe Perches <joe@perches.com>
---
fs/ext4/super.c | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 6db81fbcbaa6..20da99da0a34 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -597,14 +597,15 @@ void __ext4_std_error(struct super_block *sb, const char *function,
void __ext4_abort(struct super_block *sb, const char *function,
unsigned int line, const char *fmt, ...)
{
+ struct va_format vaf;
va_list args;
save_error_info(sb, function, line);
va_start(args, fmt);
- printk(KERN_CRIT "EXT4-fs error (device %s): %s:%d: ", sb->s_id,
- function, line);
- vprintk(fmt, args);
- printk("\n");
+ vaf.fmt = fmt;
+ vaf.va = &args;
+ printk(KERN_CRIT "EXT4-fs error (device %s): %s:%d: %pV\n",
+ sb->s_id, function, line, &vaf);
va_end(args);
if ((sb->s_flags & MS_RDONLY) == 0) {
@@ -2715,12 +2716,12 @@ static void print_daily_error_info(unsigned long arg)
es->s_first_error_func,
le32_to_cpu(es->s_first_error_line));
if (es->s_first_error_ino)
- printk(": inode %u",
+ printk(KERN_CONT ": inode %u",
le32_to_cpu(es->s_first_error_ino));
if (es->s_first_error_block)
- printk(": block %llu", (unsigned long long)
+ printk(KERN_CONT ": block %llu", (unsigned long long)
le64_to_cpu(es->s_first_error_block));
- printk("\n");
+ printk(KERN_CONT "\n");
}
if (es->s_last_error_time) {
printk(KERN_NOTICE "EXT4-fs (%s): last error at time %u: %.*s:%d",
@@ -2729,12 +2730,12 @@ static void print_daily_error_info(unsigned long arg)
es->s_last_error_func,
le32_to_cpu(es->s_last_error_line));
if (es->s_last_error_ino)
- printk(": inode %u",
+ printk(KERN_CONT ": inode %u",
le32_to_cpu(es->s_last_error_ino));
if (es->s_last_error_block)
- printk(": block %llu", (unsigned long long)
+ printk(KERN_CONT ": block %llu", (unsigned long long)
le64_to_cpu(es->s_last_error_block));
- printk("\n");
+ printk(KERN_CONT "\n");
}
mod_timer(&sbi->s_err_report, jiffies + 24*60*60*HZ); /* Once a day */
}
--
2.10.0.rc2.1.g053435c
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] ext4: super.c: Update logging style using PR_CONT
2016-10-12 1:57 [PATCH] ext4: super.c: Update logging style using PR_CONT Joe Perches
@ 2016-10-12 10:41 ` Jan Kara
2016-10-12 14:32 ` Joe Perches
0 siblings, 1 reply; 5+ messages in thread
From: Jan Kara @ 2016-10-12 10:41 UTC (permalink / raw)
To: Joe Perches; +Cc: Theodore Ts'o, Andreas Dilger, linux-ext4, linux-kernel
On Tue 11-10-16 18:57:58, Joe Perches wrote:
> Recent commit require line continuing printks to use PR_CONT.
>
> Update super.c to use PR_CONT and use vsprintf extension %pV
> to avoid a printk/vprintk/printk("\n") sequence as well.
Looks good. You can add:
Reviewed-by: Jan Kara <jack@suse.cz>
Honza
>
> Signed-off-by: Joe Perches <joe@perches.com>
> ---
> fs/ext4/super.c | 21 +++++++++++----------
> 1 file changed, 11 insertions(+), 10 deletions(-)
>
> diff --git a/fs/ext4/super.c b/fs/ext4/super.c
> index 6db81fbcbaa6..20da99da0a34 100644
> --- a/fs/ext4/super.c
> +++ b/fs/ext4/super.c
> @@ -597,14 +597,15 @@ void __ext4_std_error(struct super_block *sb, const char *function,
> void __ext4_abort(struct super_block *sb, const char *function,
> unsigned int line, const char *fmt, ...)
> {
> + struct va_format vaf;
> va_list args;
>
> save_error_info(sb, function, line);
> va_start(args, fmt);
> - printk(KERN_CRIT "EXT4-fs error (device %s): %s:%d: ", sb->s_id,
> - function, line);
> - vprintk(fmt, args);
> - printk("\n");
> + vaf.fmt = fmt;
> + vaf.va = &args;
> + printk(KERN_CRIT "EXT4-fs error (device %s): %s:%d: %pV\n",
> + sb->s_id, function, line, &vaf);
> va_end(args);
>
> if ((sb->s_flags & MS_RDONLY) == 0) {
> @@ -2715,12 +2716,12 @@ static void print_daily_error_info(unsigned long arg)
> es->s_first_error_func,
> le32_to_cpu(es->s_first_error_line));
> if (es->s_first_error_ino)
> - printk(": inode %u",
> + printk(KERN_CONT ": inode %u",
> le32_to_cpu(es->s_first_error_ino));
> if (es->s_first_error_block)
> - printk(": block %llu", (unsigned long long)
> + printk(KERN_CONT ": block %llu", (unsigned long long)
> le64_to_cpu(es->s_first_error_block));
> - printk("\n");
> + printk(KERN_CONT "\n");
> }
> if (es->s_last_error_time) {
> printk(KERN_NOTICE "EXT4-fs (%s): last error at time %u: %.*s:%d",
> @@ -2729,12 +2730,12 @@ static void print_daily_error_info(unsigned long arg)
> es->s_last_error_func,
> le32_to_cpu(es->s_last_error_line));
> if (es->s_last_error_ino)
> - printk(": inode %u",
> + printk(KERN_CONT ": inode %u",
> le32_to_cpu(es->s_last_error_ino));
> if (es->s_last_error_block)
> - printk(": block %llu", (unsigned long long)
> + printk(KERN_CONT ": block %llu", (unsigned long long)
> le64_to_cpu(es->s_last_error_block));
> - printk("\n");
> + printk(KERN_CONT "\n");
> }
> mod_timer(&sbi->s_err_report, jiffies + 24*60*60*HZ); /* Once a day */
> }
> --
> 2.10.0.rc2.1.g053435c
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] ext4: super.c: Update logging style using PR_CONT
2016-10-12 10:41 ` Jan Kara
@ 2016-10-12 14:32 ` Joe Perches
2016-10-12 22:13 ` Theodore Ts'o
0 siblings, 1 reply; 5+ messages in thread
From: Joe Perches @ 2016-10-12 14:32 UTC (permalink / raw)
To: Jan Kara; +Cc: Theodore Ts'o, Andreas Dilger, linux-ext4, linux-kernel
On Wed, 2016-10-12 at 12:41 +0200, Jan Kara wrote:
> On Tue 11-10-16 18:57:58, Joe Perches wrote:
> > Recent commit require line continuing printks to use PR_CONT.
> >
> > Update super.c to use PR_CONT and use vsprintf extension %pV
> > to avoid a printk/vprintk/printk("\n") sequence as well.
>
>
> Looks good. You can add:
>
> Reviewed-by: Jan Kara <jack@suse.cz>
Except the subject and commit bodyis broken and should use KERN_CONT not PR_CONT
Ted, can you please fix when applying or do you want a resubmit?
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] ext4: super.c: Update logging style using PR_CONT
2016-10-12 14:32 ` Joe Perches
@ 2016-10-12 22:13 ` Theodore Ts'o
2016-10-13 3:14 ` Theodore Ts'o
0 siblings, 1 reply; 5+ messages in thread
From: Theodore Ts'o @ 2016-10-12 22:13 UTC (permalink / raw)
To: Joe Perches; +Cc: Jan Kara, Andreas Dilger, linux-ext4, linux-kernel
On Wed, Oct 12, 2016 at 07:32:10AM -0700, Joe Perches wrote:
> On Wed, 2016-10-12 at 12:41 +0200, Jan Kara wrote:
> > On Tue 11-10-16 18:57:58, Joe Perches wrote:
> > > Recent commit require line continuing printks to use PR_CONT.
> > >
> > > Update super.c to use PR_CONT and use vsprintf extension %pV
> > > to avoid a printk/vprintk/printk("\n") sequence as well.
> >
> >
> > Looks good. You can add:
> >
> > Reviewed-by: Jan Kara <jack@suse.cz>
>
> Except the subject and commit bodyis broken and should use KERN_CONT not PR_CONT
>
> Ted, can you please fix when applying or do you want a resubmit?
I'll fix it up, no worries!.
- Ted
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-10-13 3:16 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-12 1:57 [PATCH] ext4: super.c: Update logging style using PR_CONT Joe Perches
2016-10-12 10:41 ` Jan Kara
2016-10-12 14:32 ` Joe Perches
2016-10-12 22:13 ` Theodore Ts'o
2016-10-13 3:14 ` Theodore Ts'o
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome