[PATCH] xfs: fix duplicate message output

[PATCH] xfs: fix duplicate message output

[Dave Chinner]

From: Dave Chinner <dchinner@redhat.com>

Commit 957935dc ("xfs: fix xfs_debug warnings" broke the logic in
__xfs_printk(). Instead of only printing one of two possible output
strings based on whether the fs has a name or not, it outputs both.
Fix it to only output one message again.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
 fs/xfs/linux-2.6/xfs_message.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/fs/xfs/linux-2.6/xfs_message.c b/fs/xfs/linux-2.6/xfs_message.c
index 3ca7956..9f76cce 100644
--- a/fs/xfs/linux-2.6/xfs_message.c
+++ b/fs/xfs/linux-2.6/xfs_message.c
@@ -34,8 +34,10 @@ __xfs_printk(
 	const struct xfs_mount	*mp,
 	struct va_format	*vaf)
 {
-	if (mp && mp->m_fsname)
+	if (mp && mp->m_fsname) {
 		printk("%sXFS (%s): %pV\n", level, mp->m_fsname, vaf);
+		return;
+	}
 	printk("%sXFS: %pV\n", level, vaf);
 }
 
-- 
1.7.2.3

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfs: fix duplicate message output

[Christoph Hellwig]

On Tue, Apr 12, 2011 at 11:34:20PM +1000, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
> 
> Commit 957935dc ("xfs: fix xfs_debug warnings" broke the logic in
> __xfs_printk(). Instead of only printing one of two possible output
> strings based on whether the fs has a name or not, it outputs both.
> Fix it to only output one message again.

My fault, sorry.

Reviewed-by: Christoph Hellwig <hch@lst.de>

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfs: fix duplicate message output

[Alex Elder]

On Tue, 2011-04-12 at 23:34 +1000, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
> 
> Commit 957935dc ("xfs: fix xfs_debug warnings" broke the logic in
> __xfs_printk(). Instead of only printing one of two possible output
> strings based on whether the fs has a name or not, it outputs both.
> Fix it to only output one message again.
> 
> Signed-off-by: Dave Chinner <dchinner@redhat.com>

Looks good.

Reviewed-by: Alex Elder <aelder@sgi.com>


_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfs: fix duplicate message output

[Christoph Hellwig]

On Tue, Apr 12, 2011 at 12:06:51PM -0400, Christoph Hellwig wrote:
> On Tue, Apr 12, 2011 at 11:34:20PM +1000, Dave Chinner wrote:
> > From: Dave Chinner <dchinner@redhat.com>
> > 
> > Commit 957935dc ("xfs: fix xfs_debug warnings" broke the logic in
> > __xfs_printk(). Instead of only printing one of two possible output
> > strings based on whether the fs has a name or not, it outputs both.
> > Fix it to only output one message again.
> 
> My fault, sorry.
> 
> Reviewed-by: Christoph Hellwig <hch@lst.de>

And since I recently upgraded my compiler this bug even causes 085
to oops the kernel for me, so pushing it ASAP would be good.

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs