diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-21 10:01:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-21 10:01:26 -0700 |
| commit | 37fc67c9f0454f7a6448d87225cfee8067fd731d (patch) | |
| tree | 7b4aa71ece6fe0d6d9a229164405fd74fdbbd9e3 | |
| parent | d20dc4d5231592b25a0d77c45ebb7c05204dfb3a (diff) | |
| parent | 3eff1268994f72266b660782e87f215720c29639 (diff) | |
| download | linux-3.10-37fc67c9f0454f7a6448d87225cfee8067fd731d.tar.gz linux-3.10-37fc67c9f0454f7a6448d87225cfee8067fd731d.tar.bz2 linux-3.10-37fc67c9f0454f7a6448d87225cfee8067fd731d.zip | |
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
| -rw-r--r-- | 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 3ca79560911..9f76cceb678 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); } |