Re: [PATCH 5/6] udf: Neaten logging output, use vsprintf extension%pV

[Jan Kara]

On Mon 10-10-11 01:08:06, Joe Perches wrote:
> Remove the warning and error prefixes that duplicate KERN_<level>.
  Please keep that in the prefix. It's easier to read messages when they
are that way ...

> Use %pV and remove a static buffer to save some text space.
  This is actually a bugfix because we could corrupt error message when
several error messages would be reported in parallel... Thanks for finding
this.

								Honza  
> 
> Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
> ---
>  fs/udf/super.c |   28 +++++++++++++++++-----------
>  1 files changed, 17 insertions(+), 11 deletions(-)
> 
> diff --git a/fs/udf/super.c b/fs/udf/super.c
> index ea1b44b..b72c5ab 100644
> --- a/fs/udf/super.c
> +++ b/fs/udf/super.c
> @@ -75,8 +75,6 @@
>  
>  #define UDF_DEFAULT_BLOCKSIZE 2048
>  
> -static char error_buf[1024];
> -
>  /* These are the "meat" - everything else is stuffing */
>  static int udf_fill_super(struct super_block *, void *, int);
>  static void udf_put_super(struct super_block *);
> @@ -2075,29 +2073,37 @@ error_out:
>  void _udf_err(struct super_block *sb, const char *function,
>  	      const char *fmt, ...)
>  {
> +	struct va_format vaf;
>  	va_list args;
>  
> -	if (!(sb->s_flags & MS_RDONLY)) {
> -		/* mark sb error */
> +	/* mark sb error */
> +	if (!(sb->s_flags & MS_RDONLY))
>  		sb->s_dirt = 1;
> -	}
> +
>  	va_start(args, fmt);
> -	vsnprintf(error_buf, sizeof(error_buf), fmt, args);
> +
> +	vaf.fmt = fmt;
> +	vaf.va = &args;
> +
> +	pr_crit("device %s: %s: %pV", sb->s_id, function, &vaf);
> +
>  	va_end(args);
> -	pr_crit("error (device %s): %s: %s",
> -	       sb->s_id, function, error_buf);
>  }
>  
>  void _udf_warn(struct super_block *sb, const char *function,
>  	       const char *fmt, ...)
>  {
> +	struct va_format vaf;
>  	va_list args;
>  
>  	va_start(args, fmt);
> -	vsnprintf(error_buf, sizeof(error_buf), fmt, args);
> +
> +	vaf.fmt = fmt;
> +	vaf.va = &args;
> +
> +	pr_warn("device %s: %s: %pV", sb->s_id, function, &vaf);
> +
>  	va_end(args);
> -	pr_warn("warning (device %s): %s: %s",
> -	       sb->s_id, function, error_buf);
>  }
>  
>  static void udf_put_super(struct super_block *sb)
-- 
Jan Kara <jack@xxxxxxx>
SUSE Labs, CR
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/