Commit 97f4f915 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: standardize rmap owner number formatting in ftrace output 



Always print rmap owner number in hexadecimal and preceded with the unit
"owner".

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 f7b08163

fs/xfs/scrub/trace.h

+1 −1
Original line number Diff line number Diff line
@@ -699,7 +699,7 @@ DECLARE_EVENT_CLASS(xrep_rmap_class, 
		__entry->offset = offset;

		__entry->flags = flags;

	),

	TP_printk("dev %d:%d agno 0x%x agbno 0x%x len %u owner %lld offset %llu flags 0x%x",

	TP_printk("dev %d:%d agno 0x%x agbno 0x%x len %u owner 0x%llx offset %llu flags 0x%x",

		  MAJOR(__entry->dev), MINOR(__entry->dev),

		  __entry->agno,

		  __entry->agbno,

fs/xfs/xfs_trace.h

+5 −5
Original line number Diff line number Diff line
@@ -2604,7 +2604,7 @@ DECLARE_EVENT_CLASS(xfs_map_extent_deferred_class, 
		__entry->l_state = state;

		__entry->op = op;

	),

	TP_printk("dev %d:%d op %d agno 0x%x agbno 0x%x owner %lld %s offset %llu len %llu state %d",

	TP_printk("dev %d:%d op %d agno 0x%x agbno 0x%x owner 0x%llx %s offset %llu len %llu state %d",

		  MAJOR(__entry->dev), MINOR(__entry->dev),

		  __entry->op,

		  __entry->agno,
@@ -2674,7 +2674,7 @@ DECLARE_EVENT_CLASS(xfs_rmap_class, 
		if (unwritten)

			__entry->flags |= XFS_RMAP_UNWRITTEN;

	),

	TP_printk("dev %d:%d agno 0x%x agbno 0x%x len %u owner %lld offset %llu flags 0x%lx",

	TP_printk("dev %d:%d agno 0x%x agbno 0x%x len %u owner 0x%llx offset %llu flags 0x%lx",

		  MAJOR(__entry->dev), MINOR(__entry->dev),

		  __entry->agno,

		  __entry->agbno,
@@ -2754,7 +2754,7 @@ DECLARE_EVENT_CLASS(xfs_rmapbt_class, 
		__entry->offset = offset;

		__entry->flags = flags;

	),

	TP_printk("dev %d:%d agno 0x%x agbno 0x%x len %u owner %lld offset %llu flags 0x%x",

	TP_printk("dev %d:%d agno 0x%x agbno 0x%x len %u owner 0x%llx offset %llu flags 0x%x",

		  MAJOR(__entry->dev), MINOR(__entry->dev),

		  __entry->agno,

		  __entry->agbno,
@@ -3423,7 +3423,7 @@ DECLARE_EVENT_CLASS(xfs_fsmap_class, 
		__entry->offset = rmap->rm_offset;

		__entry->flags = rmap->rm_flags;

	),

	TP_printk("dev %d:%d keydev %d:%d agno 0x%x bno %llu len %llu owner %lld offset %llu flags 0x%x",

	TP_printk("dev %d:%d keydev %d:%d agno 0x%x bno %llu len %llu owner 0x%llx offset %llu flags 0x%x",

		  MAJOR(__entry->dev), MINOR(__entry->dev),

		  MAJOR(__entry->keydev), MINOR(__entry->keydev),

		  __entry->agno,
@@ -3463,7 +3463,7 @@ DECLARE_EVENT_CLASS(xfs_getfsmap_class, 
		__entry->offset = fsmap->fmr_offset;

		__entry->flags = fsmap->fmr_flags;

	),

	TP_printk("dev %d:%d keydev %d:%d block %llu len %llu owner %lld offset %llu flags 0x%llx",

	TP_printk("dev %d:%d keydev %d:%d block %llu len %llu owner 0x%llx offset %llu flags 0x%llx",

		  MAJOR(__entry->dev), MINOR(__entry->dev),

		  MAJOR(__entry->keydev), MINOR(__entry->keydev),

		  __entry->block,