xfs
[Top] [All Lists]

Re: [PATCH] xfs: Remove duplicate XFS from xfs_alert_tag, neatening

To: Joe Perches <joe@xxxxxxxxxxx>
Subject: Re: [PATCH] xfs: Remove duplicate XFS from xfs_alert_tag, neatening
From: Alex Elder <aelder@xxxxxxx>
Date: Tue, 26 Apr 2011 15:46:45 -0500
Cc: <xfs@xxxxxxxxxxx>
In-reply-to: <59d707d5d1bc37ef3a08fdd23c8e1fe72fa55fbb.1303419931.git.joe@xxxxxxxxxxx>
References: <59d707d5d1bc37ef3a08fdd23c8e1fe72fa55fbb.1303419931.git.joe@xxxxxxxxxxx>
Reply-to: <aelder@xxxxxxx>
On Thu, 2011-04-21 at 14:08 -0700, Joe Perches wrote:
> The xfs_printk in xfs_alert_tag doesn't need an XFS: prefix
> as it's added by xfs_printk.
> 
> Add format checking to the non-debug inline function xfs_debug.
> Miscellaneous function prototype argument alignment.
> 
> Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>

This seems like three very minor changes, but I actually
have something to say about each...

> ---
>  fs/xfs/linux-2.6/xfs_message.c |    3 +--
>  fs/xfs/linux-2.6/xfs_message.h |    5 +++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/fs/xfs/linux-2.6/xfs_message.c b/fs/xfs/linux-2.6/xfs_message.c
> index 9f76cce..e894ab2 100644
> --- a/fs/xfs/linux-2.6/xfs_message.c
> +++ b/fs/xfs/linux-2.6/xfs_message.c
> @@ -95,8 +95,7 @@ xfs_alert_tag(
>       int                     do_panic = 0;
>  
>       if (xfs_panic_mask && (xfs_panic_mask & panic_tag)) {
> -             xfs_printk(KERN_ALERT, mp,
> -                     "XFS: Transforming an alert into a BUG.");
> +             xfs_alert(mp, "Transforming an alert into a BUG.");
>               do_panic = 1;
>       }
>  

I'll highlight the fact that this was the last caller of
xfs_printk().  As such I think it should just be eliminated,
and make the use of xfs_info() or xfs_debug() mandatory.
They are clean, easy, and have meaningful enough names
that this should be fine.  (What do others think?)

> diff --git a/fs/xfs/linux-2.6/xfs_message.h b/fs/xfs/linux-2.6/xfs_message.h
> index f1b3fc1..c11f415 100644
> --- a/fs/xfs/linux-2.6/xfs_message.h
> +++ b/fs/xfs/linux-2.6/xfs_message.h
> @@ -11,7 +11,7 @@ extern void xfs_emerg(const struct xfs_mount *mp, const 
> char *fmt, ...)
>  extern void xfs_alert(const struct xfs_mount *mp, const char *fmt, ...)
>          __attribute__ ((format (printf, 2, 3)));
>  extern void xfs_alert_tag(const struct xfs_mount *mp, int tag,
> -                      const char *fmt, ...)
> +                       const char *fmt, ...)

This is a silly white space change, and I guess I don't care
either way.  But I think much of the XFS code tab-aligns
things that wrap to successive lines.

>          __attribute__ ((format (printf, 3, 4)));
>  extern void xfs_crit(const struct xfs_mount *mp, const char *fmt, ...)
>          __attribute__ ((format (printf, 2, 3)));
> @@ -28,7 +28,8 @@ extern void xfs_info(const struct xfs_mount *mp, const char 
> *fmt, ...)
>  extern void xfs_debug(const struct xfs_mount *mp, const char *fmt, ...)
>          __attribute__ ((format (printf, 2, 3)));
>  #else
> -static inline void xfs_debug(const struct xfs_mount *mp, const char *fmt, 
> ...)
> +static inline __attribute__ ((format (printf, 2, 3)))
> +void xfs_debug(const struct xfs_mount *mp, const char *fmt, ...)
>  {
>  }
>  #endif

How about:

static inline void
__attribute__ ((format (printf, 2, 3)))
xfs_debug(const struct xfs_mount *mp, const char *fmt, ...)
{
}




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