xfs
[Top] [All Lists]

[PATCH] xfs: Convert some trace events to DEFINE_TRACE

To: Alex Elder <aelder@xxxxxxx>
Subject: [PATCH] xfs: Convert some trace events to DEFINE_TRACE
From: Li Zefan <lizf@xxxxxxxxxxxxxx>
Date: Thu, 31 Dec 2009 16:46:12 +0800
Cc: Christoph Hellwig <hch@xxxxxxxxxxxxx>, xfs@xxxxxxxxxxx, Ingo Molnar <mingo@xxxxxxx>, Steven Rostedt <rostedt@xxxxxxxxxxx>, Frederic Weisbecker <fweisbec@xxxxxxxxx>, LKML <linux-kernel@xxxxxxxxxxxxxxx>
User-agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1b3pre) Gecko/20090513 Fedora/3.0-2.3.beta2.fc11 Thunderbird/3.0b2
Use DECLARE_EVENT_CLASS/DEFINE_EVENT to remove duplicate code:

   text    data     bss     dec     hex filename
 871963   35416    3612  910991   de68f fs/xfs/xfs.o.orig
 575027   35416    3404  613847   95dd7 fs/xfs/xfs.o

To test this patch, I compared the format files of trace events,
before and after patching:

  # before patching
  $ cat `find /debug/tracing/events/xfs/ -name format` > format.txt
  # after patching
  $ cat `find /debug/tracing/events/xfs/ -name format` > format2.txt
  $ diff format.txt format2.txt
  $

Signed-off-by: Li Zefan <lizf@xxxxxxxxxxxxxx>
---
 fs/xfs/linux-2.6/xfs_trace.h | 1464 ++++++++++++++++++++++--------------------
 1 files changed, 777 insertions(+), 687 deletions(-)

diff --git a/fs/xfs/linux-2.6/xfs_trace.h b/fs/xfs/linux-2.6/xfs_trace.h
index c40834b..23b1f22 100644
--- a/fs/xfs/linux-2.6/xfs_trace.h
+++ b/fs/xfs/linux-2.6/xfs_trace.h
@@ -33,51 +33,56 @@ struct xfs_dquot;
 struct xlog_ticket;
 struct log;
 
-#define DEFINE_ATTR_LIST_EVENT(name) \
-TRACE_EVENT(name, \
-       TP_PROTO(struct xfs_attr_list_context *ctx), \
-       TP_ARGS(ctx), \
-       TP_STRUCT__entry( \
-               __field(dev_t, dev) \
-               __field(xfs_ino_t, ino) \
-               __field(u32, hashval) \
-               __field(u32, blkno) \
-               __field(u32, offset) \
-               __field(void *, alist) \
-               __field(int, bufsize) \
-               __field(int, count) \
-               __field(int, firstu) \
-               __field(int, dupcnt) \
-               __field(int, flags) \
-       ), \
-       TP_fast_assign( \
-               __entry->dev = VFS_I(ctx->dp)->i_sb->s_dev; \
-               __entry->ino = ctx->dp->i_ino; \
-               __entry->hashval = ctx->cursor->hashval; \
-               __entry->blkno = ctx->cursor->blkno; \
-               __entry->offset = ctx->cursor->offset; \
-               __entry->alist = ctx->alist; \
-               __entry->bufsize = ctx->bufsize; \
-               __entry->count = ctx->count; \
-               __entry->firstu = ctx->firstu; \
-               __entry->flags = ctx->flags; \
-       ), \
-       TP_printk("dev %d:%d ino 0x%llx cursor h/b/o 0x%x/0x%x/%u dupcnt %u " \
-                 "alist 0x%p size %u count %u firstu %u flags %d %s", \
-                 MAJOR(__entry->dev), MINOR(__entry->dev), \
-                  __entry->ino, \
-                  __entry->hashval, \
-                  __entry->blkno, \
-                  __entry->offset, \
-                  __entry->dupcnt, \
-                  __entry->alist, \
-                  __entry->bufsize, \
-                  __entry->count, \
-                  __entry->firstu, \
-                  __entry->flags, \
-                  __print_flags(__entry->flags, "|", XFS_ATTR_FLAGS) \
-       ) \
+DECLARE_EVENT_CLASS(xfs__attr_list,
+       TP_PROTO(struct xfs_attr_list_context *ctx),
+       TP_ARGS(ctx),
+       TP_STRUCT__entry(
+               __field(dev_t, dev)
+               __field(xfs_ino_t, ino)
+               __field(u32, hashval)
+               __field(u32, blkno)
+               __field(u32, offset)
+               __field(void *, alist)
+               __field(int, bufsize)
+               __field(int, count)
+               __field(int, firstu)
+               __field(int, dupcnt)
+               __field(int, flags)
+       ),
+       TP_fast_assign(
+               __entry->dev = VFS_I(ctx->dp)->i_sb->s_dev;
+               __entry->ino = ctx->dp->i_ino;
+               __entry->hashval = ctx->cursor->hashval;
+               __entry->blkno = ctx->cursor->blkno;
+               __entry->offset = ctx->cursor->offset;
+               __entry->alist = ctx->alist;
+               __entry->bufsize = ctx->bufsize;
+               __entry->count = ctx->count;
+               __entry->firstu = ctx->firstu;
+               __entry->flags = ctx->flags;
+       ),
+       TP_printk("dev %d:%d ino 0x%llx cursor h/b/o 0x%x/0x%x/%u dupcnt %u "
+                 "alist 0x%p size %u count %u firstu %u flags %d %s",
+                 MAJOR(__entry->dev), MINOR(__entry->dev),
+                  __entry->ino,
+                  __entry->hashval,
+                  __entry->blkno,
+                  __entry->offset,
+                  __entry->dupcnt,
+                  __entry->alist,
+                  __entry->bufsize,
+                  __entry->count,
+                  __entry->firstu,
+                  __entry->flags,
+                  __print_flags(__entry->flags, "|", XFS_ATTR_FLAGS)
+       )
 )
+
+#define DEFINE_ATTR_LIST_EVENT(name)                   \
+DEFINE_EVENT(xfs__attr_list, name,                     \
+       TP_PROTO(struct xfs_attr_list_context *ctx),    \
+       TP_ARGS(ctx))
+
 DEFINE_ATTR_LIST_EVENT(xfs_attr_list_sf);
 DEFINE_ATTR_LIST_EVENT(xfs_attr_list_sf_all);
 DEFINE_ATTR_LIST_EVENT(xfs_attr_list_leaf);
@@ -178,91 +183,101 @@ TRACE_EVENT(xfs_iext_insert,
                  (char *)__entry->caller_ip)
 );
 
-#define DEFINE_BMAP_EVENT(name) \
-TRACE_EVENT(name, \
-       TP_PROTO(struct xfs_inode *ip, xfs_extnum_t idx, int state, \
-                unsigned long caller_ip), \
-       TP_ARGS(ip, idx, state, caller_ip), \
-       TP_STRUCT__entry( \
-               __field(dev_t, dev) \
-               __field(xfs_ino_t, ino) \
-               __field(xfs_extnum_t, idx) \
-               __field(xfs_fileoff_t, startoff) \
-               __field(xfs_fsblock_t, startblock) \
-               __field(xfs_filblks_t, blockcount) \
-               __field(xfs_exntst_t, state) \
-               __field(int, bmap_state) \
-               __field(unsigned long, caller_ip) \
-       ), \
-       TP_fast_assign( \
-               struct xfs_ifork        *ifp = (state & BMAP_ATTRFORK) ? \
-                                               ip->i_afp : &ip->i_df; \
-               struct xfs_bmbt_irec    r; \
-       \
-               xfs_bmbt_get_all(xfs_iext_get_ext(ifp, idx), &r); \
-               __entry->dev = VFS_I(ip)->i_sb->s_dev; \
-               __entry->ino = ip->i_ino; \
-               __entry->idx = idx; \
-               __entry->startoff = r.br_startoff; \
-               __entry->startblock = r.br_startblock; \
-               __entry->blockcount = r.br_blockcount; \
-               __entry->state = r.br_state; \
-               __entry->bmap_state = state; \
-               __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", \
-                 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), \
-                 __entry->blockcount, \
-                 __entry->state, \
-                 (char *)__entry->caller_ip) \
+DECLARE_EVENT_CLASS(xfs__bmap,
+       TP_PROTO(struct xfs_inode *ip, xfs_extnum_t idx, int state,
+                unsigned long caller_ip),
+       TP_ARGS(ip, idx, state, caller_ip),
+       TP_STRUCT__entry(
+               __field(dev_t, dev)
+               __field(xfs_ino_t, ino)
+               __field(xfs_extnum_t, idx)
+               __field(xfs_fileoff_t, startoff)
+               __field(xfs_fsblock_t, startblock)
+               __field(xfs_filblks_t, blockcount)
+               __field(xfs_exntst_t, state)
+               __field(int, bmap_state)
+               __field(unsigned long, caller_ip)
+       ),
+       TP_fast_assign(
+               struct xfs_ifork        *ifp = (state & BMAP_ATTRFORK) ?
+                                               ip->i_afp : &ip->i_df;
+               struct xfs_bmbt_irec    r;
+
+               xfs_bmbt_get_all(xfs_iext_get_ext(ifp, idx), &r);
+               __entry->dev = VFS_I(ip)->i_sb->s_dev;
+               __entry->ino = ip->i_ino;
+               __entry->idx = idx;
+               __entry->startoff = r.br_startoff;
+               __entry->startblock = r.br_startblock;
+               __entry->blockcount = r.br_blockcount;
+               __entry->state = r.br_state;
+               __entry->bmap_state = state;
+               __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",
+                 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),
+                 __entry->blockcount,
+                 __entry->state,
+                 (char *)__entry->caller_ip)
 )
 
