Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08e96e1a authored by Eric Sandeen's avatar Eric Sandeen Committed by Ben Myers
Browse files

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: default avatarEric Sandeen <sandeen@redhat.com>
Reviewed-by: default avatarMark Tinguely <tinguely@sgi.com>
Signed-off-by: default avatarBen Myers <bpm@sgi.com>
parent 2c6e24ce

fs/xfs/xfs_bmap.c

+1 −1
Original line number Diff line number Diff line
@@ -1482,7 +1482,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,

fs/xfs/xfs_buf.c

+3 −3
Original line number Diff line number Diff line
@@ -590,7 +590,7 @@ xfs_buf_get_map( 
		error = _xfs_buf_map_pages(bp, flags);

		if (unlikely(error)) {

			xfs_warn(target->bt_mount,

				"%s: failed to map pages\n", __func__);

				"%s: failed to map pagesn", __func__);

			xfs_buf_relse(bp);

			return NULL;

		}
@@ -809,7 +809,7 @@ xfs_buf_get_uncached( 
	error = _xfs_buf_map_pages(bp, 0);

	if (unlikely(error)) {

		xfs_warn(target->bt_mount,

			"%s: failed to map pages\n", __func__);

			"%s: failed to map pages", __func__);

		goto fail_free_mem;

	}
@@ -1618,7 +1618,7 @@ xfs_setsize_buftarg_flags( 
		bdevname(btp->bt_bdev, name);



		xfs_warn(btp->bt_mount,

			"Cannot set_blocksize to %u on device %s\n",

			"Cannot set_blocksize to %u on device %s",

			sectorsize, name);

		return EINVAL;

	}

fs/xfs/xfs_dir2_node.c

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

	}

}

fs/xfs/xfs_error.c

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ xfs_error_report( 
{

	if (level <= xfs_error_level) {

		xfs_alert_tag(mp, XFS_PTAG_ERROR_REPORT,

		"Internal error %s at line %d of file %s.  Caller 0x%p\n",

		"Internal error %s at line %d of file %s.  Caller 0x%p",

			    tag, linenum, filename, ra);



		xfs_stack_trace();

fs/xfs/xfs_iomap.c

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ xfs_alert_fsblock_zero( 
	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\n",

			"blkcnt: %llx extent-state: %x",

		(unsigned long long)ip->i_ino,

		(unsigned long long)imap->br_startblock,

		(unsigned long long)imap->br_startoff,