diff options
author | Eric Sandeen <sandeen@sandeen.net> | 2013-10-11 21:59:05 -0400 |
---|---|---|
committer | Ben Myers <bpm@sgi.com> | 2013-10-17 14:30:29 -0400 |
commit | 08e96e1a3c5fd823f846df813b0b8be8e734c6c2 (patch) | |
tree | e775cee59304c8fa614c6a1a966b80c8fe9f3125 /fs/xfs/xfs_buf.c | |
parent | 2c6e24ce1aa6b3b147c75d488c2797ee258eb22b (diff) |
xfs: remove newlines from strings passed to __xfs_printk
__xfs_printk adds its own "\n". Having it in the original string
leads to unintentional blank lines from these messages.
Most format strings have no newline, but a few do, leading to
i.e.:
[ 7347.119911] XFS (sdb2): Access to block zero in inode 132 start_block: 0 start_off: 0 blkcnt: 0 extent-state: 0 lastx: 1a05
[ 7347.119911]
[ 7347.119919] XFS (sdb2): Access to block zero in inode 132 start_block: 0 start_off: 0 blkcnt: 0 extent-state: 0 lastx: 1a05
[ 7347.119919]
Fix them all.
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Mark Tinguely <tinguely@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_buf.c')
-rw-r--r-- | fs/xfs/xfs_buf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c index 263470075ea2..75e4ea7b109a 100644 --- a/fs/xfs/xfs_buf.c +++ b/fs/xfs/xfs_buf.c | |||
@@ -590,7 +590,7 @@ found: | |||
590 | error = _xfs_buf_map_pages(bp, flags); | 590 | error = _xfs_buf_map_pages(bp, flags); |
591 | if (unlikely(error)) { | 591 | if (unlikely(error)) { |
592 | xfs_warn(target->bt_mount, | 592 | xfs_warn(target->bt_mount, |
593 | "%s: failed to map pages\n", __func__); | 593 | "%s: failed to map pagesn", __func__); |
594 | xfs_buf_relse(bp); | 594 | xfs_buf_relse(bp); |
595 | return NULL; | 595 | return NULL; |
596 | } | 596 | } |
@@ -809,7 +809,7 @@ xfs_buf_get_uncached( | |||
809 | error = _xfs_buf_map_pages(bp, 0); | 809 | error = _xfs_buf_map_pages(bp, 0); |
810 | if (unlikely(error)) { | 810 | if (unlikely(error)) { |
811 | xfs_warn(target->bt_mount, | 811 | xfs_warn(target->bt_mount, |
812 | "%s: failed to map pages\n", __func__); | 812 | "%s: failed to map pages", __func__); |
813 | goto fail_free_mem; | 813 | goto fail_free_mem; |
814 | } | 814 | } |
815 | 815 | ||
@@ -1618,7 +1618,7 @@ xfs_setsize_buftarg_flags( | |||
1618 | bdevname(btp->bt_bdev, name); | 1618 | bdevname(btp->bt_bdev, name); |
1619 | 1619 | ||
1620 | xfs_warn(btp->bt_mount, | 1620 | xfs_warn(btp->bt_mount, |
1621 | "Cannot set_blocksize to %u on device %s\n", | 1621 | "Cannot set_blocksize to %u on device %s", |
1622 | sectorsize, name); | 1622 | sectorsize, name); |
1623 | return EINVAL; | 1623 | return EINVAL; |
1624 | } | 1624 | } |