+#define DEFINE_BMAP_EVENT(name)                                        \
+DEFINE_EVENT(xfs__bmap, name,                                  \
+       TP_PROTO(struct xfs_inode *ip, xfs_extnum_t idx,        \
+                int state, unsigned long caller_ip),           \
+       TP_ARGS(ip, idx, state, caller_ip))
+
 DEFINE_BMAP_EVENT(xfs_iext_remove);
 DEFINE_BMAP_EVENT(xfs_bmap_pre_update);
 DEFINE_BMAP_EVENT(xfs_bmap_post_update);
 DEFINE_BMAP_EVENT(xfs_extlist);
 
-#define DEFINE_BUF_EVENT(tname) \
-TRACE_EVENT(tname, \
-       TP_PROTO(struct xfs_buf *bp, unsigned long caller_ip), \
-       TP_ARGS(bp, caller_ip), \
-       TP_STRUCT__entry( \
-               __field(dev_t, dev) \
-               __field(xfs_daddr_t, bno) \
-               __field(size_t, buffer_length) \
-               __field(int, hold) \
-               __field(int, pincount) \
-               __field(unsigned, lockval) \
-               __field(unsigned, flags) \
-               __field(unsigned long, caller_ip) \
-       ), \
-       TP_fast_assign( \
-               __entry->dev = bp->b_target->bt_dev; \
-               __entry->bno = bp->b_bn; \
-               __entry->buffer_length = bp->b_buffer_length; \
-               __entry->hold = atomic_read(&bp->b_hold); \
-               __entry->pincount = atomic_read(&bp->b_pin_count); \
-               __entry->lockval = xfs_buf_lock_value(bp); \
-               __entry->flags = bp->b_flags; \
-               __entry->caller_ip = caller_ip; \
-       ), \
-       TP_printk("dev %d:%d bno 0x%llx len 0x%zx hold %d pincount %d " \
-                 "lock %d flags %s caller %pf", \
-                 MAJOR(__entry->dev), MINOR(__entry->dev), \
-                 (unsigned long long)__entry->bno, \
-                 __entry->buffer_length, \
-                 __entry->hold, \
-                 __entry->pincount, \
-                 __entry->lockval, \
-                 __print_flags(__entry->flags, "|", XFS_BUF_FLAGS), \
-                 (void *)__entry->caller_ip) \
+DECLARE_EVENT_CLASS(xfs__buf,
+       TP_PROTO(struct xfs_buf *bp, unsigned long caller_ip),
+       TP_ARGS(bp, caller_ip),
+       TP_STRUCT__entry(
+               __field(dev_t, dev)
+               __field(xfs_daddr_t, bno)
+               __field(size_t, buffer_length)
+               __field(int, hold)
+               __field(int, pincount)
+               __field(unsigned, lockval)
+               __field(unsigned, flags)
+               __field(unsigned long, caller_ip)
+       ),
+       TP_fast_assign(
+               __entry->dev = bp->b_target->bt_dev;
+               __entry->bno = bp->b_bn;
+               __entry->buffer_length = bp->b_buffer_length;
+               __entry->hold = atomic_read(&bp->b_hold);
+               __entry->pincount = atomic_read(&bp->b_pin_count);
+               __entry->lockval = xfs_buf_lock_value(bp);
+               __entry->flags = bp->b_flags;
+               __entry->caller_ip = caller_ip;
+       ),
+       TP_printk("dev %d:%d bno 0x%llx len 0x%zx hold %d pincount %d "
+                 "lock %d flags %s caller %pf",
+                 MAJOR(__entry->dev), MINOR(__entry->dev),
+                 (unsigned long long)__entry->bno,
+                 __entry->buffer_length,
+                 __entry->hold,
+                 __entry->pincount,
+                 __entry->lockval,
+                 __print_flags(__entry->flags, "|", XFS_BUF_FLAGS),
+                 (void *)__entry->caller_ip)
 )
+
+#define DEFINE_BUF_EVENT(name)                                 \
+DEFINE_EVENT(xfs__buf, name,                                   \
+       TP_PROTO(struct xfs_buf *bp, unsigned long caller_ip),  \
+       TP_ARGS(bp, caller_ip))
+
 DEFINE_BUF_EVENT(xfs_buf_init);
 DEFINE_BUF_EVENT(xfs_buf_free);
 DEFINE_BUF_EVENT(xfs_buf_hold);
@@ -299,41 +314,46 @@ DEFINE_BUF_EVENT(xfs_reset_dqcounts);
 DEFINE_BUF_EVENT(xfs_inode_item_push);
 
 /* pass flags explicitly */
-#define DEFINE_BUF_FLAGS_EVENT(tname) \
-TRACE_EVENT(tname, \
-       TP_PROTO(struct xfs_buf *bp, unsigned flags, unsigned long caller_ip), \
-       TP_ARGS(bp, flags, caller_ip), \
-       TP_STRUCT__entry( \
-               __field(dev_t, dev) \
-               __field(xfs_daddr_t, bno) \
-               __field(size_t, buffer_length) \
-               __field(int, hold) \
-               __field(int, pincount) \
-               __field(unsigned, lockval) \
-               __field(unsigned, flags) \
-               __field(unsigned long, caller_ip) \
-       ), \
-       TP_fast_assign( \
-               __entry->dev = bp->b_target->bt_dev; \
-               __entry->bno = bp->b_bn; \
-               __entry->buffer_length = bp->b_buffer_length; \
-               __entry->flags = flags; \
-               __entry->hold = atomic_read(&bp->b_hold); \
-               __entry->pincount = atomic_read(&bp->b_pin_count); \
-               __entry->lockval = xfs_buf_lock_value(bp); \
-               __entry->caller_ip = caller_ip; \
-       ), \
-       TP_printk("dev %d:%d bno 0x%llx len 0x%zx hold %d pincount %d " \
-                 "lock %d flags %s caller %pf", \
-                 MAJOR(__entry->dev), MINOR(__entry->dev), \
-                 (unsigned long long)__entry->bno, \
-                 __entry->buffer_length, \
-                 __entry->hold, \
-                 __entry->pincount, \
-                 __entry->lockval, \
-                 __print_flags(__entry->flags, "|", XFS_BUF_FLAGS), \
-                 (void *)__entry->caller_ip) \
+DECLARE_EVENT_CLASS(xfs__buf_flags,
+       TP_PROTO(struct xfs_buf *bp, unsigned flags, unsigned long caller_ip),
+       TP_ARGS(bp, flags, caller_ip),
+       TP_STRUCT__entry(
+               __field(dev_t, dev)
+               __field(xfs_daddr_t, bno)
+               __field(size_t, buffer_length)
+               __field(int, hold)
+               __field(int, pincount)
+               __field(unsigned, lockval)
+               __field(unsigned, flags)
+               __field(unsigned long, caller_ip)
+       ),
+       TP_fast_assign(
+               __entry->dev = bp->b_target->bt_dev;
+               __entry->bno = bp->b_bn;
+               __entry->buffer_length = bp->b_buffer_length;
+               __entry->flags = flags;
+               __entry->hold = atomic_read(&bp->b_hold);
+               __entry->pincount = atomic_read(&bp->b_pin_count);
+               __entry->lockval = xfs_buf_lock_value(bp);
+               __entry->caller_ip = caller_ip;
+       ),
+       TP_printk("dev %d:%d bno 0x%llx len 0x%zx hold %d pincount %d "
+                 "lock %d flags %s caller %pf",
+                 MAJOR(__entry->dev), MINOR(__entry->dev),
+                 (unsigned long long)__entry->bno,
+                 __entry->buffer_length,
+                 __entry->hold,
+                 __entry->pincount,
+                 __entry->lockval,
+                 __print_flags(__entry->flags, "|", XFS_BUF_FLAGS),
+                 (void *)__entry->caller_ip)
 )
+
+#define DEFINE_BUF_FLAGS_EVENT(name)                   \
+DEFINE_EVENT(xfs__buf_flags, name,                     \
+       TP_PROTO(struct xfs_buf *bp, unsigned flags, unsigned long caller_ip),\
+       TP_ARGS(bp, flags, caller_ip))
+
 DEFINE_BUF_FLAGS_EVENT(xfs_buf_find);
 DEFINE_BUF_FLAGS_EVENT(xfs_buf_get);
 DEFINE_BUF_FLAGS_EVENT(xfs_buf_read);
@@ -376,55 +396,60 @@ TRACE_EVENT(xfs_buf_ioerror,
                  (void *)__entry->caller_ip)
 );
 
-#define DEFINE_BUF_ITEM_EVENT(tname) \
-TRACE_EVENT(tname, \
-       TP_PROTO(struct xfs_buf_log_item *bip), \
-       TP_ARGS(bip), \
-       TP_STRUCT__entry( \
-               __field(dev_t, dev) \
-               __field(xfs_daddr_t, buf_bno) \
-               __field(size_t, buf_len) \
-               __field(int, buf_hold) \
-               __field(int, buf_pincount) \
-               __field(int, buf_lockval) \
-               __field(unsigned, buf_flags) \
-               __field(unsigned, bli_recur) \
-               __field(int, bli_refcount) \
-               __field(unsigned, bli_flags) \
-               __field(void *, li_desc) \
-               __field(unsigned, li_flags) \
-       ), \
-       TP_fast_assign( \
-               __entry->dev = bip->bli_buf->b_target->bt_dev; \
-               __entry->bli_flags = bip->bli_flags; \
-               __entry->bli_recur = bip->bli_recur; \
-               __entry->bli_refcount = atomic_read(&bip->bli_refcount); \
-               __entry->buf_bno = bip->bli_buf->b_bn; \
-               __entry->buf_len = bip->bli_buf->b_buffer_length; \
-               __entry->buf_flags = bip->bli_buf->b_flags; \
-               __entry->buf_hold = atomic_read(&bip->bli_buf->b_hold); \
-               __entry->buf_pincount = \
-                       atomic_read(&bip->bli_buf->b_pin_count); \
-               __entry->buf_lockval = xfs_buf_lock_value(bip->bli_buf); \
-               __entry->li_desc = bip->bli_item.li_desc; \
-               __entry->li_flags = bip->bli_item.li_flags; \
-       ), \
-       TP_printk("dev %d:%d bno 0x%llx len 0x%zx hold %d pincount %d " \
-                 "lock %d flags %s recur %d refcount %d bliflags %s " \
-                 "lidesc 0x%p liflags %s", \
-                 MAJOR(__entry->dev), MINOR(__entry->dev), \
-                 (unsigned long long)__entry->buf_bno, \
-                 __entry->buf_len, \
-                 __entry->buf_hold, \
-                 __entry->buf_pincount, \
-                 __entry->buf_lockval, \
-                 __print_flags(__entry->buf_flags, "|", XFS_BUF_FLAGS), \
-                 __entry->bli_recur, \
-                 __entry->bli_refcount, \
-                 __print_flags(__entry->bli_flags, "|", XFS_BLI_FLAGS), \
-                 __entry->li_desc, \
-                 __print_flags(__entry->li_flags, "|", XFS_LI_FLAGS)) \
+DECLARE_EVENT_CLASS(xfs__buf_item,
+       TP_PROTO(struct xfs_buf_log_item *bip),
+       TP_ARGS(bip),
+       TP_STRUCT__entry(
+               __field(dev_t, dev)
+               __field(xfs_daddr_t, buf_bno)
+               __field(size_t, buf_len)
+               __field(int, buf_hold)
+               __field(int, buf_pincount)
+               __field(int, buf_lockval)
+               __field(unsigned, buf_flags)
+               __field(unsigned, bli_recur)
+               __field(int, bli_refcount)
+               __field(unsigned, bli_flags)
+               __field(void *, li_desc)
+               __field(unsigned, li_flags)
+       ),
+       TP_fast_assign(
+               __entry->dev = bip->bli_buf->b_target->bt_dev;
+               __entry->bli_flags = bip->bli_flags;
+               __entry->bli_recur = bip->bli_recur;
+               __entry->bli_refcount = atomic_read(&bip->bli_refcount);
+               __entry->buf_bno = bip->bli_buf->b_bn;
+               __entry->buf_len = bip->bli_buf->b_buffer_length;
+               __entry->buf_flags = bip->bli_buf->b_flags;
+               __entry->buf_hold = atomic_read(&bip->bli_buf->b_hold);
+               __entry->buf_pincount =
+                       atomic_read(&bip->bli_buf->b_pin_count);
+               __entry->buf_lockval = xfs_buf_lock_value(bip->bli_buf);
+               __entry->li_desc = bip->bli_item.li_desc;
+               __entry->li_flags = bip->bli_item.li_flags;
+       ),
+       TP_printk("dev %d:%d bno 0x%llx len 0x%zx hold %d pincount %d "
+                 "lock %d flags %s recur %d refcount %d bliflags %s "
+                 "lidesc 0x%p liflags %s",
+                 MAJOR(__entry->dev), MINOR(__entry->dev),
+                 (unsigned long long)__entry->buf_bno,
+                 __entry->buf_len,
+                 __entry->buf_hold,
+                 __entry->buf_pincount,
+                 __entry->buf_lockval,
+                 __print_flags(__entry->buf_flags, "|", XFS_BUF_FLAGS),
+                 __entry->bli_recur,
+                 __entry->bli_refcount,
+                 __print_flags(__entry->bli_flags, "|", XFS_BLI_FLAGS),
+                 __entry->li_desc,
+                 __print_flags(__entry->li_flags, "|", XFS_LI_FLAGS))
 )
+
+#define DEFINE_BUF_ITEM_EVENT(name)                    \
+DEFINE_EVENT(xfs__buf_item, name,                      \
+       TP_PROTO(struct xfs_buf_log_item *bip),         \
+       TP_ARGS(bip))
+
 DEFINE_BUF_ITEM_EVENT(xfs_buf_item_size);
 DEFINE_BUF_ITEM_EVENT(xfs_buf_item_size_stale);
 DEFINE_BUF_ITEM_EVENT(xfs_buf_item_format);
@@ -450,78 +475,93 @@ DEFINE_BUF_ITEM_EVENT(xfs_trans_bhold);
 DEFINE_BUF_ITEM_EVENT(xfs_trans_bhold_release);
 DEFINE_BUF_ITEM_EVENT(xfs_trans_binval);
 
-#define DEFINE_LOCK_EVENT(name) \
-TRACE_EVENT(name, \
-       TP_PROTO(struct xfs_inode *ip, unsigned lock_flags, \
-                unsigned long caller_ip), \
-       TP_ARGS(ip,  lock_flags, caller_ip), \
-       TP_STRUCT__entry( \
-               __field(dev_t, dev) \
-               __field(xfs_ino_t, ino) \
-               __field(int, lock_flags) \
-               __field(unsigned long, caller_ip) \
-       ), \
-       TP_fast_assign( \
-               __entry->dev = VFS_I(ip)->i_sb->s_dev; \
-               __entry->ino = ip->i_ino; \
-               __entry->lock_flags = lock_flags; \
-               __entry->caller_ip = caller_ip; \
-       ), \
-       TP_printk("dev %d:%d ino 0x%llx flags %s caller %pf", \
-                 MAJOR(__entry->dev), MINOR(__entry->dev), \
-                 __entry->ino, \
-                 __print_flags(__entry->lock_flags, "|", XFS_LOCK_FLAGS), \
-                 (void *)__entry->caller_ip) \
+DECLARE_EVENT_CLASS(xfs__lock,
+       TP_PROTO(struct xfs_inode *ip, unsigned lock_flags,
+                unsigned long caller_ip),
+       TP_ARGS(ip,  lock_flags, caller_ip),
+       TP_STRUCT__entry(
+               __field(dev_t, dev)
+               __field(xfs_ino_t, ino)
+               __field(int, lock_flags)
+               __field(unsigned long, caller_ip)
+       ),
+       TP_fast_assign(
+               __entry->dev = VFS_I(ip)->i_sb->s_dev;
+               __entry->ino = ip->i_ino;
+               __entry->lock_flags = lock_flags;
+               __entry->caller_ip = caller_ip;
+       ),
+       TP_printk("dev %d:%d ino 0x%llx flags %s caller %pf",
+                 MAJOR(__entry->dev), MINOR(__entry->dev),
+                 __entry->ino,
+                 __print_flags(__entry->lock_flags, "|", XFS_LOCK_FLAGS),
+                 (void *)__entry->caller_ip)
 )
 
+#define DEFINE_LOCK_EVENT(name)                                        \
+DEFINE_EVENT(xfs__lock, name,                                  \
+       TP_PROTO(struct xfs_inode *ip, unsigned lock_flags,     \
+                unsigned long caller_ip),                      \
+       TP_ARGS(ip,  lock_flags, caller_ip))
+
 DEFINE_LOCK_EVENT(xfs_ilock);
 DEFINE_LOCK_EVENT(xfs_ilock_nowait);
 DEFINE_LOCK_EVENT(xfs_ilock_demote);
 DEFINE_LOCK_EVENT(xfs_iunlock);
 
-#define DEFINE_IGET_EVENT(name) \
-TRACE_EVENT(name, \
-       TP_PROTO(struct xfs_inode *ip), \
-       TP_ARGS(ip), \
-       TP_STRUCT__entry( \
-               __field(dev_t, dev) \
-               __field(xfs_ino_t, ino) \
-       ), \
-       TP_fast_assign( \
-               __entry->dev = VFS_I(ip)->i_sb->s_dev; \
-               __entry->ino = ip->i_ino; \
-       ), \
-       TP_printk("dev %d:%d ino 0x%llx", \
-                 MAJOR(__entry->dev), MINOR(__entry->dev), \
-                 __entry->ino) \
+DECLARE_EVENT_CLASS(xfs__iget,
+       TP_PROTO(struct xfs_inode *ip),
+       TP_ARGS(ip),
+       TP_STRUCT__entry(
+               __field(dev_t, dev)
+               __field(xfs_ino_t, ino)
+       ),
+       TP_fast_assign(
+               __entry->dev = VFS_I(ip)->i_sb->s_dev;
+               __entry->ino = ip->i_ino;
+       ),
+       TP_printk("dev %d:%d ino 0x%llx",
+                 MAJOR(__entry->dev), MINOR(__entry->dev),
+                 __entry->ino)
 )
+
+#define DEFINE_IGET_EVENT(name)                        \
+DEFINE_EVENT(xfs__iget, name,                  \
+       TP_PROTO(struct xfs_inode *ip),         \
+       TP_ARGS(ip))
+
 DEFINE_IGET_EVENT(xfs_iget_skip);
 DEFINE_IGET_EVENT(xfs_iget_reclaim);
 DEFINE_IGET_EVENT(xfs_iget_found);
 DEFINE_IGET_EVENT(xfs_iget_alloc);
 
-#define DEFINE_INODE_EVENT(name) \
-TRACE_EVENT(name, \
-       TP_PROTO(struct xfs_inode *ip, unsigned long caller_ip), \
-       TP_ARGS(ip, caller_ip), \
-       TP_STRUCT__entry( \
-               __field(dev_t, dev) \
-               __field(xfs_ino_t, ino) \
-               __field(int, count) \
-               __field(unsigned long, caller_ip) \
-       ), \
-       TP_fast_assign( \
-               __entry->dev = VFS_I(ip)->i_sb->s_dev; \
-               __entry->ino = ip->i_ino; \
-               __entry->count = atomic_read(&VFS_I(ip)->i_count); \
-               __entry->caller_ip = caller_ip; \
-       ), \
-       TP_printk("dev %d:%d ino 0x%llx count %d caller %pf", \
-                 MAJOR(__entry->dev), MINOR(__entry->dev), \
-                 __entry->ino, \
-                 __entry->count, \
-                 (char *)__entry->caller_ip) \
+DECLARE_EVENT_CLASS(xfs__inode,
+       TP_PROTO(struct xfs_inode *ip, unsigned long caller_ip),
+       TP_ARGS(ip, caller_ip),
+       TP_STRUCT__entry(
+               __field(dev_t, dev)
+               __field(xfs_ino_t, ino)
+               __field(int, count)
+               __field(unsigned long, caller_ip)
+       ),
+       TP_fast_assign(
+               __entry->dev = VFS_I(ip)->i_sb->s_dev;
+               __entry->ino = ip->i_ino;
+               __entry->count = atomic_read(&VFS_I(ip)->i_count);
+               __entry->caller_ip = caller_ip;
+       ),
+       TP_printk("dev %d:%d ino 0x%llx count %d caller %pf",
+                 MAJOR(__entry->dev), MINOR(__entry->dev),
+                 __entry->ino,
+                 __entry->count,
+                 (char *)__entry->caller_ip)
 )
+
+#define DEFINE_INODE_EVENT(name)                                       \
+DEFINE_EVENT(xfs__inode, name,                                         \
+       TP_PROTO(struct xfs_inode *ip, unsigned long caller_ip),        \
+       TP_ARGS(ip, caller_ip))
+
 DEFINE_INODE_EVENT(xfs_ihold);
 DEFINE_INODE_EVENT(xfs_irele);
 /* the old xfs_itrace_entry tracer - to be replaced by s.th. in the VFS */
@@ -529,55 +569,60 @@ DEFINE_INODE_EVENT(xfs_inode);
 #define xfs_itrace_entry(ip)    \
        trace_xfs_inode(ip, _THIS_IP_)
 
-#define DEFINE_DQUOT_EVENT(tname) \
-TRACE_EVENT(tname, \
-       TP_PROTO(struct xfs_dquot *dqp), \
-       TP_ARGS(dqp), \
-       TP_STRUCT__entry( \
-               __field(dev_t, dev) \
-               __field(__be32, id) \
-               __field(unsigned, flags) \
-               __field(unsigned, nrefs) \
-               __field(unsigned long long, res_bcount) \
-               __field(unsigned long long, bcount) \
-               __field(unsigned long long, icount) \
-               __field(unsigned long long, blk_hardlimit) \
-               __field(unsigned long long, blk_softlimit) \
-               __field(unsigned long long, ino_hardlimit) \
-               __field(unsigned long long, ino_softlimit) \
-       ), \
-       TP_fast_assign( \
-               __entry->dev = dqp->q_mount->m_super->s_dev; \
-               __entry->id = dqp->q_core.d_id; \
-               __entry->flags = dqp->dq_flags; \
-               __entry->nrefs = dqp->q_nrefs; \
-               __entry->res_bcount = dqp->q_res_bcount; \
-               __entry->bcount = be64_to_cpu(dqp->q_core.d_bcount); \
-               __entry->icount = be64_to_cpu(dqp->q_core.d_icount); \
-               __entry->blk_hardlimit = \
-                       be64_to_cpu(dqp->q_core.d_blk_hardlimit); \
-               __entry->blk_softlimit = \
-                       be64_to_cpu(dqp->q_core.d_blk_softlimit); \
-               __entry->ino_hardlimit = \
-                       be64_to_cpu(dqp->q_core.d_ino_hardlimit); \
-               __entry->ino_softlimit = \
-                       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]", \
-                 MAJOR(__entry->dev), MINOR(__entry->dev), \
-                 be32_to_cpu(__entry->id), \
-                 __print_flags(__entry->flags, "|", XFS_DQ_FLAGS), \
-                 __entry->nrefs, \
-                 __entry->res_bcount, \
-                 __entry->bcount, \
-                 __entry->blk_hardlimit, \
-                 __entry->blk_softlimit, \
-                 __entry->icount, \
-                 __entry->ino_hardlimit, \
-                 __entry->ino_softlimit) \
+DECLARE_EVENT_CLASS(xfs__dquot,
+       TP_PROTO(struct xfs_dquot *dqp),
+       TP_ARGS(dqp),
+       TP_STRUCT__entry(
+               __field(dev_t, dev)
+               __field(__be32, id)
+               __field(unsigned, flags)
+               __field(unsigned, nrefs)
+               __field(unsigned long long, res_bcount)
+               __field(unsigned long long, bcount)
+               __field(unsigned long long, icount)
+               __field(unsigned long long, blk_hardlimit)
+               __field(unsigned long long, blk_softlimit)
+               __field(unsigned long long, ino_hardlimit)
+               __field(unsigned long long, ino_softlimit)
+       ),
+       TP_fast_assign(
+               __entry->dev = dqp->q_mount->m_super->s_dev;
+               __entry->id = dqp->q_core.d_id;
+               __entry->flags = dqp->dq_flags;
+               __entry->nrefs = dqp->q_nrefs;
+               __entry->res_bcount = dqp->q_res_bcount;
+               __entry->bcount = be64_to_cpu(dqp->q_core.d_bcount);
+               __entry->icount = be64_to_cpu(dqp->q_core.d_icount);
+               __entry->blk_hardlimit =
+                       be64_to_cpu(dqp->q_core.d_blk_hardlimit);
+               __entry->blk_softlimit =
+                       be64_to_cpu(dqp->q_core.d_blk_softlimit);
+               __entry->ino_hardlimit =
+                       be64_to_cpu(dqp->q_core.d_ino_hardlimit);
+               __entry->ino_softlimit =
+                       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]",
+                 MAJOR(__entry->dev), MINOR(__entry->dev),
+                 be32_to_cpu(__entry->id),
+                 __print_flags(__entry->flags, "|", XFS_DQ_FLAGS),
+                 __entry->nrefs,
+                 __entry->res_bcount,
+                 __entry->bcount,
+                 __entry->blk_hardlimit,
+                 __entry->blk_softlimit,
+                 __entry->icount,
+                 __entry->ino_hardlimit,
+                 __entry->ino_softlimit)
 )
+
+#define DEFINE_DQUOT_EVENT(name)               \
+DEFINE_EVENT(xfs__dquot, name,                 \
+       TP_PROTO(struct xfs_dquot *dqp),        \
+       TP_ARGS(dqp))
+
 DEFINE_DQUOT_EVENT(xfs_dqadjust);
 DEFINE_DQUOT_EVENT(xfs_dqshake_dirty);
 DEFINE_DQUOT_EVENT(xfs_dqshake_unlink);
@@ -611,71 +656,76 @@ DEFINE_IGET_EVENT(xfs_dquot_dqalloc);
 DEFINE_IGET_EVENT(xfs_dquot_dqdetach);
 
 
-#define DEFINE_LOGGRANT_EVENT(tname) \
-TRACE_EVENT(tname, \
-       TP_PROTO(struct log *log, struct xlog_ticket *tic), \
-       TP_ARGS(log, tic), \
-       TP_STRUCT__entry( \
-               __field(dev_t, dev) \
-               __field(unsigned, trans_type) \
-               __field(char, ocnt) \
-               __field(char, cnt) \
-               __field(int, curr_res) \
-               __field(int, unit_res) \
-               __field(unsigned int, flags) \
-               __field(void *, reserve_headq) \
-               __field(void *, write_headq) \
-               __field(int, grant_reserve_cycle) \
-               __field(int, grant_reserve_bytes) \
-               __field(int, grant_write_cycle) \
-               __field(int, grant_write_bytes) \
-               __field(int, curr_cycle) \
-               __field(int, curr_block) \
-               __field(xfs_lsn_t, tail_lsn) \
-       ), \
-       TP_fast_assign( \
-               __entry->dev = log->l_mp->m_super->s_dev; \
-               __entry->trans_type = tic->t_trans_type; \
-               __entry->ocnt = tic->t_ocnt; \
-               __entry->cnt = tic->t_cnt; \
-               __entry->curr_res = tic->t_curr_res; \
-               __entry->unit_res = tic->t_unit_res; \
-               __entry->flags = tic->t_flags; \
-               __entry->reserve_headq = log->l_reserve_headq; \
-               __entry->write_headq = log->l_write_headq; \
-               __entry->grant_reserve_cycle = log->l_grant_reserve_cycle; \
-               __entry->grant_reserve_bytes = log->l_grant_reserve_bytes; \
-               __entry->grant_write_cycle = log->l_grant_write_cycle; \
-               __entry->grant_write_bytes = log->l_grant_write_bytes; \
-               __entry->curr_cycle = log->l_curr_cycle; \
-               __entry->curr_block = log->l_curr_block; \
-               __entry->tail_lsn = log->l_tail_lsn; \
-       ), \
-       TP_printk("dev %d:%d type %s t_ocnt %u t_cnt %u t_curr_res %u " \
-                 "t_unit_res %u t_flags %s reserve_headq 0x%p " \
-                 "write_headq 0x%p grant_reserve_cycle %d " \
-                 "grant_reserve_bytes %d grant_write_cycle %d " \
-                 "grant_write_bytes %d curr_cycle %d curr_block %d " \
-                 "tail_cycle %d tail_block %d", \
-                 MAJOR(__entry->dev), MINOR(__entry->dev), \
-                 __print_symbolic(__entry->trans_type, XFS_TRANS_TYPES), \
-                 __entry->ocnt, \
-                 __entry->cnt, \
-                 __entry->curr_res, \
-                 __entry->unit_res, \
-                 __print_flags(__entry->flags, "|", XLOG_TIC_FLAGS), \
-                 __entry->reserve_headq, \
-                 __entry->write_headq, \
-                 __entry->grant_reserve_cycle, \
-                 __entry->grant_reserve_bytes, \
-                 __entry->grant_write_cycle, \
-                 __entry->grant_write_bytes, \
-                 __entry->curr_cycle, \
-                 __entry->curr_block, \
-                 CYCLE_LSN(__entry->tail_lsn), \
-                 BLOCK_LSN(__entry->tail_lsn) \
-       ) \
+DECLARE_EVENT_CLASS(xfs__loggrant,
+       TP_PROTO(struct log *log, struct xlog_ticket *tic),
+       TP_ARGS(log, tic),
+       TP_STRUCT__entry(
+               __field(dev_t, dev)
+               __field(unsigned, trans_type)
+               __field(char, ocnt)
+               __field(char, cnt)
+               __field(int, curr_res)
+               __field(int, unit_res)
+               __field(unsigned int, flags)
+               __field(void *, reserve_headq)
+               __field(void *, write_headq)
+               __field(int, grant_reserve_cycle)
+               __field(int, grant_reserve_bytes)
+               __field(int, grant_write_cycle)
+               __field(int, grant_write_bytes)
+               __field(int, curr_cycle)
+               __field(int, curr_block)
+               __field(xfs_lsn_t, tail_lsn)
+       ),
+       TP_fast_assign(
+               __entry->dev = log->l_mp->m_super->s_dev;
+               __entry->trans_type = tic->t_trans_type;
+               __entry->ocnt = tic->t_ocnt;
+               __entry->cnt = tic->t_cnt;
+               __entry->curr_res = tic->t_curr_res;
+               __entry->unit_res = tic->t_unit_res;
+               __entry->flags = tic->t_flags;
+               __entry->reserve_headq = log->l_reserve_headq;
+               __entry->write_headq = log->l_write_headq;
+               __entry->grant_reserve_cycle = log->l_grant_reserve_cycle;
+               __entry->grant_reserve_bytes = log->l_grant_reserve_bytes;
+               __entry->grant_write_cycle = log->l_grant_write_cycle;
+               __entry->grant_write_bytes = log->l_grant_write_bytes;
+               __entry->curr_cycle = log->l_curr_cycle;
+               __entry->curr_block = log->l_curr_block;
+               __entry->tail_lsn = log->l_tail_lsn;
+       ),
+       TP_printk("dev %d:%d type %s t_ocnt %u t_cnt %u t_curr_res %u "
+                 "t_unit_res %u t_flags %s reserve_headq 0x%p "
+                 "write_headq 0x%p grant_reserve_cycle %d "
+                 "grant_reserve_bytes %d grant_write_cycle %d "
+                 "grant_write_bytes %d curr_cycle %d curr_block %d "
+                 "tail_cycle %d tail_block %d",
+                 MAJOR(__entry->dev), MINOR(__entry->dev),
+                 __print_symbolic(__entry->trans_type, XFS_TRANS_TYPES),
+                 __entry->ocnt,
+                 __entry->cnt,
+                 __entry->curr_res,
+                 __entry->unit_res,
+                 __print_flags(__entry->flags, "|", XLOG_TIC_FLAGS),
+                 __entry->reserve_headq,
+                 __entry->write_headq,
+                 __entry->grant_reserve_cycle,
+                 __entry->grant_reserve_bytes,
+                 __entry->grant_write_cycle,
+                 __entry->grant_write_bytes,
+                 __entry->curr_cycle,
+                 __entry->curr_block,
+                 CYCLE_LSN(__entry->tail_lsn),
+                 BLOCK_LSN(__entry->tail_lsn)
+       )
 )
+
+#define DEFINE_LOGGRANT_EVENT(name)                            \
+DEFINE_EVENT(xfs__loggrant, name,                              \
+       TP_PROTO(struct log *log, struct xlog_ticket *tic),     \
+       TP_ARGS(log, tic))
+
 DEFINE_LOGGRANT_EVENT(xfs_log_done_nonperm);
 DEFINE_LOGGRANT_EVENT(xfs_log_done_perm);
 DEFINE_LOGGRANT_EVENT(xfs_log_reserve);
@@ -701,38 +751,43 @@ DEFINE_LOGGRANT_EVENT(xfs_log_ungrant_enter);
 DEFINE_LOGGRANT_EVENT(xfs_log_ungrant_exit);
 DEFINE_LOGGRANT_EVENT(xfs_log_ungrant_sub);
 
-#define DEFINE_RW_EVENT(name) \
-TRACE_EVENT(name, \
-       TP_PROTO(struct xfs_inode *ip, size_t count, loff_t offset, int flags), 
\
-       TP_ARGS(ip, count, offset, flags), \
-       TP_STRUCT__entry( \
-               __field(dev_t, dev) \
-               __field(xfs_ino_t, ino) \
-               __field(xfs_fsize_t, size) \
-               __field(xfs_fsize_t, new_size) \
-               __field(loff_t, offset) \
-               __field(size_t, count) \
-               __field(int, flags) \
-       ), \
-       TP_fast_assign( \
-               __entry->dev = VFS_I(ip)->i_sb->s_dev; \
-               __entry->ino = ip->i_ino; \
-               __entry->size = ip->i_d.di_size; \
-               __entry->new_size = ip->i_new_size; \
-               __entry->offset = offset; \
-               __entry->count = count; \
-               __entry->flags = flags; \
-       ), \
-       TP_printk("dev %d:%d ino 0x%llx size 0x%llx new_size 0x%llx " \
-                 "offset 0x%llx count 0x%zx ioflags %s", \
-                 MAJOR(__entry->dev), MINOR(__entry->dev), \
-                 __entry->ino, \
-                 __entry->size, \
-                 __entry->new_size, \
-                 __entry->offset, \
-                 __entry->count, \
-                 __print_flags(__entry->flags, "|", XFS_IO_FLAGS)) \
+DECLARE_EVENT_CLASS(xfs__rw,
+       TP_PROTO(struct xfs_inode *ip, size_t count, loff_t offset, int flags),
+       TP_ARGS(ip, count, offset, flags),
+       TP_STRUCT__entry(
+               __field(dev_t, dev)
+               __field(xfs_ino_t, ino)
+               __field(xfs_fsize_t, size)
+               __field(xfs_fsize_t, new_size)
+               __field(loff_t, offset)
+               __field(size_t, count)
+               __field(int, flags)
+       ),
+       TP_fast_assign(
+               __entry->dev = VFS_I(ip)->i_sb->s_dev;
+               __entry->ino = ip->i_ino;
+               __entry->size = ip->i_d.di_size;
+               __entry->new_size = ip->i_new_size;
+               __entry->offset = offset;
+               __entry->count = count;
+               __entry->flags = flags;
+       ),
+       TP_printk("dev %d:%d ino 0x%llx size 0x%llx new_size 0x%llx "
+                 "offset 0x%llx count 0x%zx ioflags %s",
+                 MAJOR(__entry->dev), MINOR(__entry->dev),
+                 __entry->ino,
+                 __entry->size,
+                 __entry->new_size,
+                 __entry->offset,
+                 __entry->count,
+                 __print_flags(__entry->flags, "|", XFS_IO_FLAGS))
 )
+
+#define DEFINE_RW_EVENT(name)          \
+DEFINE_EVENT(xfs__rw, name,            \
+       TP_PROTO(struct xfs_inode *ip, size_t count, loff_t offset, int flags),\
+       TP_ARGS(ip, count, offset, flags))
+
 DEFINE_RW_EVENT(xfs_file_read);
 DEFINE_RW_EVENT(xfs_file_buffered_write);
 DEFINE_RW_EVENT(xfs_file_direct_write);
@@ -740,126 +795,142 @@ DEFINE_RW_EVENT(xfs_file_splice_read);
 DEFINE_RW_EVENT(xfs_file_splice_write);
 
 
-#define DEFINE_PAGE_EVENT(name) \
-TRACE_EVENT(name, \
-       TP_PROTO(struct inode *inode, struct page *page, unsigned long off), \
-       TP_ARGS(inode, page, off), \
-       TP_STRUCT__entry( \
-               __field(dev_t, dev) \
-               __field(xfs_ino_t, ino) \
-               __field(pgoff_t, pgoff) \
-               __field(loff_t, size) \
-               __field(unsigned long, offset) \
-               __field(int, delalloc) \
-               __field(int, unmapped) \
-               __field(int, unwritten) \
-       ), \
-       TP_fast_assign( \
-               int delalloc = -1, unmapped = -1, unwritten = -1; \
-       \
-               if (page_has_buffers(page)) \
-                       xfs_count_page_state(page, &delalloc, \
-                                            &unmapped, &unwritten); \
-               __entry->dev = inode->i_sb->s_dev; \
-               __entry->ino = XFS_I(inode)->i_ino; \
-               __entry->pgoff = page_offset(page); \
-               __entry->size = i_size_read(inode); \
-               __entry->offset = off; \
-               __entry->delalloc = delalloc; \
-               __entry->unmapped = unmapped; \
-               __entry->unwritten = unwritten; \
-       ), \
-       TP_printk("dev %d:%d ino 0x%llx pgoff 0x%lx size 0x%llx offset %lx " \
-                 "delalloc %d unmapped %d unwritten %d", \
-                 MAJOR(__entry->dev), MINOR(__entry->dev), \
-                 __entry->ino, \
-                 __entry->pgoff, \
-                 __entry->size, \
-                 __entry->offset, \
-                 __entry->delalloc, \
-                 __entry->unmapped, \
-                 __entry->unwritten) \
+DECLARE_EVENT_CLASS(xfs__page,
+       TP_PROTO(struct inode *inode, struct page *page, unsigned long off),
+       TP_ARGS(inode, page, off),
+       TP_STRUCT__entry(
+               __field(dev_t, dev)
+               __field(xfs_ino_t, ino)
+               __field(pgoff_t, pgoff)
+               __field(loff_t, size)
+               __field(unsigned long, offset)
+               __field(int, delalloc)
+               __field(int, unmapped)
+               __field(int, unwritten)
+       ),
+       TP_fast_assign(
+               int delalloc = -1, unmapped = -1, unwritten = -1;
+
+               if (page_has_buffers(page))
+                       xfs_count_page_state(page, &delalloc,
+                                            &unmapped, &unwritten);
+               __entry->dev = inode->i_sb->s_dev;
+               __entry->ino = XFS_I(inode)->i_ino;
+               __entry->pgoff = page_offset(page);
+               __entry->size = i_size_read(inode);
+               __entry->offset = off;
+               __entry->delalloc = delalloc;
+               __entry->unmapped = unmapped;
+               __entry->unwritten = unwritten;
+       ),
+       TP_printk("dev %d:%d ino 0x%llx pgoff 0x%lx size 0x%llx offset %lx "
+                 "delalloc %d unmapped %d unwritten %d",
+                 MAJOR(__entry->dev), MINOR(__entry->dev),
+                 __entry->ino,
+                 __entry->pgoff,
+                 __entry->size,
+                 __entry->offset,
+                 __entry->delalloc,
+                 __entry->unmapped,
+                 __entry->unwritten)
 )
+
+#define DEFINE_PAGE_EVENT(name)                        \
+DEFINE_EVENT(xfs__page, name,                  \
+       TP_PROTO(struct inode *inode, struct page *page, unsigned long off), \
+       TP_ARGS(inode, page, off))
+
 DEFINE_PAGE_EVENT(xfs_writepage);
 DEFINE_PAGE_EVENT(xfs_releasepage);
 DEFINE_PAGE_EVENT(xfs_invalidatepage);
 
-#define DEFINE_IOMAP_EVENT(name) \
-TRACE_EVENT(name, \
-       TP_PROTO(struct xfs_inode *ip, xfs_off_t offset, ssize_t count, \
-                int flags, struct xfs_bmbt_irec *irec), \
-       TP_ARGS(ip, offset, count, flags, irec), \
-       TP_STRUCT__entry( \
-               __field(dev_t, dev) \
-               __field(xfs_ino_t, ino) \
-               __field(loff_t, size) \
-               __field(loff_t, new_size) \
-               __field(loff_t, offset) \
-               __field(size_t, count) \
-               __field(int, flags) \
-               __field(xfs_fileoff_t, startoff) \
-               __field(xfs_fsblock_t, startblock) \
-               __field(xfs_filblks_t, blockcount) \
-       ), \
-       TP_fast_assign( \
-               __entry->dev = VFS_I(ip)->i_sb->s_dev; \
-               __entry->ino = ip->i_ino; \
-               __entry->size = ip->i_d.di_size; \
-               __entry->new_size = ip->i_new_size; \
-               __entry->offset = offset; \
-               __entry->count = count; \
-               __entry->flags = flags; \
-               __entry->startoff = irec ? irec->br_startoff : 0; \
-               __entry->startblock = irec ? irec->br_startblock : 0; \
-               __entry->blockcount = irec ? irec->br_blockcount : 0; \
-       ), \
-       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 0x%llx blockcount 0x%llx", \
-                 MAJOR(__entry->dev), MINOR(__entry->dev), \
-                 __entry->ino, \
-                 __entry->size, \
-                 __entry->new_size, \
-                 __entry->offset, \
-                 __entry->count, \
-                 __print_flags(__entry->flags, "|", BMAPI_FLAGS), \
-                 __entry->startoff, \
-                 __entry->startblock, \
-                 __entry->blockcount) \
+DECLARE_EVENT_CLASS(xfs__iomap,
+       TP_PROTO(struct xfs_inode *ip, xfs_off_t offset, ssize_t count,
+                int flags, struct xfs_bmbt_irec *irec),
+       TP_ARGS(ip, offset, count, flags, irec),
+       TP_STRUCT__entry(
+               __field(dev_t, dev)
+               __field(xfs_ino_t, ino)
+               __field(loff_t, size)
+               __field(loff_t, new_size)
+               __field(loff_t, offset)
+               __field(size_t, count)
+               __field(int, flags)
+               __field(xfs_fileoff_t, startoff)
+               __field(xfs_fsblock_t, startblock)
+               __field(xfs_filblks_t, blockcount)
+       ),
+       TP_fast_assign(
+               __entry->dev = VFS_I(ip)->i_sb->s_dev;
+               __entry->ino = ip->i_ino;
+               __entry->size = ip->i_d.di_size;
+               __entry->new_size = ip->i_new_size;
+               __entry->offset = offset;
+               __entry->count = count;
+               __entry->flags = flags;
+               __entry->startoff = irec ? irec->br_startoff : 0;
+               __entry->startblock = irec ? irec->br_startblock : 0;
+               __entry->blockcount = irec ? irec->br_blockcount : 0;
+       ),
+       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 0x%llx blockcount 0x%llx",
+                 MAJOR(__entry->dev), MINOR(__entry->dev),
+                 __entry->ino,
+                 __entry->size,
+                 __entry->new_size,
+                 __entry->offset,
+                 __entry->count,
+                 __print_flags(__entry->flags, "|", BMAPI_FLAGS),
+                 __entry->startoff,
+                 __entry->startblock,
+                 __entry->blockcount)
 )
+
+#define DEFINE_IOMAP_EVENT(name)                                       \
+DEFINE_EVENT(xfs__iomap, name,                                         \
+       TP_PROTO(struct xfs_inode *ip, xfs_off_t offset, ssize_t count, \
+                int flags, struct xfs_bmbt_irec *irec),                \
+       TP_ARGS(ip, offset, count, flags, irec))
+
 DEFINE_IOMAP_EVENT(xfs_iomap_enter);
 DEFINE_IOMAP_EVENT(xfs_iomap_found);
 DEFINE_IOMAP_EVENT(xfs_iomap_alloc);
 
-#define DEFINE_SIMPLE_IO_EVENT(name) \
-TRACE_EVENT(name, \
-       TP_PROTO(struct xfs_inode *ip, xfs_off_t offset, ssize_t count), \
-       TP_ARGS(ip, offset, count), \
-       TP_STRUCT__entry( \
-               __field(dev_t, dev) \
-               __field(xfs_ino_t, ino) \
-               __field(loff_t, size) \
-               __field(loff_t, new_size) \
-               __field(loff_t, offset) \
-               __field(size_t, count) \
-       ), \
-       TP_fast_assign( \
-               __entry->dev = VFS_I(ip)->i_sb->s_dev; \
-               __entry->ino = ip->i_ino; \
-               __entry->size = ip->i_d.di_size; \
-               __entry->new_size = ip->i_new_size; \
-               __entry->offset = offset; \
-               __entry->count = count; \
-       ), \
-       TP_printk("dev %d:%d ino 0x%llx size 0x%llx new_size 0x%llx " \
-                 "offset 0x%llx count %zd", \
-                 MAJOR(__entry->dev), MINOR(__entry->dev), \
-                 __entry->ino, \
-                 __entry->size, \
-                 __entry->new_size, \
-                 __entry->offset, \
-                 __entry->count) \
+DECLARE_EVENT_CLASS(xfs__simple_io,
+       TP_PROTO(struct xfs_inode *ip, xfs_off_t offset, ssize_t count),
+       TP_ARGS(ip, offset, count),
+       TP_STRUCT__entry(
+               __field(dev_t, dev)
+               __field(xfs_ino_t, ino)
+               __field(loff_t, size)
+               __field(loff_t, new_size)
+               __field(loff_t, offset)
+               __field(size_t, count)
+       ),
+       TP_fast_assign(
+               __entry->dev = VFS_I(ip)->i_sb->s_dev;
+               __entry->ino = ip->i_ino;
+               __entry->size = ip->i_d.di_size;
+               __entry->new_size = ip->i_new_size;
+               __entry->offset = offset;
+               __entry->count = count;
+       ),
+       TP_printk("dev %d:%d ino 0x%llx size 0x%llx new_size 0x%llx "
+                 "offset 0x%llx count %zd",
+                 MAJOR(__entry->dev), MINOR(__entry->dev),
+                 __entry->ino,
+                 __entry->size,
+                 __entry->new_size,
+                 __entry->offset,
+                 __entry->count)
 );
+
+#define DEFINE_SIMPLE_IO_EVENT(name)                                   \
+DEFINE_EVENT(xfs__simple_io, name,                                     \
+       TP_PROTO(struct xfs_inode *ip, xfs_off_t offset, ssize_t count),\
+       TP_ARGS(ip, offset, count))
+
 DEFINE_SIMPLE_IO_EVENT(xfs_delalloc_enospc);
 DEFINE_SIMPLE_IO_EVENT(xfs_unwritten_convert);
 
@@ -897,28 +968,33 @@ TRACE_EVENT(xfs_itruncate_start,
                  __entry->toss_finish)
 );
 
-#define DEFINE_ITRUNC_EVENT(name) \
-TRACE_EVENT(name, \
-       TP_PROTO(struct xfs_inode *ip, xfs_fsize_t new_size), \
-       TP_ARGS(ip, new_size), \
-       TP_STRUCT__entry( \
-               __field(dev_t, dev) \
-               __field(xfs_ino_t, ino) \
-               __field(xfs_fsize_t, size) \
-               __field(xfs_fsize_t, new_size) \
-       ), \
-       TP_fast_assign( \
-               __entry->dev = VFS_I(ip)->i_sb->s_dev; \
-               __entry->ino = ip->i_ino; \
-               __entry->size = ip->i_d.di_size; \
-               __entry->new_size = new_size; \
-       ), \
-       TP_printk("dev %d:%d ino 0x%llx size 0x%llx new_size 0x%llx", \
-                 MAJOR(__entry->dev), MINOR(__entry->dev), \
-                 __entry->ino, \
-                 __entry->size, \
-                 __entry->new_size) \
+DECLARE_EVENT_CLASS(xfs__itrunc,
+       TP_PROTO(struct xfs_inode *ip, xfs_fsize_t new_size),
+       TP_ARGS(ip, new_size),
+       TP_STRUCT__entry(
+               __field(dev_t, dev)
+               __field(xfs_ino_t, ino)
+               __field(xfs_fsize_t, size)
+               __field(xfs_fsize_t, new_size)
+       ),
+       TP_fast_assign(
+               __entry->dev = VFS_I(ip)->i_sb->s_dev;
+               __entry->ino = ip->i_ino;
+               __entry->size = ip->i_d.di_size;
+               __entry->new_size = new_size;
+       ),
+       TP_printk("dev %d:%d ino 0x%llx size 0x%llx new_size 0x%llx",
+                 MAJOR(__entry->dev), MINOR(__entry->dev),
+                 __entry->ino,
+                 __entry->size,
+                 __entry->new_size)
 )
+
+#define DEFINE_ITRUNC_EVENT(name)                              \
+DEFINE_EVENT(xfs__itrunc, name,                                        \
+       TP_PROTO(struct xfs_inode *ip, xfs_fsize_t new_size),   \
+       TP_ARGS(ip, new_size))
+
 DEFINE_ITRUNC_EVENT(xfs_itruncate_finish_start);
 DEFINE_ITRUNC_EVENT(xfs_itruncate_finish_end);
 
@@ -1152,77 +1228,81 @@ TRACE_EVENT(xfs_free_extent,
 
 );
 
-#define DEFINE_ALLOC_EVENT(name) \
-TRACE_EVENT(name, \
-       TP_PROTO(struct xfs_alloc_arg *args), \
-       TP_ARGS(args), \
-       TP_STRUCT__entry( \
-               __field(dev_t, dev) \
-               __field(xfs_agnumber_t, agno) \
-               __field(xfs_agblock_t, agbno) \
-               __field(xfs_extlen_t, minlen) \
-               __field(xfs_extlen_t, maxlen) \
-               __field(xfs_extlen_t, mod) \
-               __field(xfs_extlen_t, prod) \
-               __field(xfs_extlen_t, minleft) \
-               __field(xfs_extlen_t, total) \
-               __field(xfs_extlen_t, alignment) \
-               __field(xfs_extlen_t, minalignslop) \
-               __field(xfs_extlen_t, len) \
-               __field(short, type) \
-               __field(short, otype) \
-               __field(char, wasdel) \
-               __field(char, wasfromfl) \
-               __field(char, isfl) \
-               __field(char, userdata) \
-               __field(xfs_fsblock_t, firstblock) \
-       ), \
-       TP_fast_assign( \
-               __entry->dev = args->mp->m_super->s_dev; \
-               __entry->agno = args->agno; \
-               __entry->agbno = args->agbno; \
-               __entry->minlen = args->minlen; \
-               __entry->maxlen = args->maxlen; \
-               __entry->mod = args->mod; \
-               __entry->prod = args->prod; \
-               __entry->minleft = args->minleft; \
-               __entry->total = args->total; \
-               __entry->alignment = args->alignment; \
-               __entry->minalignslop = args->minalignslop; \
-               __entry->len = args->len; \
-               __entry->type = args->type; \
-               __entry->otype = args->otype; \
-               __entry->wasdel = args->wasdel; \
-               __entry->wasfromfl = args->wasfromfl; \
-               __entry->isfl = args->isfl; \
-               __entry->userdata = args->userdata; \
-               __entry->firstblock = args->firstblock; \
-       ), \
-       TP_printk("dev %d:%d agno %u agbno %u minlen %u maxlen %u mod %u " \
-                 "prod %u minleft %u total %u alignment %u minalignslop %u " \
-                 "len %u type %s otype %s wasdel %d wasfromfl %d isfl %d " \
-                 "userdata %d firstblock 0x%llx", \
-                 MAJOR(__entry->dev), MINOR(__entry->dev), \
-                 __entry->agno, \
-                 __entry->agbno, \
-                 __entry->minlen, \
-                 __entry->maxlen, \
-                 __entry->mod, \
-                 __entry->prod, \
-                 __entry->minleft, \
-                 __entry->total, \
-                 __entry->alignment, \
-                 __entry->minalignslop, \
-                 __entry->len, \
-                 __print_symbolic(__entry->type, XFS_ALLOC_TYPES), \
-                 __print_symbolic(__entry->otype, XFS_ALLOC_TYPES), \
-                 __entry->wasdel, \
-                 __entry->wasfromfl, \
-                 __entry->isfl, \
-                 __entry->userdata, \
-                 __entry->firstblock) \
+DECLARE_EVENT_CLASS(xfs__alloc,
+       TP_PROTO(struct xfs_alloc_arg *args),
+       TP_ARGS(args),
+       TP_STRUCT__entry(
+               __field(dev_t, dev)
+               __field(xfs_agnumber_t, agno)
+               __field(xfs_agblock_t, agbno)
+               __field(xfs_extlen_t, minlen)
+               __field(xfs_extlen_t, maxlen)
+               __field(xfs_extlen_t, mod)
+               __field(xfs_extlen_t, prod)
+               __field(xfs_extlen_t, minleft)
+               __field(xfs_extlen_t, total)
+               __field(xfs_extlen_t, alignment)
+               __field(xfs_extlen_t, minalignslop)
+               __field(xfs_extlen_t, len)
+               __field(short, type)
+               __field(short, otype)
+               __field(char, wasdel)
+               __field(char, wasfromfl)
+               __field(char, isfl)
+               __field(char, userdata)
+               __field(xfs_fsblock_t, firstblock)
+       ),
+       TP_fast_assign(
+               __entry->dev = args->mp->m_super->s_dev;
+               __entry->agno = args->agno;
+               __entry->agbno = args->agbno;
+               __entry->minlen = args->minlen;
+               __entry->maxlen = args->maxlen;
+               __entry->mod = args->mod;
+               __entry->prod = args->prod;
+               __entry->minleft = args->minleft;
+               __entry->total = args->total;
+               __entry->alignment = args->alignment;
+               __entry->minalignslop = args->minalignslop;
+               __entry->len = args->len;
+               __entry->type = args->type;
+               __entry->otype = args->otype;
+               __entry->wasdel = args->wasdel;
+               __entry->wasfromfl = args->wasfromfl;
+               __entry->isfl = args->isfl;
+               __entry->userdata = args->userdata;
+               __entry->firstblock = args->firstblock;
+       ),
+       TP_printk("dev %d:%d agno %u agbno %u minlen %u maxlen %u mod %u "
+                 "prod %u minleft %u total %u alignment %u minalignslop %u "
+                 "len %u type %s otype %s wasdel %d wasfromfl %d isfl %d "
+                 "userdata %d firstblock 0x%llx",
+                 MAJOR(__entry->dev), MINOR(__entry->dev),
+                 __entry->agno,
+                 __entry->agbno,
+                 __entry->minlen,
+                 __entry->maxlen,
+                 __entry->mod,
+                 __entry->prod,
+                 __entry->minleft,
+                 __entry->total,
+                 __entry->alignment,
+                 __entry->minalignslop,
+                 __entry->len,
+                 __print_symbolic(__entry->type, XFS_ALLOC_TYPES),
+                 __print_symbolic(__entry->otype, XFS_ALLOC_TYPES),
+                 __entry->wasdel,
+                 __entry->wasfromfl,
+                 __entry->isfl,
+                 __entry->userdata,
+                 __entry->firstblock)
 )
 
+#define DEFINE_ALLOC_EVENT(name)                       \
+DEFINE_EVENT(xfs__alloc, name,                         \
+       TP_PROTO(struct xfs_alloc_arg *args),           \
+       TP_ARGS(args))
+
 DEFINE_ALLOC_EVENT(xfs_alloc_exact_done);
 DEFINE_ALLOC_EVENT(xfs_alloc_exact_error);
 DEFINE_ALLOC_EVENT(xfs_alloc_near_nominleft);
@@ -1245,92 +1325,102 @@ DEFINE_ALLOC_EVENT(xfs_alloc_vextent_noagbp);
 DEFINE_ALLOC_EVENT(xfs_alloc_vextent_loopfailed);
 DEFINE_ALLOC_EVENT(xfs_alloc_vextent_allfailed);
 
-#define DEFINE_DIR2_TRACE(tname) \
-TRACE_EVENT(tname, \
-       TP_PROTO(struct xfs_da_args *args), \
-       TP_ARGS(args), \
-       TP_STRUCT__entry( \
-               __field(dev_t, dev) \
-               __field(xfs_ino_t, ino) \
-               __dynamic_array(char, name, args->namelen) \
-               __field(int, namelen) \
-               __field(xfs_dahash_t, hashval) \
-               __field(xfs_ino_t, inumber) \
-               __field(int, op_flags) \
-       ), \
-       TP_fast_assign( \
-               __entry->dev = VFS_I(args->dp)->i_sb->s_dev; \
-               __entry->ino = args->dp->i_ino; \
-               if (args->namelen) \
-                       memcpy(__get_str(name), args->name, args->namelen); \
-               __entry->namelen = args->namelen; \
-               __entry->hashval = args->hashval; \
-               __entry->inumber = args->inumber; \
-               __entry->op_flags = args->op_flags; \
-       ), \
-       TP_printk("dev %d:%d ino 0x%llx name %.*s namelen %d hashval 0x%x " \
-                 "inumber 0x%llx op_flags %s", \
-                 MAJOR(__entry->dev), MINOR(__entry->dev), \
-                 __entry->ino, \
-                 __entry->namelen, \
-                 __entry->namelen ? __get_str(name) : NULL, \
-                 __entry->namelen, \
-                 __entry->hashval, \
-                 __entry->inumber, \
-                 __print_flags(__entry->op_flags, "|", XFS_DA_OP_FLAGS)) \
+DECLARE_EVENT_CLASS(xfs__dir2,
+       TP_PROTO(struct xfs_da_args *args),
+       TP_ARGS(args),
+       TP_STRUCT__entry(
+               __field(dev_t, dev)
+               __field(xfs_ino_t, ino)
+               __dynamic_array(char, name, args->namelen)
+               __field(int, namelen)
+               __field(xfs_dahash_t, hashval)
+               __field(xfs_ino_t, inumber)
+               __field(int, op_flags)
+       ),
+       TP_fast_assign(
+               __entry->dev = VFS_I(args->dp)->i_sb->s_dev;
+               __entry->ino = args->dp->i_ino;
+               if (args->namelen)
+                       memcpy(__get_str(name), args->name, args->namelen);
+               __entry->namelen = args->namelen;
+               __entry->hashval = args->hashval;
+               __entry->inumber = args->inumber;
+               __entry->op_flags = args->op_flags;
+       ),
+       TP_printk("dev %d:%d ino 0x%llx name %.*s namelen %d hashval 0x%x "
+                 "inumber 0x%llx op_flags %s",
+                 MAJOR(__entry->dev), MINOR(__entry->dev),
+                 __entry->ino,
+                 __entry->namelen,
+                 __entry->namelen ? __get_str(name) : NULL,
+                 __entry->namelen,
+                 __entry->hashval,
+                 __entry->inumber,
+                 __print_flags(__entry->op_flags, "|", XFS_DA_OP_FLAGS))
 )
-DEFINE_DIR2_TRACE(xfs_dir2_sf_addname);
-DEFINE_DIR2_TRACE(xfs_dir2_sf_create);
-DEFINE_DIR2_TRACE(xfs_dir2_sf_lookup);
-DEFINE_DIR2_TRACE(xfs_dir2_sf_replace);
-DEFINE_DIR2_TRACE(xfs_dir2_sf_removename);
-DEFINE_DIR2_TRACE(xfs_dir2_sf_toino4);
-DEFINE_DIR2_TRACE(xfs_dir2_sf_toino8);
-DEFINE_DIR2_TRACE(xfs_dir2_sf_to_block);
-DEFINE_DIR2_TRACE(xfs_dir2_block_addname);
-DEFINE_DIR2_TRACE(xfs_dir2_block_lookup);
-DEFINE_DIR2_TRACE(xfs_dir2_block_replace);
-DEFINE_DIR2_TRACE(xfs_dir2_block_removename);
-DEFINE_DIR2_TRACE(xfs_dir2_block_to_sf);
-DEFINE_DIR2_TRACE(xfs_dir2_block_to_leaf);
-DEFINE_DIR2_TRACE(xfs_dir2_leaf_addname);
-DEFINE_DIR2_TRACE(xfs_dir2_leaf_lookup);
-DEFINE_DIR2_TRACE(xfs_dir2_leaf_replace);
-DEFINE_DIR2_TRACE(xfs_dir2_leaf_removename);
-DEFINE_DIR2_TRACE(xfs_dir2_leaf_to_block);
-DEFINE_DIR2_TRACE(xfs_dir2_leaf_to_node);
-DEFINE_DIR2_TRACE(xfs_dir2_node_addname);
-DEFINE_DIR2_TRACE(xfs_dir2_node_lookup);
-DEFINE_DIR2_TRACE(xfs_dir2_node_replace);
-DEFINE_DIR2_TRACE(xfs_dir2_node_removename);
-DEFINE_DIR2_TRACE(xfs_dir2_node_to_leaf);
-
-#define DEFINE_DIR2_SPACE_TRACE(tname) \
-TRACE_EVENT(tname, \
-       TP_PROTO(struct xfs_da_args *args, int idx), \
-       TP_ARGS(args, idx), \
-       TP_STRUCT__entry( \
-               __field(dev_t, dev) \
-               __field(xfs_ino_t, ino) \
-               __field(int, op_flags) \
-               __field(int, idx) \
-       ), \
-       TP_fast_assign( \
-               __entry->dev = VFS_I(args->dp)->i_sb->s_dev; \
-               __entry->ino = args->dp->i_ino; \
-               __entry->op_flags = args->op_flags; \
-               __entry->idx = idx; \
-       ), \
-       TP_printk("dev %d:%d ino 0x%llx op_flags %s index %d", \
-                 MAJOR(__entry->dev), MINOR(__entry->dev), \
-                 __entry->ino, \
-                 __print_flags(__entry->op_flags, "|", XFS_DA_OP_FLAGS), \
-                 __entry->idx) \
+
+#define DEFINE_DIR2_EVENT(name)                                \
+DEFINE_EVENT(xfs__dir2, name,                          \
+       TP_PROTO(struct xfs_da_args *args),             \
+       TP_ARGS(args))
+
+DEFINE_DIR2_EVENT(xfs_dir2_sf_addname);
+DEFINE_DIR2_EVENT(xfs_dir2_sf_create);
+DEFINE_DIR2_EVENT(xfs_dir2_sf_lookup);
+DEFINE_DIR2_EVENT(xfs_dir2_sf_replace);
+DEFINE_DIR2_EVENT(xfs_dir2_sf_removename);
+DEFINE_DIR2_EVENT(xfs_dir2_sf_toino4);
+DEFINE_DIR2_EVENT(xfs_dir2_sf_toino8);
+DEFINE_DIR2_EVENT(xfs_dir2_sf_to_block);
+DEFINE_DIR2_EVENT(xfs_dir2_block_addname);
+DEFINE_DIR2_EVENT(xfs_dir2_block_lookup);
+DEFINE_DIR2_EVENT(xfs_dir2_block_replace);
+DEFINE_DIR2_EVENT(xfs_dir2_block_removename);
+DEFINE_DIR2_EVENT(xfs_dir2_block_to_sf);
+DEFINE_DIR2_EVENT(xfs_dir2_block_to_leaf);
+DEFINE_DIR2_EVENT(xfs_dir2_leaf_addname);
+DEFINE_DIR2_EVENT(xfs_dir2_leaf_lookup);
+DEFINE_DIR2_EVENT(xfs_dir2_leaf_replace);
+DEFINE_DIR2_EVENT(xfs_dir2_leaf_removename);
+DEFINE_DIR2_EVENT(xfs_dir2_leaf_to_block);
+DEFINE_DIR2_EVENT(xfs_dir2_leaf_to_node);
+DEFINE_DIR2_EVENT(xfs_dir2_node_addname);
+DEFINE_DIR2_EVENT(xfs_dir2_node_lookup);
+DEFINE_DIR2_EVENT(xfs_dir2_node_replace);
+DEFINE_DIR2_EVENT(xfs_dir2_node_removename);
+DEFINE_DIR2_EVENT(xfs_dir2_node_to_leaf);
+
+DECLARE_EVENT_CLASS(xfs__dir2_space,
+       TP_PROTO(struct xfs_da_args *args, int idx),
+       TP_ARGS(args, idx),
+       TP_STRUCT__entry(
+               __field(dev_t, dev)
+               __field(xfs_ino_t, ino)
+               __field(int, op_flags)
+               __field(int, idx)
+       ),
+       TP_fast_assign(
+               __entry->dev = VFS_I(args->dp)->i_sb->s_dev;
+               __entry->ino = args->dp->i_ino;
+               __entry->op_flags = args->op_flags;
+               __entry->idx = idx;
+       ),
+       TP_printk("dev %d:%d ino 0x%llx op_flags %s index %d",
+                 MAJOR(__entry->dev), MINOR(__entry->dev),
+                 __entry->ino,
+                 __print_flags(__entry->op_flags, "|", XFS_DA_OP_FLAGS),
+                 __entry->idx)
 )
-DEFINE_DIR2_SPACE_TRACE(xfs_dir2_leafn_add);
-DEFINE_DIR2_SPACE_TRACE(xfs_dir2_leafn_remove);
-DEFINE_DIR2_SPACE_TRACE(xfs_dir2_grow_inode);
-DEFINE_DIR2_SPACE_TRACE(xfs_dir2_shrink_inode);
+
+#define DEFINE_DIR2_SPACE_EVENT(name)                  \
+DEFINE_EVENT(xfs__dir2_space, name,                    \
+       TP_PROTO(struct xfs_da_args *args, int idx),    \
+       TP_ARGS(args, idx))
+
+DEFINE_DIR2_SPACE_EVENT(xfs_dir2_leafn_add);
+DEFINE_DIR2_SPACE_EVENT(xfs_dir2_leafn_remove);
+DEFINE_DIR2_SPACE_EVENT(xfs_dir2_grow_inode);
+DEFINE_DIR2_SPACE_EVENT(xfs_dir2_shrink_inode);
 
 TRACE_EVENT(xfs_dir2_leafn_moveents,
        TP_PROTO(struct xfs_da_args *args, int src_idx, int dst_idx, int count),
-- 
1.6.3

<Prev in Thread] Current Thread [Next in Thread>