Skip to content

Commit

Permalink
xfs: fix duplicate message output
Browse files Browse the repository at this point in the history
Commit 957935d ("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>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Alex Elder <aelder@sgi.com>
  • Loading branch information
Dave Chinner authored and Alex Elder committed Apr 20, 2011
1 parent f0e615c commit 3eff126
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion fs/xfs/linux-2.6/xfs_message.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down

0 comments on commit 3eff126

Please sign in to comment.