1 files changed, 11 insertions, 11 deletions

diff --git a/fs/xfs/linux-2.6/xfs_trace.h b/fs/xfs/linux-2.6/xfs_trace.h
index a4574dcf5065..fcaa62f0799e 100644
--- a/fs/xfs/linux-2.6/xfs_trace.h
+++ b/fs/xfs/linux-2.6/xfs_trace.h
@@ -197,13 +197,13 @@ TRACE_EVENT(xfs_iext_insert,
                 __entry->caller_ip = caller_ip;
         ),
         TP_printk("dev %d:%d ino 0x%llx state %s idx %ld "
-                  "offset %lld block %s count %lld flag %d caller %pf",
+                  "offset %lld block %lld count %lld flag %d caller %pf",
                   MAJOR(__entry->dev), MINOR(__entry->dev),
                   __entry->ino,
                   __print_flags(__entry->bmap_state, "|", XFS_BMAP_EXT_FLAGS),
                   (long)__entry->idx,
                   __entry->startoff,
-                  xfs_fmtfsblock(__entry->startblock),
+                  (__int64_t)__entry->startblock,
                   __entry->blockcount,
                   __entry->state,
                   (char *)__entry->caller_ip)
@@ -241,13 +241,13 @@ DECLARE_EVENT_CLASS(xfs_bmap_class,
                 __entry->caller_ip = caller_ip;
         ),
         TP_printk("dev %d:%d ino 0x%llx state %s idx %ld "
-                  "offset %lld block %s count %lld flag %d caller %pf",
+                  "offset %lld block %lld count %lld flag %d caller %pf",
                   MAJOR(__entry->dev), MINOR(__entry->dev),
                   __entry->ino,
                   __print_flags(__entry->bmap_state, "|", XFS_BMAP_EXT_FLAGS),
                   (long)__entry->idx,
                   __entry->startoff,
-                  xfs_fmtfsblock(__entry->startblock),
+                  (__int64_t)__entry->startblock,
                   __entry->blockcount,
                   __entry->state,
                   (char *)__entry->caller_ip)
@@ -593,7 +593,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)
@@ -606,7 +606,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;
@@ -622,10 +622,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,
@@ -881,7 +881,7 @@ TRACE_EVENT(name, \
         ), \
         TP_printk("dev %d:%d ino 0x%llx size 0x%llx new_size 0x%llx " \
                   "offset 0x%llx count %zd flags %s " \
-                  "startoff 0x%llx startblock %s blockcount 0x%llx", \
+                  "startoff 0x%llx startblock %lld blockcount 0x%llx", \
                   MAJOR(__entry->dev), MINOR(__entry->dev), \
                   __entry->ino, \
                   __entry->size, \
@@ -890,7 +890,7 @@ TRACE_EVENT(name, \
                   __entry->count, \
                   __print_flags(__entry->flags, "|", BMAPI_FLAGS), \
                   __entry->startoff, \
-                  xfs_fmtfsblock(__entry->startblock), \
+                  (__int64_t)__entry->startblock, \
                   __entry->blockcount) \
 )
 DEFINE_IOMAP_EVENT(xfs_iomap_enter);