Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6

[~andy/linux] / fs / gfs2 / trace_gfs2.h

diff --git a/fs/gfs2/trace_gfs2.h b/fs/gfs2/trace_gfs2.h
index dfa89cd755343f58f4f17183b96c42e0ad79bdb4..1b8b81588199a28949270131f66df39863a5dfb6 100644 (file)
--- a/fs/gfs2/trace_gfs2.h
+++ b/fs/gfs2/trace_gfs2.h
@@ -457,10 +457,10 @@ TRACE_EVENT(gfs2_bmap,
 /* Keep track of blocks as they are allocated/freed */
 TRACE_EVENT(gfs2_block_alloc,
 
-       TP_PROTO(const struct gfs2_inode *ip, u64 block, unsigned len,
-               u8 block_state),
+       TP_PROTO(const struct gfs2_inode *ip, struct gfs2_rgrpd *rgd,
+                u64 block, unsigned len, u8 block_state),
 
-       TP_ARGS(ip, block, len, block_state),
+       TP_ARGS(ip, rgd, block, len, block_state),
 
        TP_STRUCT__entry(
                __field(        dev_t,  dev                     )
@@ -468,6 +468,8 @@ TRACE_EVENT(gfs2_block_alloc,
                __field(        u64,    inum                    )
                __field(        u32,    len                     )
                __field(        u8,     block_state             )
+               __field(        u64,    rd_addr                 )
+               __field(        u32,    rd_free_clone           )
        ),
 
        TP_fast_assign(
@@ -476,14 +478,18 @@ TRACE_EVENT(gfs2_block_alloc,
                __entry->inum           = ip->i_no_addr;
                __entry->len            = len;
                __entry->block_state    = block_state;
+               __entry->rd_addr        = rgd->rd_addr;
+               __entry->rd_free_clone  = rgd->rd_free_clone;
        ),
 
-       TP_printk("%u,%u bmap %llu alloc %llu/%lu %s",
+       TP_printk("%u,%u bmap %llu alloc %llu/%lu %s rg:%llu rf:%u",
                  MAJOR(__entry->dev), MINOR(__entry->dev),
                  (unsigned long long)__entry->inum,
                  (unsigned long long)__entry->start,
                  (unsigned long)__entry->len,
-                 block_state_name(__entry->block_state))
+                 block_state_name(__entry->block_state),
+                 (unsigned long long)__entry->rd_addr,
+                 __entry->rd_free_clone)
 );
 
 #endif /* _TRACE_GFS2_H */