[PATCH] xfs: fix dquota trace format

[PATCH] xfs: fix dquota trace format

[Christoph Hellwig]

The be32_to_cpu in the TP_printk output breaks automatic parsing of
the trace format by the trace-cmd tools, so we have to move it into
the TP_assign block.  While we're at it also fix the format for the
quota limits to more regular and easier parseable.

Signed-off-by: Christoph Hellwig <hch@lst.de>

Index: linux-2.6/fs/xfs/linux-2.6/xfs_trace.h
===================================================================
--- linux-2.6.orig/fs/xfs/linux-2.6/xfs_trace.h	2010-02-12 20:26:31.506274631 +0100
+++ linux-2.6/fs/xfs/linux-2.6/xfs_trace.h	2010-02-12 20:32:17.319255704 +0100
@@ -565,7 +565,7 @@ DECLARE_EVENT_CLASS(xfs_dquot_class,
 	TP_ARGS(dqp),
 	TP_STRUCT__entry(
 		__field(dev_t, dev)
-		__field(__be32, id)
+		__field(u32, id)
 		__field(unsigned, flags)
 		__field(unsigned, nrefs)
 		__field(unsigned long long, res_bcount)
@@ -578,7 +578,7 @@ DECLARE_EVENT_CLASS(xfs_dquot_class,
 	), \
 	TP_fast_assign(
 		__entry->dev = dqp->q_mount->m_super->s_dev;
-		__entry->id = dqp->q_core.d_id;
+		__entry->id = be32_to_cpu(dqp->q_core.d_id);
 		__entry->flags = dqp->dq_flags;
 		__entry->nrefs = dqp->q_nrefs;
 		__entry->res_bcount = dqp->q_res_bcount;
@@ -594,10 +594,10 @@ DECLARE_EVENT_CLASS(xfs_dquot_class,
 			be64_to_cpu(dqp->q_core.d_ino_softlimit);
 	),
 	TP_printk("dev %d:%d id 0x%x flags %s nrefs %u res_bc 0x%llx "
-		  "bcnt 0x%llx [hard 0x%llx | soft 0x%llx] "
-		  "icnt 0x%llx [hard 0x%llx | soft 0x%llx]",
+		  "bcnt 0x%llx bhardlimit 0x%llx bsoftlimit 0x%llx "
+		  "icnt 0x%llx ihardlimit 0x%llx isoftlimit 0x%llx]",
 		  MAJOR(__entry->dev), MINOR(__entry->dev),
-		  be32_to_cpu(__entry->id),
+		  __entry->id,
 		  __print_flags(__entry->flags, "|", XFS_DQ_FLAGS),
 		  __entry->nrefs,
 		  __entry->res_bcount,

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfs: fix dquota trace format

[Dave Chinner]

On Sun, Feb 14, 2010 at 05:01:45PM -0500, Christoph Hellwig wrote:
> 
> The be32_to_cpu in the TP_printk output breaks automatic parsing of
> the trace format by the trace-cmd tools, so we have to move it into
> the TP_assign block.  While we're at it also fix the format for the
> quota limits to more regular and easier parseable.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Looks good.

Reviewed-by: Dave Chinner <david@fromorbit.com>

Cheers,

Dave.
-- 
Dave Chinner
david@fromorbit.com

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfs: fix dquot trace format

[Christoph Hellwig]

Alex, it looks like this never got picked up?

On Sun, Feb 14, 2010 at 05:01:45PM -0500, Christoph Hellwig wrote:
> 
> The be32_to_cpu in the TP_printk output breaks automatic parsing of
> the trace format by the trace-cmd tools, so we have to move it into
> the TP_assign block.  While we're at it also fix the format for the
> quota limits to more regular and easier parseable.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> 
> Index: linux-2.6/fs/xfs/linux-2.6/xfs_trace.h
> ===================================================================
> --- linux-2.6.orig/fs/xfs/linux-2.6/xfs_trace.h	2010-02-12 20:26:31.506274631 +0100
> +++ linux-2.6/fs/xfs/linux-2.6/xfs_trace.h	2010-02-12 20:32:17.319255704 +0100
> @@ -565,7 +565,7 @@ DECLARE_EVENT_CLASS(xfs_dquot_class,
>  	TP_ARGS(dqp),
>  	TP_STRUCT__entry(
>  		__field(dev_t, dev)
> -		__field(__be32, id)
> +		__field(u32, id)
>  		__field(unsigned, flags)
>  		__field(unsigned, nrefs)
>  		__field(unsigned long long, res_bcount)
> @@ -578,7 +578,7 @@ DECLARE_EVENT_CLASS(xfs_dquot_class,
>  	), \
>  	TP_fast_assign(
>  		__entry->dev = dqp->q_mount->m_super->s_dev;
> -		__entry->id = dqp->q_core.d_id;
> +		__entry->id = be32_to_cpu(dqp->q_core.d_id);
>  		__entry->flags = dqp->dq_flags;
>  		__entry->nrefs = dqp->q_nrefs;
>  		__entry->res_bcount = dqp->q_res_bcount;
> @@ -594,10 +594,10 @@ DECLARE_EVENT_CLASS(xfs_dquot_class,
>  			be64_to_cpu(dqp->q_core.d_ino_softlimit);
>  	),
>  	TP_printk("dev %d:%d id 0x%x flags %s nrefs %u res_bc 0x%llx "
> -		  "bcnt 0x%llx [hard 0x%llx | soft 0x%llx] "
> -		  "icnt 0x%llx [hard 0x%llx | soft 0x%llx]",
> +		  "bcnt 0x%llx bhardlimit 0x%llx bsoftlimit 0x%llx "
> +		  "icnt 0x%llx ihardlimit 0x%llx isoftlimit 0x%llx]",
>  		  MAJOR(__entry->dev), MINOR(__entry->dev),
> -		  be32_to_cpu(__entry->id),
> +		  __entry->id,
>  		  __print_flags(__entry->flags, "|", XFS_DQ_FLAGS),
>  		  __entry->nrefs,
>  		  __entry->res_bcount,
> 
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs
---end quoted text---

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs