From: Darrick J. Wong <darrick.wong@oracle.com>
Date: Tue, 27 Feb 2018 04:43:18 +0000 (-0600)
Subject: xfs: change 0x%p -> %p in print messages
X-Git-Tag: v4.16.0-rc1~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef4109d1b66633808ed945c13e6478a5eb09952f;p=thirdparty%2Fxfsprogs-dev.git

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

Source kernel commit: 3d170aa24283568b1ed92a09daa0e05a8788c6a4

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

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---

diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
index 14afece46..7b75648c2 100644
--- a/libxfs/rdwr.c
+++ b/libxfs/rdwr.c
@@ -559,7 +559,7 @@ libxfs_bcompare(struct cache_node *node, cache_key_t key)
 void
 libxfs_bprint(xfs_buf_t *bp)
 {
-	fprintf(stderr, "Buffer 0x%p blkno=%llu bytes=%u flags=0x%x count=%u\n",
+	fprintf(stderr, "Buffer %p blkno=%llu bytes=%u flags=0x%x count=%u\n",
 		bp, (unsigned long long)bp->b_bn, (unsigned)bp->b_bcount,
 		bp->b_flags, bp->b_node.cn_count);
 }
diff --git a/libxfs/xfs_dir2_node.c b/libxfs/xfs_dir2_node.c
index 530983b74..ab9c4afbf 100644
--- a/libxfs/xfs_dir2_node.c
+++ b/libxfs/xfs_dir2_node.c
@@ -1916,7 +1916,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,
diff --git a/repair/phase5.c b/repair/phase5.c
index 21dce67a6..bb21ea746 100644
--- a/repair/phase5.c
+++ b/repair/phase5.c
@@ -1984,7 +1984,7 @@ build_agf_agfl(
 	memset(agf, 0, mp->m_sb.sb_sectsize);
 
 #ifdef XR_BLD_FREE_TRACE
-	fprintf(stderr, "agf = 0x%p, agf_buf->b_addr = 0x%p\n",
+	fprintf(stderr, "agf = %p, agf_buf->b_addr = %p\n",
 		agf, agf_buf->b_addr);
 #endif