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

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

fs/xfs/linux-2.6/xfs_message.c

+3 −1
Original line number Diff line number Diff line
@@ -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);

}