Commit 37fc67c9 authored by Linus Torvalds's avatar Linus Torvalds

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
parents d20dc4d5 3eff1268
...@@ -34,8 +34,10 @@ __xfs_printk( ...@@ -34,8 +34,10 @@ __xfs_printk(
const struct xfs_mount *mp, const struct xfs_mount *mp,
struct va_format *vaf) struct va_format *vaf)
{ {
if (mp && mp->m_fsname) if (mp && mp->m_fsname) {
printk("%sXFS (%s): %pV\n", level, mp->m_fsname, vaf); printk("%sXFS (%s): %pV\n", level, mp->m_fsname, vaf);
return;
}
printk("%sXFS: %pV\n", level, vaf); printk("%sXFS: %pV\n", level, vaf);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment