Skip to content

L
linux
Commit 9febf39d authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files
Options

xfs: standardize AG number formatting in ftrace output 

Always print allocation group numbers in hexadecimal and preceded with
the unit "agno".
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarCarlos Maiolino <cmaiolino@redhat.com>
parent af6265a0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 53 deletions
fs/xfs/scrub/trace.h
View file @ 9febf39d
...@@ -103,7 +103,7 @@ DECLARE_EVENT_CLASS(xchk_class, ...@@ -103,7 +103,7 @@ DECLARE_EVENT_CLASS(xchk_class,
__entry->flags = sm->sm_flags; __entry->flags = sm->sm_flags;
__entry->error = error; __entry->error = error;
), ),
TP_printk("dev %d:%d ino 0x%llx type %s agno %u inum 0x%llx gen %u flags 0x%x error %d", TP_printk("dev %d:%d ino 0x%llx type %s agno 0x%x inum 0x%llx gen %u flags 0x%x error %d",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->ino, __entry->ino,
__print_symbolic(__entry->type, XFS_SCRUB_TYPE_STRINGS), __print_symbolic(__entry->type, XFS_SCRUB_TYPE_STRINGS),
...@@ -145,7 +145,7 @@ TRACE_EVENT(xchk_op_error, ...@@ -145,7 +145,7 @@ TRACE_EVENT(xchk_op_error,
__entry->error = error; __entry->error = error;
__entry->ret_ip = ret_ip; __entry->ret_ip = ret_ip;
), ),
TP_printk("dev %d:%d type %s agno %u agbno %u error %d ret_ip %pS", TP_printk("dev %d:%d type %s agno 0x%x agbno %u error %d ret_ip %pS",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__print_symbolic(__entry->type, XFS_SCRUB_TYPE_STRINGS), __print_symbolic(__entry->type, XFS_SCRUB_TYPE_STRINGS),
__entry->agno, __entry->agno,
...@@ -203,7 +203,7 @@ DECLARE_EVENT_CLASS(xchk_block_error_class, ...@@ -203,7 +203,7 @@ DECLARE_EVENT_CLASS(xchk_block_error_class,
__entry->agbno = xfs_daddr_to_agbno(sc->mp, daddr); __entry->agbno = xfs_daddr_to_agbno(sc->mp, daddr);
__entry->ret_ip = ret_ip; __entry->ret_ip = ret_ip;
), ),
TP_printk("dev %d:%d type %s agno %u agbno %u ret_ip %pS", TP_printk("dev %d:%d type %s agno 0x%x agbno %u ret_ip %pS",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__print_symbolic(__entry->type, XFS_SCRUB_TYPE_STRINGS), __print_symbolic(__entry->type, XFS_SCRUB_TYPE_STRINGS),
__entry->agno, __entry->agno,
...@@ -338,7 +338,7 @@ TRACE_EVENT(xchk_btree_op_error, ...@@ -338,7 +338,7 @@ TRACE_EVENT(xchk_btree_op_error,
__entry->error = error; __entry->error = error;
__entry->ret_ip = ret_ip; __entry->ret_ip = ret_ip;
), ),
TP_printk("dev %d:%d type %s btree %s level %d ptr %d agno %u agbno %u error %d ret_ip %pS", TP_printk("dev %d:%d type %s btree %s level %d ptr %d agno 0x%x agbno %u error %d ret_ip %pS",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__print_symbolic(__entry->type, XFS_SCRUB_TYPE_STRINGS), __print_symbolic(__entry->type, XFS_SCRUB_TYPE_STRINGS),
__print_symbolic(__entry->btnum, XFS_BTNUM_STRINGS), __print_symbolic(__entry->btnum, XFS_BTNUM_STRINGS),
...@@ -381,7 +381,7 @@ TRACE_EVENT(xchk_ifork_btree_op_error, ...@@ -381,7 +381,7 @@ TRACE_EVENT(xchk_ifork_btree_op_error,
__entry->error = error; __entry->error = error;
__entry->ret_ip = ret_ip; __entry->ret_ip = ret_ip;
), ),
TP_printk("dev %d:%d ino 0x%llx fork %d type %s btree %s level %d ptr %d agno %u agbno %u error %d ret_ip %pS", TP_printk("dev %d:%d ino 0x%llx fork %d type %s btree %s level %d ptr %d agno 0x%x agbno %u error %d ret_ip %pS",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->ino, __entry->ino,
__entry->whichfork, __entry->whichfork,
...@@ -420,7 +420,7 @@ TRACE_EVENT(xchk_btree_error, ...@@ -420,7 +420,7 @@ TRACE_EVENT(xchk_btree_error,
__entry->ptr = cur->bc_ptrs[level]; __entry->ptr = cur->bc_ptrs[level];
__entry->ret_ip = ret_ip; __entry->ret_ip = ret_ip;
), ),
TP_printk("dev %d:%d type %s btree %s level %d ptr %d agno %u agbno %u ret_ip %pS", TP_printk("dev %d:%d type %s btree %s level %d ptr %d agno 0x%x agbno %u ret_ip %pS",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__print_symbolic(__entry->type, XFS_SCRUB_TYPE_STRINGS), __print_symbolic(__entry->type, XFS_SCRUB_TYPE_STRINGS),
__print_symbolic(__entry->btnum, XFS_BTNUM_STRINGS), __print_symbolic(__entry->btnum, XFS_BTNUM_STRINGS),
...@@ -460,7 +460,7 @@ TRACE_EVENT(xchk_ifork_btree_error, ...@@ -460,7 +460,7 @@ TRACE_EVENT(xchk_ifork_btree_error,
__entry->ptr = cur->bc_ptrs[level]; __entry->ptr = cur->bc_ptrs[level];
__entry->ret_ip = ret_ip; __entry->ret_ip = ret_ip;
), ),
TP_printk("dev %d:%d ino 0x%llx fork %d type %s btree %s level %d ptr %d agno %u agbno %u ret_ip %pS", TP_printk("dev %d:%d ino 0x%llx fork %d type %s btree %s level %d ptr %d agno 0x%x agbno %u ret_ip %pS",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->ino, __entry->ino,
__entry->whichfork, __entry->whichfork,
...@@ -499,7 +499,7 @@ DECLARE_EVENT_CLASS(xchk_sbtree_class, ...@@ -499,7 +499,7 @@ DECLARE_EVENT_CLASS(xchk_sbtree_class,
__entry->nlevels = cur->bc_nlevels; __entry->nlevels = cur->bc_nlevels;
__entry->ptr = cur->bc_ptrs[level]; __entry->ptr = cur->bc_ptrs[level];
), ),
TP_printk("dev %d:%d type %s btree %s agno %u agbno %u level %d nlevels %d ptr %d", TP_printk("dev %d:%d type %s btree %s agno 0x%x agbno %u level %d nlevels %d ptr %d",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__print_symbolic(__entry->type, XFS_SCRUB_TYPE_STRINGS), __print_symbolic(__entry->type, XFS_SCRUB_TYPE_STRINGS),
__print_symbolic(__entry->btnum, XFS_BTNUM_STRINGS), __print_symbolic(__entry->btnum, XFS_BTNUM_STRINGS),
...@@ -572,7 +572,7 @@ TRACE_EVENT(xchk_iallocbt_check_cluster, ...@@ -572,7 +572,7 @@ TRACE_EVENT(xchk_iallocbt_check_cluster,
__entry->holemask = holemask; __entry->holemask = holemask;
__entry->cluster_ino = cluster_ino; __entry->cluster_ino = cluster_ino;
), ),
TP_printk("dev %d:%d agno %d startino 0x%x daddr 0x%llx len %d chunkino 0x%x nr_inodes %u cluster_mask 0x%x holemask 0x%x cluster_ino 0x%x", TP_printk("dev %d:%d agno 0x%x startino 0x%x daddr 0x%llx len %d chunkino 0x%x nr_inodes %u cluster_mask 0x%x holemask 0x%x cluster_ino 0x%x",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->agno, __entry->agno,
__entry->startino, __entry->startino,
...@@ -662,7 +662,7 @@ DECLARE_EVENT_CLASS(xrep_extent_class, ...@@ -662,7 +662,7 @@ DECLARE_EVENT_CLASS(xrep_extent_class,
__entry->agbno = agbno; __entry->agbno = agbno;
__entry->len = len; __entry->len = len;
), ),
TP_printk("dev %d:%d agno %u agbno %u len %u", TP_printk("dev %d:%d agno 0x%x agbno %u len %u",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->agno, __entry->agno,
__entry->agbno, __entry->agbno,
...@@ -699,7 +699,7 @@ DECLARE_EVENT_CLASS(xrep_rmap_class, ...@@ -699,7 +699,7 @@ DECLARE_EVENT_CLASS(xrep_rmap_class,
__entry->offset = offset; __entry->offset = offset;
__entry->flags = flags; __entry->flags = flags;
), ),
TP_printk("dev %d:%d agno %u agbno %u len %u owner %lld offset %llu flags 0x%x", TP_printk("dev %d:%d agno 0x%x agbno %u len %u owner %lld offset %llu flags 0x%x",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->agno, __entry->agno,
__entry->agbno, __entry->agbno,
...@@ -737,7 +737,7 @@ TRACE_EVENT(xrep_refcount_extent_fn, ...@@ -737,7 +737,7 @@ TRACE_EVENT(xrep_refcount_extent_fn,
__entry->blockcount = irec->rc_blockcount; __entry->blockcount = irec->rc_blockcount;
__entry->refcount = irec->rc_refcount; __entry->refcount = irec->rc_refcount;
), ),
TP_printk("dev %d:%d agno %u agbno %u len %u refcount %u", TP_printk("dev %d:%d agno 0x%x agbno %u len %u refcount %u",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->agno, __entry->agno,
__entry->startblock, __entry->startblock,
...@@ -761,7 +761,7 @@ TRACE_EVENT(xrep_init_btblock, ...@@ -761,7 +761,7 @@ TRACE_EVENT(xrep_init_btblock,
__entry->agbno = agbno; __entry->agbno = agbno;
__entry->btnum = btnum; __entry->btnum = btnum;
), ),
TP_printk("dev %d:%d agno %u agbno %u btree %s", TP_printk("dev %d:%d agno 0x%x agbno %u btree %s",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->agno, __entry->agno,
__entry->agbno, __entry->agbno,
...@@ -785,7 +785,7 @@ TRACE_EVENT(xrep_findroot_block, ...@@ -785,7 +785,7 @@ TRACE_EVENT(xrep_findroot_block,
__entry->magic = magic; __entry->magic = magic;
__entry->level = level; __entry->level = level;
), ),
TP_printk("dev %d:%d agno %u agbno %u magic 0x%x level %u", TP_printk("dev %d:%d agno 0x%x agbno %u magic 0x%x level %u",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->agno, __entry->agno,
__entry->agbno, __entry->agbno,
...@@ -813,7 +813,7 @@ TRACE_EVENT(xrep_calc_ag_resblks, ...@@ -813,7 +813,7 @@ TRACE_EVENT(xrep_calc_ag_resblks,
__entry->freelen = freelen; __entry->freelen = freelen;
__entry->usedlen = usedlen; __entry->usedlen = usedlen;
), ),
TP_printk("dev %d:%d agno %d icount %u aglen %u freelen %u usedlen %u", TP_printk("dev %d:%d agno 0x%x icount %u aglen %u freelen %u usedlen %u",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->agno, __entry->agno,
__entry->icount, __entry->icount,
...@@ -842,7 +842,7 @@ TRACE_EVENT(xrep_calc_ag_resblks_btsize, ...@@ -842,7 +842,7 @@ TRACE_EVENT(xrep_calc_ag_resblks_btsize,
__entry->rmapbt_sz = rmapbt_sz; __entry->rmapbt_sz = rmapbt_sz;
__entry->refcbt_sz = refcbt_sz; __entry->refcbt_sz = refcbt_sz;
), ),
TP_printk("dev %d:%d agno %d bnobt %u inobt %u rmapbt %u refcountbt %u", TP_printk("dev %d:%d agno 0x%x bnobt %u inobt %u rmapbt %u refcountbt %u",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->agno, __entry->agno,
__entry->bnobt_sz, __entry->bnobt_sz,
...@@ -886,7 +886,7 @@ TRACE_EVENT(xrep_ialloc_insert, ...@@ -886,7 +886,7 @@ TRACE_EVENT(xrep_ialloc_insert,
__entry->freecount = freecount; __entry->freecount = freecount;
__entry->freemask = freemask; __entry->freemask = freemask;
), ),
TP_printk("dev %d:%d agno %d startino 0x%x holemask 0x%x count %u freecount %u freemask 0x%llx", TP_printk("dev %d:%d agno 0x%x startino 0x%x holemask 0x%x count %u freecount %u freemask 0x%llx",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->agno, __entry->agno,
__entry->startino, __entry->startino,
......
fs/xfs/xfs_trace.h
View file @ 9febf39d
This diff is collapsed.
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