xfs
[Top] [All Lists]

Re: [PATCH] xfs: remove newlines from 3 xfs_alert_tag error strings

To: Eric Sandeen <sandeen@xxxxxxxxxx>
Subject: Re: [PATCH] xfs: remove newlines from 3 xfs_alert_tag error strings
From: Carlos Maiolino <cmaiolino@xxxxxxxxxx>
Date: Wed, 27 Mar 2013 14:43:56 -0300
Cc: xfs-oss <xfs@xxxxxxxxxxx>
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <5151ECCD.2080704@xxxxxxxxxx>
References: <5151ECCD.2080704@xxxxxxxxxx>
User-agent: Mutt/1.5.21 (2010-09-15)
Looks good,

Reviewed-by: Carlos Maiolino <cmaiolino@xxxxxxxxxx>

On Tue, Mar 26, 2013 at 01:45:33PM -0500, Eric Sandeen wrote:
> xfs_alert_tag passes the format string to __xfs_printk,
> which adds its own "\n".  Having it in the original string
> leads to unintentional blank lines from these messages.
> 
> Most format strings have no newline, but these 3 do, leading to
> i.e.:
> 
> [ 7347.119911] XFS (sdb2): Access to block zero in inode 132 start_block: 0 
> start_off: 0 blkcnt: 0 extent-state: 0 lastx: 1a05
> [ 7347.119911] 
> [ 7347.119919] XFS (sdb2): Access to block zero in inode 132 start_block: 0 
> start_off: 0 blkcnt: 0 extent-state: 0 lastx: 1a05
> [ 7347.119919] 
> 
> Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx>
> ---
> 
> p.s. - next up, why am I getting those messages . . . ?
> 
> 
> diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c
> index b44af92..53db41f 100644
> --- a/fs/xfs/xfs_bmap.c
> +++ b/fs/xfs/xfs_bmap.c
> @@ -3425,7 +3425,7 @@ xfs_bmap_search_extents(
>               xfs_alert_tag(ip->i_mount, XFS_PTAG_FSBLOCK_ZERO,
>                               "Access to block zero in inode %llu "
>                               "start_block: %llx start_off: %llx "
> -                             "blkcnt: %llx extent-state: %x lastx: %x\n",
> +                             "blkcnt: %llx extent-state: %x lastx: %x",
>                       (unsigned long long)ip->i_ino,
>                       (unsigned long long)gotp->br_startblock,
>                       (unsigned long long)gotp->br_startoff,
> diff --git a/fs/xfs/xfs_error.c b/fs/xfs/xfs_error.c
> index 6104560..ac5faf5 100644
> --- a/fs/xfs/xfs_error.c
> +++ b/fs/xfs/xfs_error.c
> @@ -160,7 +160,7 @@ xfs_error_report(
>  {
>       if (level <= xfs_error_level) {
>               xfs_alert_tag(mp, XFS_PTAG_ERROR_REPORT,
> -             "Internal error %s at line %d of file %s.  Caller 0x%p\n",
> +             "Internal error %s at line %d of file %s.  Caller 0x%p",
>                           tag, linenum, filename, ra);
>  
>               xfs_stack_trace();
> diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
> index 5a30dd8..65412c2 100644
> --- a/fs/xfs/xfs_iomap.c
> +++ b/fs/xfs/xfs_iomap.c
> @@ -107,7 +107,7 @@ xfs_alert_fsblock_zero(
>       xfs_alert_tag(ip->i_mount, XFS_PTAG_FSBLOCK_ZERO,
>                       "Access to block zero in inode %llu "
>                       "start_block: %llx start_off: %llx "
> -                     "blkcnt: %llx extent-state: %x\n",
> +                     "blkcnt: %llx extent-state: %x",
>               (unsigned long long)ip->i_ino,
>               (unsigned long long)imap->br_startblock,
>               (unsigned long long)imap->br_startoff,
> 
> _______________________________________________
> xfs mailing list
> xfs@xxxxxxxxxxx
> http://oss.sgi.com/mailman/listinfo/xfs

-- 
Carlos

<Prev in Thread] Current Thread [Next in Thread>