Commit 99fbb1e2 authored by Joe Perches's avatar Joe Perches Committed by Jan Kara
Browse files

fs/ext3/super.c: Use printf extension %pV 



Using %pV reduces the number of printk calls and
eliminates any possible message interleaving from
other printk calls.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 23a2ad6d

fs/ext3/super.c

+37 −19
Original line number Diff line number Diff line
@@ -143,12 +143,16 @@ void ext3_journal_abort_handle(const char *caller, const char *err_fn, 
void ext3_msg(struct super_block *sb, const char *prefix,

		const char *fmt, ...)

{

	struct va_format vaf;

	va_list args;



	va_start(args, fmt);

	printk("%sEXT3-fs (%s): ", prefix, sb->s_id);

	vprintk(fmt, args);

	printk("\n");



	vaf.fmt = fmt;

	vaf.va = &args;



	printk("%sEXT3-fs (%s): %pV\n", prefix, sb->s_id, &vaf);



	va_end(args);

}
@@ -198,12 +202,17 @@ static void ext3_handle_error(struct super_block *sb) 
void ext3_error(struct super_block *sb, const char *function,

		const char *fmt, ...)

{

	struct va_format vaf;

	va_list args;



	va_start(args, fmt);

	printk(KERN_CRIT "EXT3-fs error (device %s): %s: ",sb->s_id, function);

	vprintk(fmt, args);

	printk("\n");



	vaf.fmt = fmt;

	vaf.va = &args;



	printk(KERN_CRIT "EXT3-fs error (device %s): %s: %pV\n",

	       sb->s_id, function, &vaf);



	va_end(args);



	ext3_handle_error(sb);
@@ -277,12 +286,17 @@ void __ext3_std_error (struct super_block * sb, const char * function, 
void ext3_abort(struct super_block *sb, const char *function,

		 const char *fmt, ...)

{

	struct va_format vaf;

	va_list args;



	va_start(args, fmt);

	printk(KERN_CRIT "EXT3-fs (%s): error: %s: ", sb->s_id, function);

	vprintk(fmt, args);

	printk("\n");



	vaf.fmt = fmt;

	vaf.va = &args;



	printk(KERN_CRIT "EXT3-fs (%s): error: %s: %pV\n",

	       sb->s_id, function, &vaf);



	va_end(args);



	if (test_opt(sb, ERRORS_PANIC))
@@ -303,13 +317,17 @@ void ext3_abort (struct super_block * sb, const char * function, 
void ext3_warning(struct super_block *sb, const char *function,

		  const char *fmt, ...)

{

	struct va_format vaf;

	va_list args;



	va_start(args, fmt);

	printk(KERN_WARNING "EXT3-fs (%s): warning: %s: ",

	       sb->s_id, function);

	vprintk(fmt, args);

	printk("\n");



	vaf.fmt = fmt;

	vaf.va = &args;



	printk(KERN_WARNING "EXT3-fs (%s): warning: %s: %pV\n",

	       sb->s_id, function, &vaf);



	va_end(args);

}