Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: fix duplicate message output
This commit is contained in:
Linus Torvalds 2011-04-21 10:01:26 -07:00
commit 37fc67c9f0

View File

@ -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);
}