From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay.sgi.com (relay1.corp.sgi.com [137.38.102.111]) by oss.sgi.com (Postfix) with ESMTP id E05EE7FAA for ; Wed, 13 Nov 2013 00:41:28 -0600 (CST) Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by relay1.corp.sgi.com (Postfix) with ESMTP id BB0858F8035 for ; Tue, 12 Nov 2013 22:41:28 -0800 (PST) Received: from ipmail04.adl6.internode.on.net (ipmail04.adl6.internode.on.net [150.101.137.141]) by cuda.sgi.com with ESMTP id fhDg84aEaRTTUEAm for ; Tue, 12 Nov 2013 22:41:27 -0800 (PST) Received: from disappointment.disaster.area ([192.168.1.110] helo=disappointment) by dastard with esmtp (Exim 4.76) (envelope-from ) id 1VgU8O-0005bX-2G for xfs@oss.sgi.com; Wed, 13 Nov 2013 17:41:04 +1100 Received: from dave by disappointment with local (Exim 4.80) (envelope-from ) id 1VgU8O-0006iD-1H for xfs@oss.sgi.com; Wed, 13 Nov 2013 17:41:04 +1100 From: Dave Chinner Subject: [PATCH 11/36] xfs: remove newlines from strings passed to __xfs_printk Date: Wed, 13 Nov 2013 17:40:35 +1100 Message-Id: <1384324860-25677-12-git-send-email-david@fromorbit.com> In-Reply-To: <1384324860-25677-1-git-send-email-david@fromorbit.com> References: <1384324860-25677-1-git-send-email-david@fromorbit.com> List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: xfs-bounces@oss.sgi.com Sender: xfs-bounces@oss.sgi.com To: xfs@oss.sgi.com From: Dave Chinner __xfs_printk adds its own "\n". Having it in the original string leads to unintentional blank lines from these messages. Ported from kernel commit 08e96e1a. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig --- libxfs/xfs_bmap.c | 2 +- libxfs/xfs_dir2_node.c | 2 +- libxfs/xfs_sb.c | 4 ++-- libxlog/xfs_log_recover.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c index 3e80c64..c45b91a 100644 --- a/libxfs/xfs_bmap.c +++ b/libxfs/xfs_bmap.c @@ -1447,7 +1447,7 @@ xfs_bmap_search_extents( xfs_alert_tag(ip->i_mount, XFS_PTAG_FSBLOCK_ZERO, "Access to block zero in inode %llu " "start_block: %llx start_off: %llx " - "blkcnt: %llx extent-state: %x lastx: %x\n", + "blkcnt: %llx extent-state: %x lastx: %x", (unsigned long long)ip->i_ino, (unsigned long long)gotp->br_startblock, (unsigned long long)gotp->br_startoff, diff --git a/libxfs/xfs_dir2_node.c b/libxfs/xfs_dir2_node.c index 10d1d81..ced8c58 100644 --- a/libxfs/xfs_dir2_node.c +++ b/libxfs/xfs_dir2_node.c @@ -1083,7 +1083,7 @@ xfs_dir2_leafn_rebalance( state->inleaf = 1; blk2->index = 0; xfs_alert(args->dp->i_mount, - "%s: picked the wrong leaf? reverting original leaf: blk1->index %d\n", + "%s: picked the wrong leaf? reverting original leaf: blk1->index %d", __func__, blk1->index); } } diff --git a/libxfs/xfs_sb.c b/libxfs/xfs_sb.c index 8b90b88..11353bb 100644 --- a/libxfs/xfs_sb.c +++ b/libxfs/xfs_sb.c @@ -215,13 +215,13 @@ xfs_mount_validate_sb( if (xfs_sb_version_has_pquotino(sbp)) { if (sbp->sb_qflags & (XFS_OQUOTA_ENFD | XFS_OQUOTA_CHKD)) { xfs_notice(mp, - "Version 5 of Super block has XFS_OQUOTA bits.\n"); + "Version 5 of Super block has XFS_OQUOTA bits."); return XFS_ERROR(EFSCORRUPTED); } } else if (sbp->sb_qflags & (XFS_PQUOTA_ENFD | XFS_GQUOTA_ENFD | XFS_PQUOTA_CHKD | XFS_GQUOTA_CHKD)) { xfs_notice(mp, -"Superblock earlier than Version 5 has XFS_[PQ]UOTA_{ENFD|CHKD} bits.\n"); +"Superblock earlier than Version 5 has XFS_[PQ]UOTA_{ENFD|CHKD} bits."); return XFS_ERROR(EFSCORRUPTED); } diff --git a/libxlog/xfs_log_recover.c b/libxlog/xfs_log_recover.c index f3cda77..3f22921 100644 --- a/libxlog/xfs_log_recover.c +++ b/libxlog/xfs_log_recover.c @@ -1330,7 +1330,7 @@ xlog_unpack_data_crc( if (crc != rhead->h_crc) { if (rhead->h_crc || xfs_sb_version_hascrc(&log->l_mp->m_sb)) { xfs_alert(log->l_mp, - "log record CRC mismatch: found 0x%x, expected 0x%x.\n", + "log record CRC mismatch: found 0x%x, expected 0x%x.", le32_to_cpu(rhead->h_crc), le32_to_cpu(crc)); xfs_hex_dump(dp, 32); -- 1.8.4.rc3 _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs