From cae8a5555189f2bf9ad33785eaeb57982e933932 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Sun, 14 Feb 2010 22:01:45 +0000 Subject: [PATCH] --- yaml --- r: 186375 b: refs/heads/master c: b262e5dfd9ddd2f6d0ef3fa53eb88690f22134a5 h: refs/heads/master i: 186373: fb0edd86726514aafa2303ff1732cf1a3c53b477 186371: 2f6e730b3298a31915b4ef2bf83f111b290c92cc 186367: 7a43816000d5a33f5d151467540eade6eb1c6568 v: v3 --- [refs] | 2 +- trunk/fs/xfs/linux-2.6/xfs_trace.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 87fe346209fc..cd4c82e7dba6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a9cc799eca0c798ab5dd8648564fc2025bdd9bd2 +refs/heads/master: b262e5dfd9ddd2f6d0ef3fa53eb88690f22134a5 diff --git a/trunk/fs/xfs/linux-2.6/xfs_trace.h b/trunk/fs/xfs/linux-2.6/xfs_trace.h index a4574dcf5065..87f9fad80aac 100644 --- a/trunk/fs/xfs/linux-2.6/xfs_trace.h +++ b/trunk/fs/xfs/linux-2.6/xfs_trace.h @@ -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,