Commit 3d170aa2 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: change 0x%p -> %p in print messages 



Since %p prepends "0x" to the outputted string, we can drop the prefix.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
parent c219b015

fs/xfs/libxfs/xfs_dir2_node.c

+1 −1
Original line number Diff line number Diff line
@@ -1919,7 +1919,7 @@ xfs_dir2_node_addname_int( 
					(unsigned long long)ifbno, lastfbno);

				if (fblk) {

					xfs_alert(mp,

				" fblk 0x%p blkno %llu index %d magic 0x%x",

				" fblk %p blkno %llu index %d magic 0x%x",

						fblk,

						(unsigned long long)fblk->blkno,

						fblk->index,

fs/xfs/xfs_fsops.c

+1 −1
Original line number Diff line number Diff line
@@ -878,7 +878,7 @@ xfs_do_force_shutdown( 


	if (!(flags & SHUTDOWN_FORCE_UMOUNT)) {

		xfs_notice(mp,

	"%s(0x%x) called from line %d of file %s.  Return address = 0x%p",

	"%s(0x%x) called from line %d of file %s.  Return address = %p",

			__func__, flags, lnnum, fname, __return_address);

	}

	/*

fs/xfs/xfs_inode.c

+5 −5
Original line number Diff line number Diff line
@@ -3529,7 +3529,7 @@ xfs_iflush_int( 
	if (XFS_TEST_ERROR(dip->di_magic != cpu_to_be16(XFS_DINODE_MAGIC),

			       mp, XFS_ERRTAG_IFLUSH_1)) {

		xfs_alert_tag(mp, XFS_PTAG_IFLUSH,

			"%s: Bad inode %Lu magic number 0x%x, ptr 0x%p",

			"%s: Bad inode %Lu magic number 0x%x, ptr %p",

			__func__, ip->i_ino, be16_to_cpu(dip->di_magic), dip);

		goto corrupt_out;

	}
@@ -3539,7 +3539,7 @@ xfs_iflush_int( 
		    (ip->i_d.di_format != XFS_DINODE_FMT_BTREE),

		    mp, XFS_ERRTAG_IFLUSH_3)) {

			xfs_alert_tag(mp, XFS_PTAG_IFLUSH,

				"%s: Bad regular inode %Lu, ptr 0x%p",

				"%s: Bad regular inode %Lu, ptr %p",

				__func__, ip->i_ino, ip);

			goto corrupt_out;

		}
@@ -3550,7 +3550,7 @@ xfs_iflush_int( 
		    (ip->i_d.di_format != XFS_DINODE_FMT_LOCAL),

		    mp, XFS_ERRTAG_IFLUSH_4)) {

			xfs_alert_tag(mp, XFS_PTAG_IFLUSH,

				"%s: Bad directory inode %Lu, ptr 0x%p",

				"%s: Bad directory inode %Lu, ptr %p",

				__func__, ip->i_ino, ip);

			goto corrupt_out;

		}
@@ -3559,7 +3559,7 @@ xfs_iflush_int( 
				ip->i_d.di_nblocks, mp, XFS_ERRTAG_IFLUSH_5)) {

		xfs_alert_tag(mp, XFS_PTAG_IFLUSH,

			"%s: detected corrupt incore inode %Lu, "

			"total extents = %d, nblocks = %Ld, ptr 0x%p",

			"total extents = %d, nblocks = %Ld, ptr %p",

			__func__, ip->i_ino,

			ip->i_d.di_nextents + ip->i_d.di_anextents,

			ip->i_d.di_nblocks, ip);
@@ -3568,7 +3568,7 @@ xfs_iflush_int( 
	if (XFS_TEST_ERROR(ip->i_d.di_forkoff > mp->m_sb.sb_inodesize,

				mp, XFS_ERRTAG_IFLUSH_6)) {

		xfs_alert_tag(mp, XFS_PTAG_IFLUSH,

			"%s: bad inode %Lu, forkoff 0x%x, ptr 0x%p",

			"%s: bad inode %Lu, forkoff 0x%x, ptr %p",

			__func__, ip->i_ino, ip->i_d.di_forkoff, ip);

		goto corrupt_out;

	}

fs/xfs/xfs_log.c

+2 −2
Original line number Diff line number Diff line
@@ -2244,7 +2244,7 @@ xlog_write_setup_ophdr( 
		break;

	default:

		xfs_warn(log->l_mp,

			"Bad XFS transaction clientid 0x%x in ticket 0x%p",

			"Bad XFS transaction clientid 0x%x in ticket %p",

			ophdr->oh_clientid, ticket);

		return NULL;

	}
@@ -3926,7 +3926,7 @@ xlog_verify_iclog( 
		}

		if (clientid != XFS_TRANSACTION && clientid != XFS_LOG)

			xfs_warn(log->l_mp,

				"%s: invalid clientid %d op 0x%p offset 0x%lx",

				"%s: invalid clientid %d op %p offset 0x%lx",

				__func__, clientid, ophead,

				(unsigned long)field_offset);

fs/xfs/xfs_log_recover.c

+12 −12
Original line number Diff line number Diff line
@@ -2218,7 +2218,7 @@ xlog_recover_do_inode_buffer( 
				next_unlinked_offset - reg_buf_offset;

		if (unlikely(*logged_nextp == 0)) {

			xfs_alert(mp,

		"Bad inode buffer log record (ptr = 0x%p, bp = 0x%p). "

		"Bad inode buffer log record (ptr = %p, bp = %p). "

		"Trying to replay bad (0) inode di_next_unlinked field.",

				item, bp);

			XFS_ERROR_REPORT("xlog_recover_do_inode_buf",
@@ -3049,7 +3049,7 @@ xlog_recover_inode_pass2( 
	 */

	if (unlikely(dip->di_magic != cpu_to_be16(XFS_DINODE_MAGIC))) {

		xfs_alert(mp,

	"%s: Bad inode magic number, dip = 0x%p, dino bp = 0x%p, ino = %Ld",

	"%s: Bad inode magic number, dip = %p, dino bp = %p, ino = %Ld",

			__func__, dip, bp, in_f->ilf_ino);

		XFS_ERROR_REPORT("xlog_recover_inode_pass2(1)",

				 XFS_ERRLEVEL_LOW, mp);
@@ -3059,7 +3059,7 @@ xlog_recover_inode_pass2( 
	ldip = item->ri_buf[1].i_addr;

	if (unlikely(ldip->di_magic != XFS_DINODE_MAGIC)) {

		xfs_alert(mp,

			"%s: Bad inode log record, rec ptr 0x%p, ino %Ld",

			"%s: Bad inode log record, rec ptr %p, ino %Ld",

			__func__, item, in_f->ilf_ino);

		XFS_ERROR_REPORT("xlog_recover_inode_pass2(2)",

				 XFS_ERRLEVEL_LOW, mp);
@@ -3117,8 +3117,8 @@ xlog_recover_inode_pass2( 
			XFS_CORRUPTION_ERROR("xlog_recover_inode_pass2(3)",

					 XFS_ERRLEVEL_LOW, mp, ldip);

			xfs_alert(mp,

		"%s: Bad regular inode log record, rec ptr 0x%p, "

		"ino ptr = 0x%p, ino bp = 0x%p, ino %Ld",

		"%s: Bad regular inode log record, rec ptr %p, "

		"ino ptr = %p, ino bp = %p, ino %Ld",

				__func__, item, dip, bp, in_f->ilf_ino);

			error = -EFSCORRUPTED;

			goto out_release;
@@ -3130,8 +3130,8 @@ xlog_recover_inode_pass2( 
			XFS_CORRUPTION_ERROR("xlog_recover_inode_pass2(4)",

					     XFS_ERRLEVEL_LOW, mp, ldip);

			xfs_alert(mp,

		"%s: Bad dir inode log record, rec ptr 0x%p, "

		"ino ptr = 0x%p, ino bp = 0x%p, ino %Ld",

		"%s: Bad dir inode log record, rec ptr %p, "

		"ino ptr = %p, ino bp = %p, ino %Ld",

				__func__, item, dip, bp, in_f->ilf_ino);

			error = -EFSCORRUPTED;

			goto out_release;
@@ -3141,8 +3141,8 @@ xlog_recover_inode_pass2( 
		XFS_CORRUPTION_ERROR("xlog_recover_inode_pass2(5)",

				     XFS_ERRLEVEL_LOW, mp, ldip);

		xfs_alert(mp,

	"%s: Bad inode log record, rec ptr 0x%p, dino ptr 0x%p, "

	"dino bp 0x%p, ino %Ld, total extents = %d, nblocks = %Ld",

	"%s: Bad inode log record, rec ptr %p, dino ptr %p, "

	"dino bp %p, ino %Ld, total extents = %d, nblocks = %Ld",

			__func__, item, dip, bp, in_f->ilf_ino,

			ldip->di_nextents + ldip->di_anextents,

			ldip->di_nblocks);
@@ -3153,8 +3153,8 @@ xlog_recover_inode_pass2( 
		XFS_CORRUPTION_ERROR("xlog_recover_inode_pass2(6)",

				     XFS_ERRLEVEL_LOW, mp, ldip);

		xfs_alert(mp,

	"%s: Bad inode log record, rec ptr 0x%p, dino ptr 0x%p, "

	"dino bp 0x%p, ino %Ld, forkoff 0x%x", __func__,

	"%s: Bad inode log record, rec ptr %p, dino ptr %p, "

	"dino bp %p, ino %Ld, forkoff 0x%x", __func__,

			item, dip, bp, in_f->ilf_ino, ldip->di_forkoff);

		error = -EFSCORRUPTED;

		goto out_release;
@@ -3164,7 +3164,7 @@ xlog_recover_inode_pass2( 
		XFS_CORRUPTION_ERROR("xlog_recover_inode_pass2(7)",

				     XFS_ERRLEVEL_LOW, mp, ldip);

		xfs_alert(mp,

			"%s: Bad inode log record length %d, rec ptr 0x%p",

			"%s: Bad inode log record length %d, rec ptr %p",

			__func__, item->ri_buf[1].i_len, item);

		error = -EFSCORRUPTED;

		goto out_release;