Skip to content

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

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
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 28 deletions
fs/xfs/libxfs/xfs_dir2_node.c
View file @ 3d170aa2
...@@ -1919,7 +1919,7 @@ xfs_dir2_node_addname_int( ...@@ -1919,7 +1919,7 @@ xfs_dir2_node_addname_int(
(unsigned long long)ifbno, lastfbno); (unsigned long long)ifbno, lastfbno);
if (fblk) { if (fblk) {
xfs_alert(mp, xfs_alert(mp,
" fblk 0x%p blkno %llu index %d magic 0x%x", " fblk %p blkno %llu index %d magic 0x%x",
fblk, fblk,
(unsigned long long)fblk->blkno, (unsigned long long)fblk->blkno,
fblk->index, fblk->index,
......
fs/xfs/xfs_fsops.c
View file @ 3d170aa2
...@@ -878,7 +878,7 @@ xfs_do_force_shutdown( ...@@ -878,7 +878,7 @@ xfs_do_force_shutdown(
if (!(flags & SHUTDOWN_FORCE_UMOUNT)) { if (!(flags & SHUTDOWN_FORCE_UMOUNT)) {
xfs_notice(mp, 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); __func__, flags, lnnum, fname, __return_address);
} }
/* /*
......
fs/xfs/xfs_inode.c
View file @ 3d170aa2
...@@ -3529,7 +3529,7 @@ xfs_iflush_int( ...@@ -3529,7 +3529,7 @@ xfs_iflush_int(
if (XFS_TEST_ERROR(dip->di_magic != cpu_to_be16(XFS_DINODE_MAGIC), if (XFS_TEST_ERROR(dip->di_magic != cpu_to_be16(XFS_DINODE_MAGIC),
mp, XFS_ERRTAG_IFLUSH_1)) { mp, XFS_ERRTAG_IFLUSH_1)) {
xfs_alert_tag(mp, XFS_PTAG_IFLUSH, 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); __func__, ip->i_ino, be16_to_cpu(dip->di_magic), dip);
goto corrupt_out; goto corrupt_out;
} }
...@@ -3539,7 +3539,7 @@ xfs_iflush_int( ...@@ -3539,7 +3539,7 @@ xfs_iflush_int(
(ip->i_d.di_format != XFS_DINODE_FMT_BTREE), (ip->i_d.di_format != XFS_DINODE_FMT_BTREE),
mp, XFS_ERRTAG_IFLUSH_3)) { mp, XFS_ERRTAG_IFLUSH_3)) {
xfs_alert_tag(mp, XFS_PTAG_IFLUSH, 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); __func__, ip->i_ino, ip);
goto corrupt_out; goto corrupt_out;
} }
...@@ -3550,7 +3550,7 @@ xfs_iflush_int( ...@@ -3550,7 +3550,7 @@ xfs_iflush_int(
(ip->i_d.di_format != XFS_DINODE_FMT_LOCAL), (ip->i_d.di_format != XFS_DINODE_FMT_LOCAL),
mp, XFS_ERRTAG_IFLUSH_4)) { mp, XFS_ERRTAG_IFLUSH_4)) {
xfs_alert_tag(mp, XFS_PTAG_IFLUSH, 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); __func__, ip->i_ino, ip);
goto corrupt_out; goto corrupt_out;
} }
...@@ -3559,7 +3559,7 @@ xfs_iflush_int( ...@@ -3559,7 +3559,7 @@ xfs_iflush_int(
ip->i_d.di_nblocks, mp, XFS_ERRTAG_IFLUSH_5)) { ip->i_d.di_nblocks, mp, XFS_ERRTAG_IFLUSH_5)) {
xfs_alert_tag(mp, XFS_PTAG_IFLUSH, xfs_alert_tag(mp, XFS_PTAG_IFLUSH,
"%s: detected corrupt incore inode %Lu, " "%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, __func__, ip->i_ino,
ip->i_d.di_nextents + ip->i_d.di_anextents, ip->i_d.di_nextents + ip->i_d.di_anextents,
ip->i_d.di_nblocks, ip); ip->i_d.di_nblocks, ip);
...@@ -3568,7 +3568,7 @@ xfs_iflush_int( ...@@ -3568,7 +3568,7 @@ xfs_iflush_int(
if (XFS_TEST_ERROR(ip->i_d.di_forkoff > mp->m_sb.sb_inodesize, if (XFS_TEST_ERROR(ip->i_d.di_forkoff > mp->m_sb.sb_inodesize,
mp, XFS_ERRTAG_IFLUSH_6)) { mp, XFS_ERRTAG_IFLUSH_6)) {
xfs_alert_tag(mp, XFS_PTAG_IFLUSH, 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); __func__, ip->i_ino, ip->i_d.di_forkoff, ip);
goto corrupt_out; goto corrupt_out;
} }
......
fs/xfs/xfs_log.c
View file @ 3d170aa2
...@@ -2244,7 +2244,7 @@ xlog_write_setup_ophdr( ...@@ -2244,7 +2244,7 @@ xlog_write_setup_ophdr(
break; break;
default: default:
xfs_warn(log->l_mp, 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); ophdr->oh_clientid, ticket);
return NULL; return NULL;
} }
...@@ -3926,7 +3926,7 @@ xlog_verify_iclog( ...@@ -3926,7 +3926,7 @@ xlog_verify_iclog(
} }
if (clientid != XFS_TRANSACTION && clientid != XFS_LOG) if (clientid != XFS_TRANSACTION && clientid != XFS_LOG)
xfs_warn(log->l_mp, 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, __func__, clientid, ophead,
(unsigned long)field_offset); (unsigned long)field_offset);
......
fs/xfs/xfs_log_recover.c
View file @ 3d170aa2
...@@ -2218,7 +2218,7 @@ xlog_recover_do_inode_buffer( ...@@ -2218,7 +2218,7 @@ xlog_recover_do_inode_buffer(
next_unlinked_offset - reg_buf_offset; next_unlinked_offset - reg_buf_offset;
if (unlikely(*logged_nextp == 0)) { if (unlikely(*logged_nextp == 0)) {
xfs_alert(mp, 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.", "Trying to replay bad (0) inode di_next_unlinked field.",
item, bp); item, bp);
XFS_ERROR_REPORT("xlog_recover_do_inode_buf", XFS_ERROR_REPORT("xlog_recover_do_inode_buf",
...@@ -3049,7 +3049,7 @@ xlog_recover_inode_pass2( ...@@ -3049,7 +3049,7 @@ xlog_recover_inode_pass2(
*/ */
if (unlikely(dip->di_magic != cpu_to_be16(XFS_DINODE_MAGIC))) { if (unlikely(dip->di_magic != cpu_to_be16(XFS_DINODE_MAGIC))) {
xfs_alert(mp, 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); __func__, dip, bp, in_f->ilf_ino);
XFS_ERROR_REPORT("xlog_recover_inode_pass2(1)", XFS_ERROR_REPORT("xlog_recover_inode_pass2(1)",
XFS_ERRLEVEL_LOW, mp); XFS_ERRLEVEL_LOW, mp);
...@@ -3059,7 +3059,7 @@ xlog_recover_inode_pass2( ...@@ -3059,7 +3059,7 @@ xlog_recover_inode_pass2(
ldip = item->ri_buf[1].i_addr; ldip = item->ri_buf[1].i_addr;
if (unlikely(ldip->di_magic != XFS_DINODE_MAGIC)) { if (unlikely(ldip->di_magic != XFS_DINODE_MAGIC)) {
xfs_alert(mp, 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); __func__, item, in_f->ilf_ino);
XFS_ERROR_REPORT("xlog_recover_inode_pass2(2)", XFS_ERROR_REPORT("xlog_recover_inode_pass2(2)",
XFS_ERRLEVEL_LOW, mp); XFS_ERRLEVEL_LOW, mp);
...@@ -3117,8 +3117,8 @@ xlog_recover_inode_pass2( ...@@ -3117,8 +3117,8 @@ xlog_recover_inode_pass2(
XFS_CORRUPTION_ERROR("xlog_recover_inode_pass2(3)", XFS_CORRUPTION_ERROR("xlog_recover_inode_pass2(3)",
XFS_ERRLEVEL_LOW, mp, ldip); XFS_ERRLEVEL_LOW, mp, ldip);
xfs_alert(mp, xfs_alert(mp,
"%s: Bad regular inode log record, rec ptr 0x%p, " "%s: Bad regular inode log record, rec ptr %p, "
"ino ptr = 0x%p, ino bp = 0x%p, ino %Ld", "ino ptr = %p, ino bp = %p, ino %Ld",
__func__, item, dip, bp, in_f->ilf_ino); __func__, item, dip, bp, in_f->ilf_ino);
error = -EFSCORRUPTED; error = -EFSCORRUPTED;
goto out_release; goto out_release;
...@@ -3130,8 +3130,8 @@ xlog_recover_inode_pass2( ...@@ -3130,8 +3130,8 @@ xlog_recover_inode_pass2(
XFS_CORRUPTION_ERROR("xlog_recover_inode_pass2(4)", XFS_CORRUPTION_ERROR("xlog_recover_inode_pass2(4)",
XFS_ERRLEVEL_LOW, mp, ldip); XFS_ERRLEVEL_LOW, mp, ldip);
xfs_alert(mp, xfs_alert(mp,
"%s: Bad dir inode log record, rec ptr 0x%p, " "%s: Bad dir inode log record, rec ptr %p, "
"ino ptr = 0x%p, ino bp = 0x%p, ino %Ld", "ino ptr = %p, ino bp = %p, ino %Ld",
__func__, item, dip, bp, in_f->ilf_ino); __func__, item, dip, bp, in_f->ilf_ino);
error = -EFSCORRUPTED; error = -EFSCORRUPTED;
goto out_release; goto out_release;
...@@ -3141,8 +3141,8 @@ xlog_recover_inode_pass2( ...@@ -3141,8 +3141,8 @@ xlog_recover_inode_pass2(
XFS_CORRUPTION_ERROR("xlog_recover_inode_pass2(5)", XFS_CORRUPTION_ERROR("xlog_recover_inode_pass2(5)",
XFS_ERRLEVEL_LOW, mp, ldip); XFS_ERRLEVEL_LOW, mp, ldip);
xfs_alert(mp, xfs_alert(mp,
"%s: Bad inode log record, rec ptr 0x%p, dino ptr 0x%p, " "%s: Bad inode log record, rec ptr %p, dino ptr %p, "
"dino bp 0x%p, ino %Ld, total extents = %d, nblocks = %Ld", "dino bp %p, ino %Ld, total extents = %d, nblocks = %Ld",
__func__, item, dip, bp, in_f->ilf_ino, __func__, item, dip, bp, in_f->ilf_ino,
ldip->di_nextents + ldip->di_anextents, ldip->di_nextents + ldip->di_anextents,
ldip->di_nblocks); ldip->di_nblocks);
...@@ -3153,8 +3153,8 @@ xlog_recover_inode_pass2( ...@@ -3153,8 +3153,8 @@ xlog_recover_inode_pass2(
XFS_CORRUPTION_ERROR("xlog_recover_inode_pass2(6)", XFS_CORRUPTION_ERROR("xlog_recover_inode_pass2(6)",
XFS_ERRLEVEL_LOW, mp, ldip); XFS_ERRLEVEL_LOW, mp, ldip);
xfs_alert(mp, xfs_alert(mp,
"%s: Bad inode log record, rec ptr 0x%p, dino ptr 0x%p, " "%s: Bad inode log record, rec ptr %p, dino ptr %p, "
"dino bp 0x%p, ino %Ld, forkoff 0x%x", __func__, "dino bp %p, ino %Ld, forkoff 0x%x", __func__,
item, dip, bp, in_f->ilf_ino, ldip->di_forkoff); item, dip, bp, in_f->ilf_ino, ldip->di_forkoff);
error = -EFSCORRUPTED; error = -EFSCORRUPTED;
goto out_release; goto out_release;
...@@ -3164,7 +3164,7 @@ xlog_recover_inode_pass2( ...@@ -3164,7 +3164,7 @@ xlog_recover_inode_pass2(
XFS_CORRUPTION_ERROR("xlog_recover_inode_pass2(7)", XFS_CORRUPTION_ERROR("xlog_recover_inode_pass2(7)",
XFS_ERRLEVEL_LOW, mp, ldip); XFS_ERRLEVEL_LOW, mp, ldip);
xfs_alert(mp, 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); __func__, item->ri_buf[1].i_len, item);
error = -EFSCORRUPTED; error = -EFSCORRUPTED;
goto out_release; goto out_release;
......
fs/xfs/xfs_trace.h
View file @ 3d170aa2
...@@ -72,7 +72,7 @@ DECLARE_EVENT_CLASS(xfs_attr_list_class, ...@@ -72,7 +72,7 @@ DECLARE_EVENT_CLASS(xfs_attr_list_class,
__entry->flags = ctx->flags; __entry->flags = ctx->flags;
), ),
TP_printk("dev %d:%d ino 0x%llx cursor h/b/o 0x%x/0x%x/%u dupcnt %u " TP_printk("dev %d:%d ino 0x%llx cursor h/b/o 0x%x/0x%x/%u dupcnt %u "
"alist 0x%p size %u count %u firstu %u flags %d %s", "alist %p size %u count %u firstu %u flags %d %s",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->ino, __entry->ino,
__entry->hashval, __entry->hashval,
...@@ -200,7 +200,7 @@ TRACE_EVENT(xfs_attr_list_node_descend, ...@@ -200,7 +200,7 @@ TRACE_EVENT(xfs_attr_list_node_descend,
__entry->bt_before = be32_to_cpu(btree->before); __entry->bt_before = be32_to_cpu(btree->before);
), ),
TP_printk("dev %d:%d ino 0x%llx cursor h/b/o 0x%x/0x%x/%u dupcnt %u " TP_printk("dev %d:%d ino 0x%llx cursor h/b/o 0x%x/0x%x/%u dupcnt %u "
"alist 0x%p size %u count %u firstu %u flags %d %s " "alist %p size %u count %u firstu %u flags %d %s "
"node hashval %u, node before %u", "node hashval %u, node before %u",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->ino, __entry->ino,
...@@ -251,7 +251,7 @@ DECLARE_EVENT_CLASS(xfs_bmap_class, ...@@ -251,7 +251,7 @@ DECLARE_EVENT_CLASS(xfs_bmap_class,
__entry->bmap_state = state; __entry->bmap_state = state;
__entry->caller_ip = caller_ip; __entry->caller_ip = caller_ip;
), ),
TP_printk("dev %d:%d ino 0x%llx state %s cur 0x%p/%d " TP_printk("dev %d:%d ino 0x%llx state %s cur %p/%d "
"offset %lld block %lld count %lld flag %d caller %ps", "offset %lld block %lld count %lld flag %d caller %ps",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->ino, __entry->ino,
...@@ -460,7 +460,7 @@ DECLARE_EVENT_CLASS(xfs_buf_item_class, ...@@ -460,7 +460,7 @@ DECLARE_EVENT_CLASS(xfs_buf_item_class,
), ),
TP_printk("dev %d:%d bno 0x%llx len 0x%zx hold %d pincount %d " TP_printk("dev %d:%d bno 0x%llx len 0x%zx hold %d pincount %d "
"lock %d flags %s recur %d refcount %d bliflags %s " "lock %d flags %s recur %d refcount %d bliflags %s "
"lidesc 0x%p liflags %s", "lidesc %p liflags %s",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long long)__entry->buf_bno, (unsigned long long)__entry->buf_bno,
__entry->buf_len, __entry->buf_len,
...@@ -1028,7 +1028,7 @@ DECLARE_EVENT_CLASS(xfs_log_item_class, ...@@ -1028,7 +1028,7 @@ DECLARE_EVENT_CLASS(xfs_log_item_class,
__entry->flags = lip->li_flags; __entry->flags = lip->li_flags;
__entry->lsn = lip->li_lsn; __entry->lsn = lip->li_lsn;
), ),
TP_printk("dev %d:%d lip 0x%p lsn %d/%d type %s flags %s", TP_printk("dev %d:%d lip %p lsn %d/%d type %s flags %s",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->lip, __entry->lip,
CYCLE_LSN(__entry->lsn), BLOCK_LSN(__entry->lsn), CYCLE_LSN(__entry->lsn), BLOCK_LSN(__entry->lsn),
...@@ -1082,7 +1082,7 @@ DECLARE_EVENT_CLASS(xfs_ail_class, ...@@ -1082,7 +1082,7 @@ DECLARE_EVENT_CLASS(xfs_ail_class,
__entry->old_lsn = old_lsn; __entry->old_lsn = old_lsn;
__entry->new_lsn = new_lsn; __entry->new_lsn = new_lsn;
), ),
TP_printk("dev %d:%d lip 0x%p old lsn %d/%d new lsn %d/%d type %s flags %s", TP_printk("dev %d:%d lip %p old lsn %d/%d new lsn %d/%d type %s flags %s",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->lip, __entry->lip,
CYCLE_LSN(__entry->old_lsn), BLOCK_LSN(__entry->old_lsn), CYCLE_LSN(__entry->old_lsn), BLOCK_LSN(__entry->old_lsn),
...@@ -2014,7 +2014,7 @@ DECLARE_EVENT_CLASS(xfs_log_recover_item_class, ...@@ -2014,7 +2014,7 @@ DECLARE_EVENT_CLASS(xfs_log_recover_item_class,
__entry->count = item->ri_cnt; __entry->count = item->ri_cnt;
__entry->total = item->ri_total; __entry->total = item->ri_total;
), ),
TP_printk("dev %d:%d tid 0x%x lsn 0x%llx, pass %d, item 0x%p, " TP_printk("dev %d:%d tid 0x%x lsn 0x%llx, pass %d, item %p, "
"item type %s item region count/total %d/%d", "item type %s item region count/total %d/%d",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->tid, __entry->tid,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7