diff options
| author | Dave Chinner <dchinner@redhat.com> | 2011-04-12 13:34:20 +0000 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2011-04-20 11:36:49 -0500 |
| commit | 3eff1268994f72266b660782e87f215720c29639 (patch) | |
| tree | 8299f6a1e6c5eefcc8597f232146e11b06aad922 /fs/xfs | |
| parent | f0e615c3cb72b42191b558c130409335812621d8 (diff) | |
| download | op-kernel-dev-3eff1268994f72266b660782e87f215720c29639.zip op-kernel-dev-3eff1268994f72266b660782e87f215720c29639.tar.gz | |
xfs: fix duplicate message output
Commit 957935dc ("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>
Diffstat (limited to 'fs/xfs')
| -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 3ca7956..9f76cce 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); } |
