fix: ext4: Reserve revoke credits for freed blocks (v5.5)
[lttng-modules.git] / instrumentation / events / lttng-module / ext4.h
index 72d605421753921f9823a7249c4aea55cd5ea0ed..17809d21fa82373ddb96ecc4318af49cf90d0726 100644 (file)
@@ -1,11 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM ext4
 
-#if !defined(_TRACE_EXT4_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_EXT4_H
+#if !defined(LTTNG_TRACE_EXT4_H) || defined(TRACE_HEADER_MULTI_READ)
+#define LTTNG_TRACE_EXT4_H
 
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/writeback.h>
-#include <linux/tracepoint.h>
 #include <linux/version.h>
 
 #ifndef _TRACE_EXT4_DEF_
@@ -28,208 +29,116 @@ struct ext4_extent;
 #define TP_MODE_T      umode_t
 #endif
 
-TRACE_EVENT(ext4_free_inode,
+LTTNG_TRACEPOINT_EVENT(ext4_free_inode,
        TP_PROTO(struct inode *inode),
 
        TP_ARGS(inode),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        uid_t,  uid                     )
-               __field(        gid_t,  gid                     )
-               __field(        __u64, blocks                   )
-               __field(        TP_MODE_T, mode                 )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0))
-               tp_assign(uid, i_uid_read(inode))
-               tp_assign(gid, i_gid_read(inode))
+               ctf_integer(uid_t, uid, i_uid_read(inode))
+               ctf_integer(gid_t, gid, i_gid_read(inode))
 #else
-               tp_assign(uid, inode->i_uid)
-               tp_assign(gid, inode->i_gid)
+               ctf_integer(uid_t, uid, inode->i_uid)
+               ctf_integer(gid_t, gid, inode->i_gid)
 #endif
-               tp_assign(blocks, inode->i_blocks)
-               tp_assign(mode, inode->i_mode)
-       ),
-
-       TP_printk("dev %d,%d ino %lu mode 0%o uid %u gid %u blocks %llu",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino, __entry->mode,
-                 __entry->uid, __entry->gid, __entry->blocks)
+               ctf_integer(__u64, blocks, inode->i_blocks)
+               ctf_integer(TP_MODE_T, mode, inode->i_mode)
+       )
 )
 
-TRACE_EVENT(ext4_request_inode,
+LTTNG_TRACEPOINT_EVENT(ext4_request_inode,
        TP_PROTO(struct inode *dir, int mode),
 
        TP_ARGS(dir, mode),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  dir                     )
-               __field(        TP_MODE_T, mode                 )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, dir->i_sb->s_dev)
-               tp_assign(dir, dir->i_ino)
-               tp_assign(mode, mode)
-       ),
-
-       TP_printk("dev %d,%d dir %lu mode 0%o",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->dir, __entry->mode)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, dir->i_sb->s_dev)
+               ctf_integer(ino_t, dir, dir->i_ino)
+               ctf_integer(TP_MODE_T, mode, mode)
+       )
 )
 
-TRACE_EVENT(ext4_allocate_inode,
+LTTNG_TRACEPOINT_EVENT(ext4_allocate_inode,
        TP_PROTO(struct inode *inode, struct inode *dir, int mode),
 
        TP_ARGS(inode, dir, mode),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        ino_t,  dir                     )
-               __field(        TP_MODE_T, mode                 )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(dir, dir->i_ino)
-               tp_assign(mode, mode)
-       ),
-
-       TP_printk("dev %d,%d ino %lu dir %lu mode 0%o",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 (unsigned long) __entry->dir, __entry->mode)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(ino_t, dir, dir->i_ino)
+               ctf_integer(TP_MODE_T, mode, mode)
+       )
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
-TRACE_EVENT(ext4_evict_inode,
+LTTNG_TRACEPOINT_EVENT(ext4_evict_inode,
        TP_PROTO(struct inode *inode),
 
        TP_ARGS(inode),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        int,    nlink                   )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(nlink, inode->i_nlink)
-       ),
-
-       TP_printk("dev %d,%d ino %lu nlink %d",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino, __entry->nlink)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(int, nlink, inode->i_nlink)
+       )
 )
 
-TRACE_EVENT(ext4_drop_inode,
+LTTNG_TRACEPOINT_EVENT(ext4_drop_inode,
        TP_PROTO(struct inode *inode, int drop),
 
        TP_ARGS(inode, drop),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        int,    drop                    )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(drop, drop)
-       ),
-
-       TP_printk("dev %d,%d ino %lu drop %d",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino, __entry->drop)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(int, drop, drop)
+       )
 )
 
-TRACE_EVENT(ext4_mark_inode_dirty,
+LTTNG_TRACEPOINT_EVENT(ext4_mark_inode_dirty,
        TP_PROTO(struct inode *inode, unsigned long IP),
 
        TP_ARGS(inode, IP),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(unsigned long,  ip                      )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(ip, IP)
-       ),
-
-       TP_printk("dev %d,%d ino %lu caller %pF",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino, (void *)__entry->ip)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(unsigned long, ip, IP)
+       )
 )
 
-TRACE_EVENT(ext4_begin_ordered_truncate,
+LTTNG_TRACEPOINT_EVENT(ext4_begin_ordered_truncate,
        TP_PROTO(struct inode *inode, loff_t new_size),
 
        TP_ARGS(inode, new_size),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        loff_t, new_size                )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(new_size, new_size)
-       ),
-
-       TP_printk("dev %d,%d ino %lu new_size %lld",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 __entry->new_size)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(loff_t, new_size, new_size)
+       )
 )
-#endif
 
-DECLARE_EVENT_CLASS(ext4__write_begin,
+LTTNG_TRACEPOINT_EVENT_CLASS(ext4__write_begin,
 
        TP_PROTO(struct inode *inode, loff_t pos, unsigned int len,
                 unsigned int flags),
 
        TP_ARGS(inode, pos, len, flags),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        loff_t, pos                     )
-               __field(        unsigned int, len               )
-               __field(        unsigned int, flags             )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(pos, pos)
-               tp_assign(len, len)
-               tp_assign(flags, flags)
-       ),
-
-       TP_printk("dev %d,%d ino %lu pos %lld len %u flags %u",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 __entry->pos, __entry->len, __entry->flags)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(loff_t, pos, pos)
+               ctf_integer(unsigned int, len, len)
+               ctf_integer(unsigned int, flags, flags)
+       )
 )
 
-DEFINE_EVENT(ext4__write_begin, ext4_write_begin,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__write_begin, ext4_write_begin,
 
        TP_PROTO(struct inode *inode, loff_t pos, unsigned int len,
                 unsigned int flags),
@@ -237,7 +146,7 @@ DEFINE_EVENT(ext4__write_begin, ext4_write_begin,
        TP_ARGS(inode, pos, len, flags)
 )
 
-DEFINE_EVENT(ext4__write_begin, ext4_da_write_begin,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__write_begin, ext4_da_write_begin,
 
        TP_PROTO(struct inode *inode, loff_t pos, unsigned int len,
                 unsigned int flags),
@@ -245,35 +154,22 @@ DEFINE_EVENT(ext4__write_begin, ext4_da_write_begin,
        TP_ARGS(inode, pos, len, flags)
 )
 
-DECLARE_EVENT_CLASS(ext4__write_end,
+LTTNG_TRACEPOINT_EVENT_CLASS(ext4__write_end,
        TP_PROTO(struct inode *inode, loff_t pos, unsigned int len,
                        unsigned int copied),
 
        TP_ARGS(inode, pos, len, copied),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        loff_t, pos                     )
-               __field(        unsigned int, len               )
-               __field(        unsigned int, copied            )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(pos, pos)
-               tp_assign(len, len)
-               tp_assign(copied, copied)
-       ),
-
-       TP_printk("dev %d,%d ino %lu pos %lld len %u copied %u",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 __entry->pos, __entry->len, __entry->copied)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(loff_t, pos, pos)
+               ctf_integer(unsigned int, len, len)
+               ctf_integer(unsigned int, copied, copied)
+       )
 )
 
-DEFINE_EVENT(ext4__write_end, ext4_ordered_write_end,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__write_end, ext4_ordered_write_end,
 
        TP_PROTO(struct inode *inode, loff_t pos, unsigned int len,
                 unsigned int copied),
@@ -281,7 +177,7 @@ DEFINE_EVENT(ext4__write_end, ext4_ordered_write_end,
        TP_ARGS(inode, pos, len, copied)
 )
 
-DEFINE_EVENT(ext4__write_end, ext4_writeback_write_end,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__write_end, ext4_writeback_write_end,
 
        TP_PROTO(struct inode *inode, loff_t pos, unsigned int len,
                 unsigned int copied),
@@ -289,7 +185,7 @@ DEFINE_EVENT(ext4__write_end, ext4_writeback_write_end,
        TP_ARGS(inode, pos, len, copied)
 )
 
-DEFINE_EVENT(ext4__write_end, ext4_journalled_write_end,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__write_end, ext4_journalled_write_end,
 
        TP_PROTO(struct inode *inode, loff_t pos, unsigned int len,
                 unsigned int copied),
@@ -297,7 +193,7 @@ DEFINE_EVENT(ext4__write_end, ext4_journalled_write_end,
        TP_ARGS(inode, pos, len, copied)
 )
 
-DEFINE_EVENT(ext4__write_end, ext4_da_write_end,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__write_end, ext4_da_write_end,
 
        TP_PROTO(struct inode *inode, loff_t pos, unsigned int len,
                 unsigned int copied),
@@ -305,386 +201,207 @@ DEFINE_EVENT(ext4__write_end, ext4_da_write_end,
        TP_ARGS(inode, pos, len, copied)
 )
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,40))
-TRACE_EVENT(ext4_writepage,
-       TP_PROTO(struct inode *inode, struct page *page),
-
-       TP_ARGS(inode, page),
+LTTNG_TRACEPOINT_EVENT(ext4_da_writepages,
+       TP_PROTO(struct inode *inode, struct writeback_control *wbc),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        pgoff_t, index                  )
+       TP_ARGS(inode, wbc),
 
-       ),
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(long, nr_to_write, wbc->nr_to_write)
+               ctf_integer(long, pages_skipped, wbc->pages_skipped)
+               ctf_integer(loff_t, range_start, wbc->range_start)
+               ctf_integer(loff_t, range_end, wbc->range_end)
+               ctf_integer(pgoff_t, writeback_index, inode->i_mapping->writeback_index)
+               ctf_integer(int, sync_mode, wbc->sync_mode)
+               ctf_integer(char, for_kupdate, wbc->for_kupdate)
+               ctf_integer(char, range_cyclic, wbc->range_cyclic)
+       )
+)
 
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(index, page->index)
-       ),
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0))
 
-       TP_printk("dev %d,%d ino %lu page_index %lu",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino, __entry->index)
-)
-#endif
+LTTNG_TRACEPOINT_EVENT(ext4_da_write_pages,
+       TP_PROTO(struct inode *inode, pgoff_t first_page,
+                struct writeback_control *wbc),
 
-TRACE_EVENT(ext4_da_writepages,
-       TP_PROTO(struct inode *inode, struct writeback_control *wbc),
+       TP_ARGS(inode, first_page, wbc),
 
-       TP_ARGS(inode, wbc),
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(pgoff_t, first_page, first_page)
+               ctf_integer(long, nr_to_write, wbc->nr_to_write)
+               ctf_integer(int, sync_mode, wbc->sync_mode)
+       )
+)
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        long,   nr_to_write             )
-               __field(        long,   pages_skipped           )
-               __field(        loff_t, range_start             )
-               __field(        loff_t, range_end               )
-               __field(       pgoff_t, writeback_index         )
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
-               __field(        int,    sync_mode               )
-#endif
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37))
-               __field(        char,   nonblocking             )
-#endif
-               __field(        char,   for_kupdate             )
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39))
-               __field(        char,   for_reclaim             )
-#endif
-               __field(        char,   range_cyclic            )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(nr_to_write, wbc->nr_to_write)
-               tp_assign(pages_skipped, wbc->pages_skipped)
-               tp_assign(range_start, wbc->range_start)
-               tp_assign(range_end, wbc->range_end)
-               tp_assign(writeback_index, inode->i_mapping->writeback_index)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
-               tp_assign(sync_mode, wbc->sync_mode)
-#endif
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37))
-               tp_assign(nonblocking, wbc->nonblocking)
-#endif
-               tp_assign(for_kupdate, wbc->for_kupdate)
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39))
-               tp_assign(for_reclaim, wbc->for_reclaim)
-#endif
-               tp_assign(range_cyclic, wbc->range_cyclic)
-       ),
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
-       TP_printk("dev %d,%d ino %lu nr_to_write %ld pages_skipped %ld "
-                 "range_start %lld range_end %lld sync_mode %d "
-                 "for_kupdate %d range_cyclic %d writeback_index %lu",
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
-       TP_printk("dev %d,%d ino %lu nr_to_write %ld pages_skipped %ld "
-                 "range_start %llu range_end %llu "
-                 "for_kupdate %d for_reclaim %d "
-                 "range_cyclic %d writeback_index %lu",
 #else
-       TP_printk("dev %d,%d ino %lu nr_to_write %ld pages_skipped %ld "
-                 "range_start %llu range_end %llu "
-                 "nonblocking %d for_kupdate %d for_reclaim %d "
-                 "range_cyclic %d writeback_index %lu",
-#endif
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino, __entry->nr_to_write,
-                 __entry->pages_skipped, __entry->range_start,
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
-                 __entry->range_end, __entry->sync_mode,
-                 __entry->for_kupdate, __entry->range_cyclic,
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
-                 __entry->range_end,
-                 __entry->for_kupdate, __entry->for_reclaim,
-                 __entry->range_cyclic,
-#else
-                 __entry->range_end, __entry->nonblocking,
-                 __entry->for_kupdate, __entry->for_reclaim,
-                 __entry->range_cyclic,
-#endif
-                 (unsigned long) __entry->writeback_index)
-)
 
-TRACE_EVENT(ext4_da_write_pages,
+LTTNG_TRACEPOINT_EVENT(ext4_da_write_pages,
        TP_PROTO(struct inode *inode, struct mpage_da_data *mpd),
 
        TP_ARGS(inode, mpd),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        __u64,  b_blocknr               )
-               __field(        __u32,  b_size                  )
-               __field(        __u32,  b_state                 )
-               __field(        unsigned long,  first_page      )
-               __field(        int,    io_done                 )
-               __field(        int,    pages_written           )
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
-               __field(        int,    sync_mode               )
-#endif
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(b_blocknr, mpd->b_blocknr)
-               tp_assign(b_size, mpd->b_size)
-               tp_assign(b_state, mpd->b_state)
-               tp_assign(first_page, mpd->first_page)
-               tp_assign(io_done, mpd->io_done)
-               tp_assign(pages_written, mpd->pages_written)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
-               tp_assign(sync_mode, mpd->wbc->sync_mode)
-#endif
-       ),
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(__u64, b_blocknr, mpd->b_blocknr)
+               ctf_integer(__u32, b_size, mpd->b_size)
+               ctf_integer(__u32, b_state, mpd->b_state)
+               ctf_integer(unsigned long, first_page, mpd->first_page)
+               ctf_integer(int, io_done, mpd->io_done)
+               ctf_integer(int, pages_written, mpd->pages_written)
+               ctf_integer(int, sync_mode, mpd->wbc->sync_mode)
+       )
+)
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
-       TP_printk("dev %d,%d ino %lu b_blocknr %llu b_size %u b_state 0x%04x "
-                 "first_page %lu io_done %d pages_written %d sync_mode %d",
-#else
-       TP_printk("dev %d,%d ino %lu b_blocknr %llu b_size %u b_state 0x%04x "
-                 "first_page %lu io_done %d pages_written %d",
-#endif
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 __entry->b_blocknr, __entry->b_size,
-                 __entry->b_state, __entry->first_page,
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
-                 __entry->io_done, __entry->pages_written,
-                 __entry->sync_mode
-#else
-                 __entry->io_done, __entry->pages_written
 #endif
-                  )
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0))
+
+LTTNG_TRACEPOINT_EVENT(ext4_da_write_pages_extent,
+       TP_PROTO(struct inode *inode, struct ext4_map_blocks *map),
+
+       TP_ARGS(inode, map),
+
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(__u64, lblk, map->m_lblk)
+               ctf_integer(__u32, len, map->m_len)
+               ctf_integer(__u32, flags, map->m_flags)
+       )
 )
 
-TRACE_EVENT(ext4_da_writepages_result,
+#endif
+
+LTTNG_TRACEPOINT_EVENT(ext4_da_writepages_result,
        TP_PROTO(struct inode *inode, struct writeback_control *wbc,
                        int ret, int pages_written),
 
        TP_ARGS(inode, wbc, ret, pages_written),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        int,    ret                     )
-               __field(        int,    pages_written           )
-               __field(        long,   pages_skipped           )
-               __field(       pgoff_t, writeback_index         )
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
-               __field(        int,    sync_mode               )
-#endif
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33))
-               __field(        char,   encountered_congestion  )
-#endif
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0))
-               __field(        char,   more_io                 )
-#endif
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35))
-               __field(        char,   no_nrwrite_index_update )
-#endif
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(ret, ret)
-               tp_assign(pages_written, pages_written)
-               tp_assign(pages_skipped, wbc->pages_skipped)
-               tp_assign(writeback_index, inode->i_mapping->writeback_index)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
-               tp_assign(sync_mode, wbc->sync_mode)
-#endif
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33))
-               tp_assign(encountered_congestion, wbc->encountered_congestion)
-#endif
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0))
-               tp_assign(more_io, wbc->more_io)
-#endif
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35))
-               tp_assign(no_nrwrite_index_update, wbc->no_nrwrite_index_update)
-#endif
-       ),
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0))
-       TP_printk("dev %d,%d ino %lu ret %d pages_written %d pages_skipped %ld "
-                 "sync_mode %d writeback_index %lu",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino, __entry->ret,
-                 __entry->pages_written, __entry->pages_skipped,
-                 __entry->sync_mode,
-                 (unsigned long) __entry->writeback_index)
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
-       TP_printk("dev %d,%d ino %lu ret %d pages_written %d pages_skipped %ld "
-                 " more_io %d sync_mode %d writeback_index %lu",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino, __entry->ret,
-                 __entry->pages_written, __entry->pages_skipped,
-                 __entry->more_io, __entry->sync_mode,
-                 (unsigned long) __entry->writeback_index)
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
-       TP_printk("dev %d,%d ino %lu ret %d pages_written %d pages_skipped %ld "
-                 " more_io %d writeback_index %lu",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino, __entry->ret,
-                 __entry->pages_written, __entry->pages_skipped,
-                 __entry->more_io,
-                 (unsigned long) __entry->writeback_index)
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
-       TP_printk("dev %d,%d ino %lu ret %d pages_written %d pages_skipped %ld "
-                 " more_io %d no_nrwrite_index_update %d writeback_index %lu",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino, __entry->ret,
-                 __entry->pages_written, __entry->pages_skipped,
-                 __entry->more_io, __entry->no_nrwrite_index_update,
-                 (unsigned long) __entry->writeback_index)
-#else
-       TP_printk("dev %d,%d ino %lu ret %d pages_written %d pages_skipped %ld "
-                 " congestion %d"
-                 " more_io %d no_nrwrite_index_update %d writeback_index %lu",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino, __entry->ret,
-                 __entry->pages_written, __entry->pages_skipped,
-                 __entry->encountered_congestion,
-                 __entry->more_io, __entry->no_nrwrite_index_update,
-                 (unsigned long) __entry->writeback_index)
-#endif
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(int, ret, ret)
+               ctf_integer(int, pages_written, pages_written)
+               ctf_integer(long, pages_skipped, wbc->pages_skipped)
+               ctf_integer(pgoff_t, writeback_index, inode->i_mapping->writeback_index)
+               ctf_integer(int, sync_mode, wbc->sync_mode)
+       )
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
-DECLARE_EVENT_CLASS(ext4__page_op,
+LTTNG_TRACEPOINT_EVENT_CLASS(ext4__page_op,
        TP_PROTO(struct page *page),
 
        TP_ARGS(page),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        pgoff_t, index                  )
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, page->mapping->host->i_sb->s_dev)
+               ctf_integer(ino_t, ino, page->mapping->host->i_ino)
+               ctf_integer(pgoff_t, index, page->index)
+       )
+)
 
-       ),
+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__page_op, ext4_writepage,
 
-       TP_fast_assign(
-               tp_assign(dev, page->mapping->host->i_sb->s_dev)
-               tp_assign(ino, page->mapping->host->i_ino)
-               tp_assign(index, page->index)
-       ),
+       TP_PROTO(struct page *page),
 
-       TP_printk("dev %d,%d ino %lu page_index %lu",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 (unsigned long) __entry->index)
+       TP_ARGS(page)
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,40))
-DEFINE_EVENT(ext4__page_op, ext4_writepage,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__page_op, ext4_readpage,
 
        TP_PROTO(struct page *page),
 
        TP_ARGS(page)
 )
-#endif
 
-DEFINE_EVENT(ext4__page_op, ext4_readpage,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__page_op, ext4_releasepage,
 
        TP_PROTO(struct page *page),
 
        TP_ARGS(page)
 )
 
-DEFINE_EVENT(ext4__page_op, ext4_releasepage,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0))
 
-       TP_PROTO(struct page *page),
+LTTNG_TRACEPOINT_EVENT_CLASS(ext4_invalidatepage_op,
+       TP_PROTO(struct page *page, unsigned int offset, unsigned int length),
 
-       TP_ARGS(page)
+       TP_ARGS(page, offset, length),
+
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, page->mapping->host->i_sb->s_dev)
+               ctf_integer(ino_t, ino, page->mapping->host->i_ino)
+               ctf_integer(pgoff_t, index, page->index)
+               ctf_integer(unsigned int, offset, offset)
+               ctf_integer(unsigned int, length, length)
+       )
 )
 
-TRACE_EVENT(ext4_invalidatepage,
-       TP_PROTO(struct page *page, unsigned long offset),
+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4_invalidatepage_op, ext4_invalidatepage,
+       TP_PROTO(struct page *page, unsigned int offset, unsigned int length),
 
-       TP_ARGS(page, offset),
+       TP_ARGS(page, offset, length)
+)
+
+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4_invalidatepage_op, ext4_journalled_invalidatepage,
+       TP_PROTO(struct page *page, unsigned int offset, unsigned int length),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        pgoff_t, index                  )
-               __field(        unsigned long, offset           )
+       TP_ARGS(page, offset, length)
+)
+
+#else
+
+LTTNG_TRACEPOINT_EVENT(ext4_invalidatepage,
+       TP_PROTO(struct page *page, unsigned long offset),
 
-       ),
+       TP_ARGS(page, offset),
 
-       TP_fast_assign(
-               tp_assign(dev, page->mapping->host->i_sb->s_dev)
-               tp_assign(ino, page->mapping->host->i_ino)
-               tp_assign(index, page->index)
-               tp_assign(offset, offset)
-       ),
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, page->mapping->host->i_sb->s_dev)
+               ctf_integer(ino_t, ino, page->mapping->host->i_ino)
+               ctf_integer(pgoff_t, index, page->index)
+               ctf_integer(unsigned long, offset, offset)
 
-       TP_printk("dev %d,%d ino %lu page_index %lu offset %lu",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 (unsigned long) __entry->index, __entry->offset)
+       )
 )
+
 #endif
 
-TRACE_EVENT(ext4_discard_blocks,
+LTTNG_TRACEPOINT_EVENT(ext4_discard_blocks,
        TP_PROTO(struct super_block *sb, unsigned long long blk,
                        unsigned long long count),
 
        TP_ARGS(sb, blk, count),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        __u64,  blk                     )
-               __field(        __u64,  count                   )
-
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, sb->s_dev)
-               tp_assign(blk, blk)
-               tp_assign(count, count)
-       ),
-
-       TP_printk("dev %d,%d blk %llu count %llu",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 __entry->blk, __entry->count)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, sb->s_dev)
+               ctf_integer(__u64, blk, blk)
+               ctf_integer(__u64, count, count)
+       )
 )
 
-DECLARE_EVENT_CLASS(ext4__mb_new_pa,
+LTTNG_TRACEPOINT_EVENT_CLASS(ext4__mb_new_pa,
        TP_PROTO(struct ext4_allocation_context *ac,
                 struct ext4_prealloc_space *pa),
 
        TP_ARGS(ac, pa),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        __u64,  pa_pstart               )
-               __field(        __u64,  pa_lstart               )
-               __field(        __u32,  pa_len                  )
-
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, ac->ac_sb->s_dev)
-               tp_assign(ino, ac->ac_inode->i_ino)
-               tp_assign(pa_pstart, pa->pa_pstart)
-               tp_assign(pa_lstart, pa->pa_lstart)
-               tp_assign(pa_len, pa->pa_len)
-       ),
-
-       TP_printk("dev %d,%d ino %lu pstart %llu len %u lstart %llu",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 __entry->pa_pstart, __entry->pa_len, __entry->pa_lstart)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, ac->ac_sb->s_dev)
+               ctf_integer(ino_t, ino, ac->ac_inode->i_ino)
+               ctf_integer(__u64, pa_pstart, pa->pa_pstart)
+               ctf_integer(__u64, pa_lstart, pa->pa_lstart)
+               ctf_integer(__u32, pa_len, pa->pa_len)
+       )
 )
 
-DEFINE_EVENT(ext4__mb_new_pa, ext4_mb_new_inode_pa,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__mb_new_pa, ext4_mb_new_inode_pa,
 
        TP_PROTO(struct ext4_allocation_context *ac,
                 struct ext4_prealloc_space *pa),
@@ -692,7 +409,7 @@ DEFINE_EVENT(ext4__mb_new_pa, ext4_mb_new_inode_pa,
        TP_ARGS(ac, pa)
 )
 
-DEFINE_EVENT(ext4__mb_new_pa, ext4_mb_new_group_pa,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__mb_new_pa, ext4_mb_new_group_pa,
 
        TP_PROTO(struct ext4_allocation_context *ac,
                 struct ext4_prealloc_space *pa),
@@ -700,519 +417,239 @@ DEFINE_EVENT(ext4__mb_new_pa, ext4_mb_new_group_pa,
        TP_ARGS(ac, pa)
 )
 
-TRACE_EVENT(ext4_mb_release_inode_pa,
+LTTNG_TRACEPOINT_EVENT(ext4_mb_release_inode_pa,
        TP_PROTO(
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,40))
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
-                struct super_block *sb,
-                struct inode *inode,
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36))
-                struct super_block *sb,
-                struct ext4_allocation_context *ac,
-#else
-                struct ext4_allocation_context *ac,
-#endif
-#endif
                 struct ext4_prealloc_space *pa,
                 unsigned long long block, unsigned int count),
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,40))
        TP_ARGS(pa, block, count),
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
-       TP_ARGS(sb, inode, pa, block, count),
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36))
-       TP_ARGS(sb, ac, pa, block, count),
-#else
-       TP_ARGS(ac, pa, block, count),
-#endif
-
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        __u64,  block                   )
-               __field(        __u32,  count                   )
-
-       ),
 
-       TP_fast_assign(
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,40))
-               tp_assign(dev, pa->pa_inode->i_sb->s_dev)
-               tp_assign(ino, pa->pa_inode->i_ino)
-#else
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36))
-               tp_assign(dev, sb->s_dev)
-#else
-               tp_assign(dev, ac->ac_sb->s_dev)
-#endif
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
-               tp_assign(ino, inode->i_ino)
-#else
-               tp_assign(ino, (ac && ac->ac_inode) ? ac->ac_inode->i_ino : 0)
-#endif
-#endif
-               tp_assign(block, block)
-               tp_assign(count, count)
-       ),
-
-       TP_printk("dev %d,%d ino %lu block %llu count %u",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 __entry->block, __entry->count)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, pa->pa_inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, pa->pa_inode->i_ino)
+               ctf_integer(__u64, block, block)
+               ctf_integer(__u32, count, count)
+       )
 )
 
-TRACE_EVENT(ext4_mb_release_group_pa,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0))
+LTTNG_TRACEPOINT_EVENT(ext4_mb_release_group_pa,
 
-#if (LTTNG_KERNEL_RANGE(2,6,40, 3,3,0))
-       TP_PROTO(struct ext4_prealloc_space *pa),
-
-       TP_ARGS(pa),
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
        TP_PROTO(struct super_block *sb, struct ext4_prealloc_space *pa),
 
        TP_ARGS(sb, pa),
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36))
-       TP_PROTO(struct super_block *sb,
-                struct ext4_allocation_context *ac,
-                struct ext4_prealloc_space *pa),
 
-       TP_ARGS(sb, ac, pa),
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, sb->s_dev)
+               ctf_integer(__u64, pa_pstart, pa->pa_pstart)
+               ctf_integer(__u32, pa_len, pa->pa_len)
+       )
+)
 #else
-       TP_PROTO(struct ext4_allocation_context *ac,
-                struct ext4_prealloc_space *pa),
-
-       TP_ARGS(ac, pa),
-#endif
+LTTNG_TRACEPOINT_EVENT(ext4_mb_release_group_pa,
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37))
-               __field(        ino_t,  ino                     )
-#endif
-               __field(        __u64,  pa_pstart               )
-               __field(        __u32,  pa_len                  )
-
-       ),
+       TP_PROTO(struct ext4_prealloc_space *pa),
 
-       TP_fast_assign(
-#if (LTTNG_KERNEL_RANGE(2,6,40, 3,3,0))
-               tp_assign(dev, pa->pa_inode->i_sb->s_dev)
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36))
-               tp_assign(dev, sb->s_dev)
-#else
-               tp_assign(dev, ac->ac_sb->s_dev)
-#endif
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37))
-               tp_assign(ino, (ac && ac->ac_inode) ? ac->ac_inode->i_ino : 0)
-#endif
-               tp_assign(pa_pstart, pa->pa_pstart)
-               tp_assign(pa_len, pa->pa_len)
-       ),
+       TP_ARGS(pa),
 
-       TP_printk("dev %d,%d pstart %llu len %u",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 __entry->pa_pstart, __entry->pa_len)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, pa->pa_inode->i_sb->s_dev)
+               ctf_integer(__u64, pa_pstart, pa->pa_pstart)
+               ctf_integer(__u32, pa_len, pa->pa_len)
+       )
 )
+#endif
 
-TRACE_EVENT(ext4_discard_preallocations,
+LTTNG_TRACEPOINT_EVENT(ext4_discard_preallocations,
        TP_PROTO(struct inode *inode),
 
        TP_ARGS(inode),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-       ),
-
-       TP_printk("dev %d,%d ino %lu",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+       )
 )
 
-TRACE_EVENT(ext4_mb_discard_preallocations,
+LTTNG_TRACEPOINT_EVENT(ext4_mb_discard_preallocations,
        TP_PROTO(struct super_block *sb, int needed),
 
        TP_ARGS(sb, needed),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        int,    needed                  )
-
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, sb->s_dev)
-               tp_assign(needed, needed)
-       ),
-
-       TP_printk("dev %d,%d needed %d",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 __entry->needed)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, sb->s_dev)
+               ctf_integer(int, needed, needed)
+       )
 )
 
-TRACE_EVENT(ext4_request_blocks,
+LTTNG_TRACEPOINT_EVENT(ext4_request_blocks,
        TP_PROTO(struct ext4_allocation_request *ar),
 
        TP_ARGS(ar),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        unsigned int, len               )
-               __field(        __u32,  logical                 )
-               __field(        __u32,  lleft                   )
-               __field(        __u32,  lright                  )
-               __field(        __u64,  goal                    )
-               __field(        __u64,  pleft                   )
-               __field(        __u64,  pright                  )
-               __field(        unsigned int, flags             )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, ar->inode->i_sb->s_dev)
-               tp_assign(ino, ar->inode->i_ino)
-               tp_assign(len, ar->len)
-               tp_assign(logical, ar->logical)
-               tp_assign(goal, ar->goal)
-               tp_assign(lleft, ar->lleft)
-               tp_assign(lright, ar->lright)
-               tp_assign(pleft, ar->pleft)
-               tp_assign(pright, ar->pright)
-               tp_assign(flags, ar->flags)
-       ),
-
-       TP_printk("dev %d,%d ino %lu flags %u len %u lblk %u goal %llu "
-                 "lleft %u lright %u pleft %llu pright %llu ",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino, __entry->flags,
-                 __entry->len, __entry->logical, __entry->goal,
-                 __entry->lleft, __entry->lright, __entry->pleft,
-                 __entry->pright)
-)
-
-TRACE_EVENT(ext4_allocate_blocks,
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, ar->inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, ar->inode->i_ino)
+               ctf_integer(unsigned int, len, ar->len)
+               ctf_integer(__u32, logical, ar->logical)
+               ctf_integer(__u32, lleft, ar->lleft)
+               ctf_integer(__u32, lright, ar->lright)
+               ctf_integer(__u64, goal, ar->goal)
+               ctf_integer(__u64, pleft, ar->pleft)
+               ctf_integer(__u64, pright, ar->pright)
+               ctf_integer(unsigned int, flags, ar->flags)
+       )
+)
+
+LTTNG_TRACEPOINT_EVENT(ext4_allocate_blocks,
        TP_PROTO(struct ext4_allocation_request *ar, unsigned long long block),
 
        TP_ARGS(ar, block),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        __u64,  block                   )
-               __field(        unsigned int, len               )
-               __field(        __u32,  logical                 )
-               __field(        __u32,  lleft                   )
-               __field(        __u32,  lright                  )
-               __field(        __u64,  goal                    )
-               __field(        __u64,  pleft                   )
-               __field(        __u64,  pright                  )
-               __field(        unsigned int, flags             )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, ar->inode->i_sb->s_dev)
-               tp_assign(ino, ar->inode->i_ino)
-               tp_assign(block, block)
-               tp_assign(len, ar->len)
-               tp_assign(logical, ar->logical)
-               tp_assign(goal, ar->goal)
-               tp_assign(lleft, ar->lleft)
-               tp_assign(lright, ar->lright)
-               tp_assign(pleft, ar->pleft)
-               tp_assign(pright, ar->pright)
-               tp_assign(flags, ar->flags)
-       ),
-
-       TP_printk("dev %d,%d ino %lu flags %u len %u block %llu lblk %u "
-                 "goal %llu lleft %u lright %u pleft %llu pright %llu",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino, __entry->flags,
-                 __entry->len, __entry->block, __entry->logical,
-                 __entry->goal,  __entry->lleft, __entry->lright,
-                 __entry->pleft, __entry->pright)
-)
-
-TRACE_EVENT(ext4_free_blocks,
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, ar->inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, ar->inode->i_ino)
+               ctf_integer(__u64, block, block)
+               ctf_integer(unsigned int, len, ar->len)
+               ctf_integer(__u32, logical, ar->logical)
+               ctf_integer(__u32, lleft, ar->lleft)
+               ctf_integer(__u32, lright, ar->lright)
+               ctf_integer(__u64, goal, ar->goal)
+               ctf_integer(__u64, pleft, ar->pleft)
+               ctf_integer(__u64, pright, ar->pright)
+               ctf_integer(unsigned int, flags, ar->flags)
+       )
+)
+
+LTTNG_TRACEPOINT_EVENT(ext4_free_blocks,
        TP_PROTO(struct inode *inode, __u64 block, unsigned long count,
                 int flags),
 
        TP_ARGS(inode, block, count, flags),
-#else
-       TP_PROTO(struct inode *inode, __u64 block, unsigned long count,
-                int metadata),
-
-       TP_ARGS(inode, block, count, metadata),
-#endif
-
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        __u64,  block                   )
-               __field(        unsigned long,  count           )
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
-               __field(        int,    flags                   )
-               __field(        TP_MODE_T, mode                 )
-#else
-               __field(        int,    metadata                )
-#endif
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(block, block)
-               tp_assign(count, count)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
-               tp_assign(flags, flags)
-               tp_assign(mode, inode->i_mode)
-#else
-               tp_assign(metadata, metadata)
-#endif
-       ),
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
-       TP_printk("dev %d,%d ino %lu mode 0%o block %llu count %lu flags %d",
-#else
-       TP_printk("dev %d,%d ino %lu block %llu count %lu metadata %d",
-#endif
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
-                 __entry->mode, __entry->block, __entry->count,
-                 __entry->flags)
-#else
-                 __entry->block, __entry->count, __entry->metadata)
-#endif
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(__u64, block, block)
+               ctf_integer(unsigned long, count, count)
+               ctf_integer(int, flags, flags)
+               ctf_integer(TP_MODE_T, mode, inode->i_mode)
+       )
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
-TRACE_EVENT(ext4_sync_file_enter,
-#else
-TRACE_EVENT(ext4_sync_file,
-#endif
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
+LTTNG_TRACEPOINT_EVENT(ext4_sync_file_enter,
        TP_PROTO(struct file *file, int datasync),
 
        TP_ARGS(file, datasync),
-#else
-       TP_PROTO(struct file *file, struct dentry *dentry, int datasync),
-
-       TP_ARGS(file, dentry, datasync),
-#endif
-
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        ino_t,  parent                  )
-               __field(        int,    datasync                )
-       ),
-
-       TP_fast_assign(
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
-               tp_assign(dev, file->f_path.dentry->d_inode->i_sb->s_dev)
-               tp_assign(ino, file->f_path.dentry->d_inode->i_ino)
-               tp_assign(datasync, datasync)
-               tp_assign(parent, file->f_path.dentry->d_parent->d_inode->i_ino)
-#else
-               tp_assign(dev, dentry->d_inode->i_sb->s_dev)
-               tp_assign(ino, dentry->d_inode->i_ino)
-               tp_assign(datasync, datasync)
-               tp_assign(parent, dentry->d_parent->d_inode->i_ino)
-#endif
-       ),
 
-       TP_printk("dev %d,%d ino %lu parent %lu datasync %d ",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 (unsigned long) __entry->parent, __entry->datasync)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, file->f_path.dentry->d_inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, file->f_path.dentry->d_inode->i_ino)
+               ctf_integer(ino_t, parent, file->f_path.dentry->d_parent->d_inode->i_ino)
+               ctf_integer(int, datasync, datasync)
+       )
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
-TRACE_EVENT(ext4_sync_file_exit,
+LTTNG_TRACEPOINT_EVENT(ext4_sync_file_exit,
        TP_PROTO(struct inode *inode, int ret),
 
        TP_ARGS(inode, ret),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        int,    ret                     )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(ret, ret)
-       ),
-
-       TP_printk("dev %d,%d ino %lu ret %d",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 __entry->ret)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(int, ret, ret)
+       )
 )
-#endif
 
-TRACE_EVENT(ext4_sync_fs,
+LTTNG_TRACEPOINT_EVENT(ext4_sync_fs,
        TP_PROTO(struct super_block *sb, int wait),
 
        TP_ARGS(sb, wait),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        int,    wait                    )
-
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, sb->s_dev)
-               tp_assign(wait, wait)
-       ),
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, sb->s_dev)
+               ctf_integer(int, wait, wait)
 
-       TP_printk("dev %d,%d wait %d",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 __entry->wait)
+       )
 )
 
-TRACE_EVENT(ext4_alloc_da_blocks,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,13,0))
+LTTNG_TRACEPOINT_EVENT(ext4_alloc_da_blocks,
        TP_PROTO(struct inode *inode),
 
        TP_ARGS(inode),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field( unsigned int,  data_blocks     )
-               __field( unsigned int,  meta_blocks     )
-       ),
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(unsigned int, data_blocks, EXT4_I(inode)->i_reserved_data_blocks)
+       )
+)
+#else
+LTTNG_TRACEPOINT_EVENT(ext4_alloc_da_blocks,
+       TP_PROTO(struct inode *inode),
 
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(data_blocks, EXT4_I(inode)->i_reserved_data_blocks)
-               tp_assign(meta_blocks, EXT4_I(inode)->i_reserved_meta_blocks)
-       ),
+       TP_ARGS(inode),
 
-       TP_printk("dev %d,%d ino %lu data_blocks %u meta_blocks %u",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 __entry->data_blocks, __entry->meta_blocks)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(unsigned int, data_blocks, EXT4_I(inode)->i_reserved_data_blocks)
+               ctf_integer(unsigned int, meta_blocks, EXT4_I(inode)->i_reserved_meta_blocks)
+       )
 )
+#endif
 
-TRACE_EVENT(ext4_mballoc_alloc,
+LTTNG_TRACEPOINT_EVENT(ext4_mballoc_alloc,
        TP_PROTO(struct ext4_allocation_context *ac),
 
        TP_ARGS(ac),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        __u32,  orig_logical            )
-               __field(          int,  orig_start              )
-               __field(        __u32,  orig_group              )
-               __field(          int,  orig_len                )
-               __field(        __u32,  goal_logical            )
-               __field(          int,  goal_start              )
-               __field(        __u32,  goal_group              )
-               __field(          int,  goal_len                )
-               __field(        __u32,  result_logical          )
-               __field(          int,  result_start            )
-               __field(        __u32,  result_group            )
-               __field(          int,  result_len              )
-               __field(        __u16,  found                   )
-               __field(        __u16,  groups                  )
-               __field(        __u16,  buddy                   )
-               __field(        __u16,  flags                   )
-               __field(        __u16,  tail                    )
-               __field(        __u8,   cr                      )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, ac->ac_inode->i_sb->s_dev)
-               tp_assign(ino, ac->ac_inode->i_ino)
-               tp_assign(orig_logical, ac->ac_o_ex.fe_logical)
-               tp_assign(orig_start, ac->ac_o_ex.fe_start)
-               tp_assign(orig_group, ac->ac_o_ex.fe_group)
-               tp_assign(orig_len, ac->ac_o_ex.fe_len)
-               tp_assign(goal_logical, ac->ac_g_ex.fe_logical)
-               tp_assign(goal_start, ac->ac_g_ex.fe_start)
-               tp_assign(goal_group, ac->ac_g_ex.fe_group)
-               tp_assign(goal_len, ac->ac_g_ex.fe_len)
-               tp_assign(result_logical, ac->ac_f_ex.fe_logical)
-               tp_assign(result_start, ac->ac_f_ex.fe_start)
-               tp_assign(result_group, ac->ac_f_ex.fe_group)
-               tp_assign(result_len, ac->ac_f_ex.fe_len)
-               tp_assign(found, ac->ac_found)
-               tp_assign(flags, ac->ac_flags)
-               tp_assign(groups, ac->ac_groups_scanned)
-               tp_assign(buddy, ac->ac_buddy)
-               tp_assign(tail, ac->ac_tail)
-               tp_assign(cr, ac->ac_criteria)
-       ),
-
-       TP_printk("dev %d,%d inode %lu orig %u/%d/%u@%u goal %u/%d/%u@%u "
-                 "result %u/%d/%u@%u blks %u grps %u cr %u flags 0x%04x "
-                 "tail %u broken %u",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 __entry->orig_group, __entry->orig_start,
-                 __entry->orig_len, __entry->orig_logical,
-                 __entry->goal_group, __entry->goal_start,
-                 __entry->goal_len, __entry->goal_logical,
-                 __entry->result_group, __entry->result_start,
-                 __entry->result_len, __entry->result_logical,
-                 __entry->found, __entry->groups, __entry->cr,
-                 __entry->flags, __entry->tail,
-                 __entry->buddy ? 1 << __entry->buddy : 0)
-)
-
-TRACE_EVENT(ext4_mballoc_prealloc,
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, ac->ac_inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, ac->ac_inode->i_ino)
+               ctf_integer(__u32, orig_logical, ac->ac_o_ex.fe_logical)
+               ctf_integer(int, orig_start, ac->ac_o_ex.fe_start)
+               ctf_integer(__u32, orig_group, ac->ac_o_ex.fe_group)
+               ctf_integer(int, orig_len, ac->ac_o_ex.fe_len)
+               ctf_integer(__u32, goal_logical, ac->ac_g_ex.fe_logical)
+               ctf_integer(int, goal_start, ac->ac_g_ex.fe_start)
+               ctf_integer(__u32, goal_group, ac->ac_g_ex.fe_group)
+               ctf_integer(int, goal_len, ac->ac_g_ex.fe_len)
+               ctf_integer(__u32, result_logical, ac->ac_f_ex.fe_logical)
+               ctf_integer(int, result_start, ac->ac_f_ex.fe_start)
+               ctf_integer(__u32, result_group, ac->ac_f_ex.fe_group)
+               ctf_integer(int, result_len, ac->ac_f_ex.fe_len)
+               ctf_integer(__u16, found, ac->ac_found)
+               ctf_integer(__u16, groups, ac->ac_groups_scanned)
+               ctf_integer(__u16, buddy, ac->ac_buddy)
+               ctf_integer(__u16, flags, ac->ac_flags)
+               ctf_integer(__u16, tail, ac->ac_tail)
+               ctf_integer(__u8, cr, ac->ac_criteria)
+       )
+)
+
+LTTNG_TRACEPOINT_EVENT(ext4_mballoc_prealloc,
        TP_PROTO(struct ext4_allocation_context *ac),
 
        TP_ARGS(ac),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        __u32,  orig_logical            )
-               __field(          int,  orig_start              )
-               __field(        __u32,  orig_group              )
-               __field(          int,  orig_len                )
-               __field(        __u32,  result_logical          )
-               __field(          int,  result_start            )
-               __field(        __u32,  result_group            )
-               __field(          int,  result_len              )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, ac->ac_inode->i_sb->s_dev)
-               tp_assign(ino, ac->ac_inode->i_ino)
-               tp_assign(orig_logical, ac->ac_o_ex.fe_logical)
-               tp_assign(orig_start, ac->ac_o_ex.fe_start)
-               tp_assign(orig_group, ac->ac_o_ex.fe_group)
-               tp_assign(orig_len, ac->ac_o_ex.fe_len)
-               tp_assign(result_logical, ac->ac_b_ex.fe_logical)
-               tp_assign(result_start, ac->ac_b_ex.fe_start)
-               tp_assign(result_group, ac->ac_b_ex.fe_group)
-               tp_assign(result_len, ac->ac_b_ex.fe_len)
-       ),
-
-       TP_printk("dev %d,%d inode %lu orig %u/%d/%u@%u result %u/%d/%u@%u",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 __entry->orig_group, __entry->orig_start,
-                 __entry->orig_len, __entry->orig_logical,
-                 __entry->result_group, __entry->result_start,
-                 __entry->result_len, __entry->result_logical)
-)
-
-DECLARE_EVENT_CLASS(ext4__mballoc,
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, ac->ac_inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, ac->ac_inode->i_ino)
+               ctf_integer(__u32, orig_logical, ac->ac_o_ex.fe_logical)
+               ctf_integer(int, orig_start, ac->ac_o_ex.fe_start)
+               ctf_integer(__u32, orig_group, ac->ac_o_ex.fe_group)
+               ctf_integer(int, orig_len, ac->ac_o_ex.fe_len)
+               ctf_integer(__u32, result_logical, ac->ac_b_ex.fe_logical)
+               ctf_integer(int, result_start, ac->ac_b_ex.fe_start)
+               ctf_integer(__u32, result_group, ac->ac_b_ex.fe_group)
+               ctf_integer(int, result_len, ac->ac_b_ex.fe_len)
+       )
+)
+
+LTTNG_TRACEPOINT_EVENT_CLASS(ext4__mballoc,
        TP_PROTO(struct super_block *sb,
                 struct inode *inode,
                 ext4_group_t group,
@@ -1220,59 +657,18 @@ DECLARE_EVENT_CLASS(ext4__mballoc,
                 ext4_grpblk_t len),
 
        TP_ARGS(sb, inode, group, start, len),
-#else
-       TP_PROTO(struct ext4_allocation_context *ac),
 
-       TP_ARGS(ac),
-#endif
-
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37))
-               __field(        __u32,  result_logical          )
-#endif
-               __field(          int,  result_start            )
-               __field(        __u32,  result_group            )
-               __field(          int,  result_len              )
-       ),
-
-       TP_fast_assign(
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
-               tp_assign(dev, sb->s_dev)
-               tp_assign(ino, inode ? inode->i_ino : 0)
-               tp_assign(result_start, start)
-               tp_assign(result_group, group)
-               tp_assign(result_len, len)
-#else
-               tp_assign(dev, ac->ac_sb->s_dev)
-               tp_assign(ino, ac->ac_inode ? ac->ac_inode->i_ino : 0)
-               tp_assign(result_logical, ac->ac_b_ex.fe_logical)
-               tp_assign(result_start, ac->ac_b_ex.fe_start)
-               tp_assign(result_group, ac->ac_b_ex.fe_group)
-               tp_assign(result_len, ac->ac_b_ex.fe_len)
-#endif
-       ),
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
-       TP_printk("dev %d,%d inode %lu extent %u/%d/%d ",
-#else
-       TP_printk("dev %d,%d inode %lu extent %u/%d/%u@%u ",
-#endif
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 __entry->result_group, __entry->result_start,
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
-                 __entry->result_len
-#else
-                 __entry->result_len, __entry->result_logical
-#endif
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, sb->s_dev)
+               ctf_integer(ino_t, ino, inode ? inode->i_ino : 0)
+               ctf_integer(int, result_start, start)
+               ctf_integer(__u32, result_group, group)
+               ctf_integer(int, result_len, len)
        )
 )
 
-DEFINE_EVENT(ext4__mballoc, ext4_mballoc_discard,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__mballoc, ext4_mballoc_discard,
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
        TP_PROTO(struct super_block *sb,
                 struct inode *inode,
                 ext4_group_t group,
@@ -1280,16 +676,10 @@ DEFINE_EVENT(ext4__mballoc, ext4_mballoc_discard,
                 ext4_grpblk_t len),
 
        TP_ARGS(sb, inode, group, start, len)
-#else
-       TP_PROTO(struct ext4_allocation_context *ac),
-
-       TP_ARGS(ac)
-#endif
 )
 
-DEFINE_EVENT(ext4__mballoc, ext4_mballoc_free,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__mballoc, ext4_mballoc_free,
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
        TP_PROTO(struct super_block *sb,
                 struct inode *inode,
                 ext4_group_t group,
@@ -1297,428 +687,373 @@ DEFINE_EVENT(ext4__mballoc, ext4_mballoc_free,
                 ext4_grpblk_t len),
 
        TP_ARGS(sb, inode, group, start, len)
-#else
-       TP_PROTO(struct ext4_allocation_context *ac),
-
-       TP_ARGS(ac)
-#endif
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
-TRACE_EVENT(ext4_forget,
+LTTNG_TRACEPOINT_EVENT(ext4_forget,
        TP_PROTO(struct inode *inode, int is_metadata, __u64 block),
 
        TP_ARGS(inode, is_metadata, block),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        __u64,  block                   )
-               __field(        int,    is_metadata             )
-               __field(        TP_MODE_T, mode                 )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(block, block)
-               tp_assign(is_metadata, is_metadata)
-               tp_assign(mode, inode->i_mode)
-       ),
-
-       TP_printk("dev %d,%d ino %lu mode 0%o is_metadata %d block %llu",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 __entry->mode, __entry->is_metadata, __entry->block)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(__u64, block, block)
+               ctf_integer(int, is_metadata, is_metadata)
+               ctf_integer(TP_MODE_T, mode, inode->i_mode)
+       )
 )
-#endif
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
-TRACE_EVENT(ext4_da_update_reserve_space,
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,13,0))
+LTTNG_TRACEPOINT_EVENT(ext4_da_update_reserve_space,
        TP_PROTO(struct inode *inode, int used_blocks, int quota_claim),
 
        TP_ARGS(inode, used_blocks, quota_claim),
-#else
-       TP_PROTO(struct inode *inode, int used_blocks),
 
-       TP_ARGS(inode, used_blocks),
-#endif
-
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        __u64,  i_blocks                )
-               __field(        int,    used_blocks             )
-               __field(        int,    reserved_data_blocks    )
-               __field(        int,    reserved_meta_blocks    )
-               __field(        int,    allocated_meta_blocks   )
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
-               __field(        int,    quota_claim             )
-#endif
-               __field(        TP_MODE_T, mode                 )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(i_blocks, inode->i_blocks)
-               tp_assign(used_blocks, used_blocks)
-               tp_assign(reserved_data_blocks,
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(__u64, i_blocks, inode->i_blocks)
+               ctf_integer(int, used_blocks, used_blocks)
+               ctf_integer(int, reserved_data_blocks,
                                EXT4_I(inode)->i_reserved_data_blocks)
-               tp_assign(reserved_meta_blocks,
-                               EXT4_I(inode)->i_reserved_meta_blocks)
-               tp_assign(allocated_meta_blocks,
-                               EXT4_I(inode)->i_allocated_meta_blocks)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
-               tp_assign(quota_claim, quota_claim)
-#endif
-               tp_assign(mode, inode->i_mode)
-       ),
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
-       TP_printk("dev %d,%d ino %lu mode 0%o i_blocks %llu used_blocks %d "
-                 "reserved_data_blocks %d reserved_meta_blocks %d "
-                 "allocated_meta_blocks %d quota_claim %d",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 __entry->mode, __entry->i_blocks,
-                 __entry->used_blocks, __entry->reserved_data_blocks,
-                 __entry->reserved_meta_blocks, __entry->allocated_meta_blocks,
-                 __entry->quota_claim)
-#else
-       TP_printk("dev %d,%d ino %lu mode 0%o i_blocks %llu used_blocks %d "
-                 "reserved_data_blocks %d reserved_meta_blocks %d "
-                 "allocated_meta_blocks %d",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 __entry->mode, __entry->i_blocks,
-                 __entry->used_blocks, __entry->reserved_data_blocks,
-                 __entry->reserved_meta_blocks, __entry->allocated_meta_blocks)
-#endif
+               ctf_integer(int, quota_claim, quota_claim)
+               ctf_integer(TP_MODE_T, mode, inode->i_mode)
+       )
 )
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
+LTTNG_TRACEPOINT_EVENT(ext4_da_update_reserve_space,
+       TP_PROTO(struct inode *inode, int used_blocks, int quota_claim),
 
-TRACE_EVENT(ext4_da_reserve_space,
-       TP_PROTO(struct inode *inode, int md_needed),
-
-       TP_ARGS(inode, md_needed),
+       TP_ARGS(inode, used_blocks, quota_claim),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        __u64,  i_blocks                )
-               __field(        int,    md_needed               )
-               __field(        int,    reserved_data_blocks    )
-               __field(        int,    reserved_meta_blocks    )
-               __field(        TP_MODE_T, mode                 )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(i_blocks, inode->i_blocks)
-               tp_assign(md_needed, md_needed)
-               tp_assign(reserved_data_blocks,
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(__u64, i_blocks, inode->i_blocks)
+               ctf_integer(int, used_blocks, used_blocks)
+               ctf_integer(int, reserved_data_blocks,
                                EXT4_I(inode)->i_reserved_data_blocks)
-               tp_assign(reserved_meta_blocks,
+               ctf_integer(int, reserved_meta_blocks,
                                EXT4_I(inode)->i_reserved_meta_blocks)
-               tp_assign(mode, inode->i_mode)
-       ),
-
-       TP_printk("dev %d,%d ino %lu mode 0%o i_blocks %llu md_needed %d "
-                 "reserved_data_blocks %d reserved_meta_blocks %d",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 __entry->mode, __entry->i_blocks,
-                 __entry->md_needed, __entry->reserved_data_blocks,
-                 __entry->reserved_meta_blocks)
+               ctf_integer(int, allocated_meta_blocks,
+                               EXT4_I(inode)->i_allocated_meta_blocks)
+               ctf_integer(int, quota_claim, quota_claim)
+               ctf_integer(TP_MODE_T, mode, inode->i_mode)
+       )
 )
+#else
+LTTNG_TRACEPOINT_EVENT(ext4_da_update_reserve_space,
+       TP_PROTO(struct inode *inode, int used_blocks),
 
-TRACE_EVENT(ext4_da_release_space,
-       TP_PROTO(struct inode *inode, int freed_blocks),
-
-       TP_ARGS(inode, freed_blocks),
+       TP_ARGS(inode, used_blocks),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        __u64,  i_blocks                )
-               __field(        int,    freed_blocks            )
-               __field(        int,    reserved_data_blocks    )
-               __field(        int,    reserved_meta_blocks    )
-               __field(        int,    allocated_meta_blocks   )
-               __field(        TP_MODE_T, mode                 )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(i_blocks, inode->i_blocks)
-               tp_assign(freed_blocks, freed_blocks)
-               tp_assign(reserved_data_blocks,
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(__u64, i_blocks, inode->i_blocks)
+               ctf_integer(int, used_blocks, used_blocks)
+               ctf_integer(int, reserved_data_blocks,
                                EXT4_I(inode)->i_reserved_data_blocks)
-               tp_assign(reserved_meta_blocks,
+               ctf_integer(int, reserved_meta_blocks,
                                EXT4_I(inode)->i_reserved_meta_blocks)
-               tp_assign(allocated_meta_blocks,
+               ctf_integer(int, allocated_meta_blocks,
                                EXT4_I(inode)->i_allocated_meta_blocks)
-               tp_assign(mode, inode->i_mode)
-       ),
-
-       TP_printk("dev %d,%d ino %lu mode 0%o i_blocks %llu freed_blocks %d "
-                 "reserved_data_blocks %d reserved_meta_blocks %d "
-                 "allocated_meta_blocks %d",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 __entry->mode, __entry->i_blocks,
-                 __entry->freed_blocks, __entry->reserved_data_blocks,
-                 __entry->reserved_meta_blocks, __entry->allocated_meta_blocks)
+               ctf_integer(TP_MODE_T, mode, inode->i_mode)
+       )
 )
 #endif
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
-DECLARE_EVENT_CLASS(ext4__bitmap_load,
-       TP_PROTO(struct super_block *sb, unsigned long group),
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,13,0))
+LTTNG_TRACEPOINT_EVENT(ext4_da_reserve_space,
+       TP_PROTO(struct inode *inode),
 
-       TP_ARGS(sb, group),
+       TP_ARGS(inode),
+
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(__u64, i_blocks, inode->i_blocks)
+               ctf_integer(int, reserved_data_blocks,
+                               EXT4_I(inode)->i_reserved_data_blocks)
+               ctf_integer(TP_MODE_T, mode, inode->i_mode)
+       )
+)
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0))
+LTTNG_TRACEPOINT_EVENT(ext4_da_reserve_space,
+       TP_PROTO(struct inode *inode),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        __u32,  group                   )
+       TP_ARGS(inode),
 
-       ),
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(__u64, i_blocks, inode->i_blocks)
+               ctf_integer(int, reserved_data_blocks,
+                               EXT4_I(inode)->i_reserved_data_blocks)
+               ctf_integer(int, reserved_meta_blocks,
+                               EXT4_I(inode)->i_reserved_meta_blocks)
+               ctf_integer(TP_MODE_T, mode, inode->i_mode)
+       )
+)
+#else
+LTTNG_TRACEPOINT_EVENT(ext4_da_reserve_space,
+       TP_PROTO(struct inode *inode, int md_needed),
 
-       TP_fast_assign(
-               tp_assign(dev, sb->s_dev)
-               tp_assign(group, group)
-       ),
+       TP_ARGS(inode, md_needed),
 
-       TP_printk("dev %d,%d group %u",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 __entry->group)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(__u64, i_blocks, inode->i_blocks)
+               ctf_integer(int, md_needed, md_needed)
+               ctf_integer(int, reserved_data_blocks,
+                               EXT4_I(inode)->i_reserved_data_blocks)
+               ctf_integer(int, reserved_meta_blocks,
+                               EXT4_I(inode)->i_reserved_meta_blocks)
+               ctf_integer(TP_MODE_T, mode, inode->i_mode)
+       )
 )
+#endif
 
-DEFINE_EVENT(ext4__bitmap_load, ext4_mb_bitmap_load,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,13,0))
+LTTNG_TRACEPOINT_EVENT(ext4_da_release_space,
+       TP_PROTO(struct inode *inode, int freed_blocks),
+
+       TP_ARGS(inode, freed_blocks),
+
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(__u64, i_blocks, inode->i_blocks)
+               ctf_integer(int, freed_blocks, freed_blocks)
+               ctf_integer(int, reserved_data_blocks,
+                               EXT4_I(inode)->i_reserved_data_blocks)
+               ctf_integer(TP_MODE_T, mode, inode->i_mode)
+       )
+)
+#else
+LTTNG_TRACEPOINT_EVENT(ext4_da_release_space,
+       TP_PROTO(struct inode *inode, int freed_blocks),
+
+       TP_ARGS(inode, freed_blocks),
+
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(__u64, i_blocks, inode->i_blocks)
+               ctf_integer(int, freed_blocks, freed_blocks)
+               ctf_integer(int, reserved_data_blocks,
+                               EXT4_I(inode)->i_reserved_data_blocks)
+               ctf_integer(int, reserved_meta_blocks,
+                               EXT4_I(inode)->i_reserved_meta_blocks)
+               ctf_integer(int, allocated_meta_blocks,
+                               EXT4_I(inode)->i_allocated_meta_blocks)
+               ctf_integer(TP_MODE_T, mode, inode->i_mode)
+       )
+)
+#endif
+
+LTTNG_TRACEPOINT_EVENT_CLASS(ext4__bitmap_load,
+       TP_PROTO(struct super_block *sb, unsigned long group),
+
+       TP_ARGS(sb, group),
+
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, sb->s_dev)
+               ctf_integer(__u32, group, group)
+       )
+)
+
+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__bitmap_load, ext4_mb_bitmap_load,
 
        TP_PROTO(struct super_block *sb, unsigned long group),
 
        TP_ARGS(sb, group)
 )
 
-DEFINE_EVENT(ext4__bitmap_load, ext4_mb_buddy_bitmap_load,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__bitmap_load, ext4_mb_buddy_bitmap_load,
 
        TP_PROTO(struct super_block *sb, unsigned long group),
 
        TP_ARGS(sb, group)
 )
-#endif
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
-DEFINE_EVENT(ext4__bitmap_load, ext4_read_block_bitmap_load,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__bitmap_load, ext4_read_block_bitmap_load,
 
        TP_PROTO(struct super_block *sb, unsigned long group),
 
        TP_ARGS(sb, group)
 )
 
-DEFINE_EVENT(ext4__bitmap_load, ext4_load_inode_bitmap,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__bitmap_load, ext4_load_inode_bitmap,
 
        TP_PROTO(struct super_block *sb, unsigned long group),
 
        TP_ARGS(sb, group)
 )
 
-TRACE_EVENT(ext4_direct_IO_enter,
+LTTNG_TRACEPOINT_EVENT(ext4_direct_IO_enter,
        TP_PROTO(struct inode *inode, loff_t offset, unsigned long len, int rw),
 
        TP_ARGS(inode, offset, len, rw),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        loff_t, pos                     )
-               __field(        unsigned long,  len             )
-               __field(        int,    rw                      )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(pos, offset)
-               tp_assign(len, len)
-               tp_assign(rw, rw)
-       ),
-
-       TP_printk("dev %d,%d ino %lu pos %lld len %lu rw %d",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 __entry->pos, __entry->len, __entry->rw)
-)
-
-TRACE_EVENT(ext4_direct_IO_exit,
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(loff_t, pos, offset)
+               ctf_integer(unsigned long, len, len)
+               ctf_integer(int, rw, rw)
+       )
+)
+
+LTTNG_TRACEPOINT_EVENT(ext4_direct_IO_exit,
        TP_PROTO(struct inode *inode, loff_t offset, unsigned long len,
                 int rw, int ret),
 
        TP_ARGS(inode, offset, len, rw, ret),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        loff_t, pos                     )
-               __field(        unsigned long,  len             )
-               __field(        int,    rw                      )
-               __field(        int,    ret                     )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(pos, offset)
-               tp_assign(len, len)
-               tp_assign(rw, rw)
-               tp_assign(ret, ret)
-       ),
-
-       TP_printk("dev %d,%d ino %lu pos %lld len %lu rw %d ret %d",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 __entry->pos, __entry->len,
-                 __entry->rw, __entry->ret)
-)
-
-TRACE_EVENT(ext4_fallocate_enter,
-       TP_PROTO(struct inode *inode, loff_t offset, loff_t len, int mode),
-
-       TP_ARGS(inode, offset, len, mode),
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(loff_t, pos, offset)
+               ctf_integer(unsigned long, len, len)
+               ctf_integer(int, rw, rw)
+               ctf_integer(int, ret, ret)
+       )
+)
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        loff_t, pos                     )
-               __field(        loff_t, len                     )
-               __field(        int,    mode                    )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(pos, offset)
-               tp_assign(len, len)
-               tp_assign(mode, mode)
-       ),
-
-       TP_printk("dev %d,%d ino %lu pos %lld len %lld mode %d",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino, __entry->pos,
-                 __entry->len, __entry->mode)
-)
-
-TRACE_EVENT(ext4_fallocate_exit,
+LTTNG_TRACEPOINT_EVENT(ext4_fallocate_exit,
        TP_PROTO(struct inode *inode, loff_t offset,
                 unsigned int max_blocks, int ret),
 
        TP_ARGS(inode, offset, max_blocks, ret),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        loff_t, pos                     )
-               __field(        unsigned int,   blocks          )
-               __field(        int,    ret                     )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(pos, offset)
-               tp_assign(blocks, max_blocks)
-               tp_assign(ret, ret)
-       ),
-
-       TP_printk("dev %d,%d ino %lu pos %lld blocks %u ret %d",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 __entry->pos, __entry->blocks,
-                 __entry->ret)
-)
-
-TRACE_EVENT(ext4_unlink_enter,
-       TP_PROTO(struct inode *parent, struct dentry *dentry),
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(loff_t, pos, offset)
+               ctf_integer(unsigned int, blocks, max_blocks)
+               ctf_integer(int, ret, ret)
+       )
+)
 
-       TP_ARGS(parent, dentry),
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0))
+
+LTTNG_TRACEPOINT_EVENT_CLASS(ext4__fallocate_mode,
+       TP_PROTO(struct inode *inode, loff_t offset, loff_t len, int mode),
+
+       TP_ARGS(inode, offset, len, mode),
+
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(loff_t, pos, offset)
+               ctf_integer(loff_t, len, len)
+               ctf_integer(int, mode, mode)
+       )
+)
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        ino_t,  parent                  )
-               __field(        loff_t, size                    )
-       ),
+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__fallocate_mode, ext4_fallocate_enter,
 
-       TP_fast_assign(
-               tp_assign(dev, dentry->d_inode->i_sb->s_dev)
-               tp_assign(ino, dentry->d_inode->i_ino)
-               tp_assign(parent, parent->i_ino)
-               tp_assign(size, dentry->d_inode->i_size)
-       ),
+       TP_PROTO(struct inode *inode, loff_t offset, loff_t len, int mode),
 
-       TP_printk("dev %d,%d ino %lu size %lld parent %lu",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino, __entry->size,
-                 (unsigned long) __entry->parent)
+       TP_ARGS(inode, offset, len, mode)
 )
 
-TRACE_EVENT(ext4_unlink_exit,
-       TP_PROTO(struct dentry *dentry, int ret),
+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__fallocate_mode, ext4_punch_hole,
 
-       TP_ARGS(dentry, ret),
+       TP_PROTO(struct inode *inode, loff_t offset, loff_t len, int mode),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(        ino_t,  ino                     )
-               __field(        int,    ret                     )
-       ),
+       TP_ARGS(inode, offset, len, mode)
+)
+
+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__fallocate_mode, ext4_zero_range,
 
-       TP_fast_assign(
-               tp_assign(dev, dentry->d_inode->i_sb->s_dev)
-               tp_assign(ino, dentry->d_inode->i_ino)
-               tp_assign(ret, ret)
-       ),
+       TP_PROTO(struct inode *inode, loff_t offset, loff_t len, int mode),
 
-       TP_printk("dev %d,%d ino %lu ret %d",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 __entry->ret)
+       TP_ARGS(inode, offset, len, mode)
 )
 
-DECLARE_EVENT_CLASS(ext4__truncate,
-       TP_PROTO(struct inode *inode),
+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)) */
 
-       TP_ARGS(inode),
+LTTNG_TRACEPOINT_EVENT(ext4_fallocate_enter,
+       TP_PROTO(struct inode *inode, loff_t offset, loff_t len, int mode),
+
+       TP_ARGS(inode, offset, len, mode),
+
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(loff_t, pos, offset)
+               ctf_integer(loff_t, len, len)
+               ctf_integer(int, mode, mode)
+       )
+)
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0))
+
+LTTNG_TRACEPOINT_EVENT(ext4_punch_hole,
+       TP_PROTO(struct inode *inode, loff_t offset, loff_t len),
+
+       TP_ARGS(inode, offset, len),
+
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(loff_t, pos, offset)
+               ctf_integer(loff_t, len, len)
+       )
+)
+
+#endif /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) */
+
+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)) */
 
-       TP_STRUCT__entry(
-               __field(        dev_t,          dev             )
-               __field(        ino_t,          ino             )
-               __field(        __u64,          blocks          )
-       ),
+LTTNG_TRACEPOINT_EVENT(ext4_unlink_enter,
+       TP_PROTO(struct inode *parent, struct dentry *dentry),
 
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(blocks, inode->i_blocks)
-       ),
+       TP_ARGS(parent, dentry),
 
-       TP_printk("dev %d,%d ino %lu blocks %llu",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino, __entry->blocks)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, dentry->d_inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, dentry->d_inode->i_ino)
+               ctf_integer(ino_t, parent, parent->i_ino)
+               ctf_integer(loff_t, size, dentry->d_inode->i_size)
+       )
 )
 
-DEFINE_EVENT(ext4__truncate, ext4_truncate_enter,
+LTTNG_TRACEPOINT_EVENT(ext4_unlink_exit,
+       TP_PROTO(struct dentry *dentry, int ret),
+
+       TP_ARGS(dentry, ret),
+
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, dentry->d_inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, dentry->d_inode->i_ino)
+               ctf_integer(int, ret, ret)
+       )
+)
+
+LTTNG_TRACEPOINT_EVENT_CLASS(ext4__truncate,
+       TP_PROTO(struct inode *inode),
+
+       TP_ARGS(inode),
+
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(unsigned int, blocks, inode->i_blocks)
+       )
+)
+
+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__truncate, ext4_truncate_enter,
 
        TP_PROTO(struct inode *inode),
 
        TP_ARGS(inode)
 )
 
-DEFINE_EVENT(ext4__truncate, ext4_truncate_exit,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__truncate, ext4_truncate_exit,
 
        TP_PROTO(struct inode *inode),
 
@@ -1727,170 +1062,136 @@ DEFINE_EVENT(ext4__truncate, ext4_truncate_exit,
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
 /* 'ux' is the uninitialized extent. */
-TRACE_EVENT(ext4_ext_convert_to_initialized_enter,
+LTTNG_TRACEPOINT_EVENT(ext4_ext_convert_to_initialized_enter,
        TP_PROTO(struct inode *inode, struct ext4_map_blocks *map,
                 struct ext4_extent *ux),
 
        TP_ARGS(inode, map, ux),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,          dev     )
-               __field(        ino_t,          ino     )
-               __field(        ext4_lblk_t,    m_lblk  )
-               __field(        unsigned,       m_len   )
-               __field(        ext4_lblk_t,    u_lblk  )
-               __field(        unsigned,       u_len   )
-               __field(        ext4_fsblk_t,   u_pblk  )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(m_lblk, map->m_lblk)
-               tp_assign(m_len, map->m_len)
-               tp_assign(u_lblk, le32_to_cpu(ux->ee_block))
-               tp_assign(u_len, ext4_ext_get_actual_len(ux))
-               tp_assign(u_pblk, ext4_ext_pblock(ux))
-       ),
-
-       TP_printk("dev %d,%d ino %lu m_lblk %u m_len %u u_lblk %u u_len %u "
-                 "u_pblk %llu",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 __entry->m_lblk, __entry->m_len,
-                 __entry->u_lblk, __entry->u_len, __entry->u_pblk)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(ext4_lblk_t, m_lblk, map->m_lblk)
+               ctf_integer(unsigned, m_len, map->m_len)
+               ctf_integer(ext4_lblk_t, u_lblk, le32_to_cpu(ux->ee_block))
+               ctf_integer(unsigned, u_len, ext4_ext_get_actual_len(ux))
+               ctf_integer(ext4_fsblk_t, u_pblk, ext4_ext_pblock(ux))
+       )
 )
 
 /*
  * 'ux' is the uninitialized extent.
  * 'ix' is the initialized extent to which blocks are transferred.
  */
-TRACE_EVENT(ext4_ext_convert_to_initialized_fastpath,
+LTTNG_TRACEPOINT_EVENT(ext4_ext_convert_to_initialized_fastpath,
        TP_PROTO(struct inode *inode, struct ext4_map_blocks *map,
                 struct ext4_extent *ux, struct ext4_extent *ix),
 
        TP_ARGS(inode, map, ux, ix),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,          dev     )
-               __field(        ino_t,          ino     )
-               __field(        ext4_lblk_t,    m_lblk  )
-               __field(        unsigned,       m_len   )
-               __field(        ext4_lblk_t,    u_lblk  )
-               __field(        unsigned,       u_len   )
-               __field(        ext4_fsblk_t,   u_pblk  )
-               __field(        ext4_lblk_t,    i_lblk  )
-               __field(        unsigned,       i_len   )
-               __field(        ext4_fsblk_t,   i_pblk  )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(m_lblk, map->m_lblk)
-               tp_assign(m_len, map->m_len)
-               tp_assign(u_lblk, le32_to_cpu(ux->ee_block))
-               tp_assign(u_len, ext4_ext_get_actual_len(ux))
-               tp_assign(u_pblk, ext4_ext_pblock(ux))
-               tp_assign(i_lblk, le32_to_cpu(ix->ee_block))
-               tp_assign(i_len, ext4_ext_get_actual_len(ix))
-               tp_assign(i_pblk, ext4_ext_pblock(ix))
-       ),
-
-       TP_printk("dev %d,%d ino %lu m_lblk %u m_len %u "
-                 "u_lblk %u u_len %u u_pblk %llu "
-                 "i_lblk %u i_len %u i_pblk %llu ",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 __entry->m_lblk, __entry->m_len,
-                 __entry->u_lblk, __entry->u_len, __entry->u_pblk,
-                 __entry->i_lblk, __entry->i_len, __entry->i_pblk)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(ext4_lblk_t, m_lblk, map->m_lblk)
+               ctf_integer(unsigned, m_len, map->m_len)
+               ctf_integer(ext4_lblk_t, u_lblk, le32_to_cpu(ux->ee_block))
+               ctf_integer(unsigned, u_len, ext4_ext_get_actual_len(ux))
+               ctf_integer(ext4_fsblk_t, u_pblk, ext4_ext_pblock(ux))
+               ctf_integer(ext4_lblk_t, i_lblk, le32_to_cpu(ix->ee_block))
+               ctf_integer(unsigned, i_len, ext4_ext_get_actual_len(ix))
+               ctf_integer(ext4_fsblk_t, i_pblk, ext4_ext_pblock(ix))
+       )
 )
 #endif
 
-DECLARE_EVENT_CLASS(ext4__map_blocks_enter,
+LTTNG_TRACEPOINT_EVENT_CLASS(ext4__map_blocks_enter,
        TP_PROTO(struct inode *inode, ext4_lblk_t lblk,
                 unsigned int len, unsigned int flags),
 
        TP_ARGS(inode, lblk, len, flags),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,          dev             )
-               __field(        ino_t,          ino             )
-               __field(        ext4_lblk_t,    lblk            )
-               __field(        unsigned int,   len             )
-               __field(        unsigned int,   flags           )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(lblk, lblk)
-               tp_assign(len, len)
-               tp_assign(flags, flags)
-       ),
-
-       TP_printk("dev %d,%d ino %lu lblk %u len %u flags %u",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 __entry->lblk, __entry->len, __entry->flags)
-)
-
-DEFINE_EVENT(ext4__map_blocks_enter, ext4_ext_map_blocks_enter,
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(ext4_lblk_t, lblk, lblk)
+               ctf_integer(unsigned int, len, len)
+               ctf_integer(unsigned int, flags, flags)
+       )
+)
+
+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__map_blocks_enter, ext4_ext_map_blocks_enter,
        TP_PROTO(struct inode *inode, ext4_lblk_t lblk,
                 unsigned len, unsigned flags),
 
        TP_ARGS(inode, lblk, len, flags)
 )
 
-DEFINE_EVENT(ext4__map_blocks_enter, ext4_ind_map_blocks_enter,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__map_blocks_enter, ext4_ind_map_blocks_enter,
        TP_PROTO(struct inode *inode, ext4_lblk_t lblk,
                 unsigned len, unsigned flags),
 
        TP_ARGS(inode, lblk, len, flags)
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0))
+
+LTTNG_TRACEPOINT_EVENT_CLASS(ext4__map_blocks_exit,
+       TP_PROTO(struct inode *inode, unsigned flags, struct ext4_map_blocks *map,
+                int ret),
+
+       TP_ARGS(inode, flags, map, ret),
+
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(unsigned int, flags, flags)
+               ctf_integer(ext4_fsblk_t, pblk, map->m_pblk)
+               ctf_integer(ext4_lblk_t, lblk, map->m_lblk)
+               ctf_integer(unsigned int, len, map->m_len)
+               ctf_integer(unsigned int, mflags, map->m_flags)
+               ctf_integer(int, ret, ret)
+       )
+)
+
+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__map_blocks_exit, ext4_ext_map_blocks_exit,
+       TP_PROTO(struct inode *inode, unsigned flags,
+                struct ext4_map_blocks *map, int ret),
 
-DECLARE_EVENT_CLASS(ext4__map_blocks_exit,
+       TP_ARGS(inode, flags, map, ret)
+)
+
+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__map_blocks_exit, ext4_ind_map_blocks_exit,
+       TP_PROTO(struct inode *inode, unsigned flags,
+                struct ext4_map_blocks *map, int ret),
+
+       TP_ARGS(inode, flags, map, ret)
+)
+
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
+
+LTTNG_TRACEPOINT_EVENT_CLASS(ext4__map_blocks_exit,
        TP_PROTO(struct inode *inode, struct ext4_map_blocks *map, int ret),
 
        TP_ARGS(inode, map, ret),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,          dev             )
-               __field(        ino_t,          ino             )
-               __field(        ext4_fsblk_t,   pblk            )
-               __field(        ext4_lblk_t,    lblk            )
-               __field(        unsigned int,   len             )
-               __field(        unsigned int,   flags           )
-               __field(        int,            ret             )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(pblk, map->m_pblk)
-               tp_assign(lblk, map->m_lblk)
-               tp_assign(len, map->m_len)
-               tp_assign(flags, map->m_flags)
-               tp_assign(ret, ret)
-       ),
-
-       TP_printk("dev %d,%d ino %lu lblk %u pblk %llu len %u flags %x ret %d",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 __entry->lblk, __entry->pblk,
-                 __entry->len, __entry->flags, __entry->ret)
-)
-
-DEFINE_EVENT(ext4__map_blocks_exit, ext4_ext_map_blocks_exit,
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(ext4_fsblk_t, pblk, map->m_pblk)
+               ctf_integer(ext4_lblk_t, lblk, map->m_lblk)
+               ctf_integer(unsigned int, len, map->m_len)
+               ctf_integer(unsigned int, mflags, map->m_flags)
+               ctf_integer(int, ret, ret)
+       )
+)
+
+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__map_blocks_exit, ext4_ext_map_blocks_exit,
        TP_PROTO(struct inode *inode, struct ext4_map_blocks *map, int ret),
 
        TP_ARGS(inode, map, ret)
 )
 
-DEFINE_EVENT(ext4__map_blocks_exit, ext4_ind_map_blocks_exit,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__map_blocks_exit, ext4_ind_map_blocks_exit,
        TP_PROTO(struct inode *inode, struct ext4_map_blocks *map, int ret),
 
        TP_ARGS(inode, map, ret)
@@ -1898,45 +1199,30 @@ DEFINE_EVENT(ext4__map_blocks_exit, ext4_ind_map_blocks_exit,
 
 #else  /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) */
 
-DECLARE_EVENT_CLASS(ext4__map_blocks_exit,
+LTTNG_TRACEPOINT_EVENT_CLASS(ext4__map_blocks_exit,
        TP_PROTO(struct inode *inode, ext4_lblk_t lblk,
                 ext4_fsblk_t pblk, unsigned int len, int ret),
 
        TP_ARGS(inode, lblk, pblk, len, ret),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,          dev             )
-               __field(        ino_t,          ino             )
-               __field(        ext4_fsblk_t,   pblk            )
-               __field(        ext4_lblk_t,    lblk            )
-               __field(        unsigned int,   len             )
-               __field(        int,            ret             )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(pblk, pblk)
-               tp_assign(lblk, lblk)
-               tp_assign(len, len)
-               tp_assign(ret, ret)
-       ),
-
-       TP_printk("dev %d,%d ino %lu lblk %u pblk %llu len %u ret %d",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 __entry->lblk, __entry->pblk,
-                 __entry->len, __entry->ret)
-)
-
-DEFINE_EVENT(ext4__map_blocks_exit, ext4_ext_map_blocks_exit,
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(ext4_fsblk_t, pblk, pblk)
+               ctf_integer(ext4_lblk_t, lblk, lblk)
+               ctf_integer(unsigned int, len, len)
+               ctf_integer(int, ret, ret)
+       )
+)
+
+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__map_blocks_exit, ext4_ext_map_blocks_exit,
        TP_PROTO(struct inode *inode, ext4_lblk_t lblk,
                 ext4_fsblk_t pblk, unsigned len, int ret),
 
        TP_ARGS(inode, lblk, pblk, len, ret)
 )
 
-DEFINE_EVENT(ext4__map_blocks_exit, ext4_ind_map_blocks_exit,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__map_blocks_exit, ext4_ind_map_blocks_exit,
        TP_PROTO(struct inode *inode, ext4_lblk_t lblk,
                 ext4_fsblk_t pblk, unsigned len, int ret),
 
@@ -1945,76 +1231,102 @@ DEFINE_EVENT(ext4__map_blocks_exit, ext4_ind_map_blocks_exit,
 
 #endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) */
 
-TRACE_EVENT(ext4_ext_load_extent,
+LTTNG_TRACEPOINT_EVENT(ext4_ext_load_extent,
        TP_PROTO(struct inode *inode, ext4_lblk_t lblk, ext4_fsblk_t pblk),
 
        TP_ARGS(inode, lblk, pblk),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,          dev             )
-               __field(        ino_t,          ino             )
-               __field(        ext4_fsblk_t,   pblk            )
-               __field(        ext4_lblk_t,    lblk            )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(pblk, pblk)
-               tp_assign(lblk, lblk)
-       ),
-
-       TP_printk("dev %d,%d ino %lu lblk %u pblk %llu",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 __entry->lblk, __entry->pblk)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(ext4_fsblk_t, pblk, pblk)
+               ctf_integer(ext4_lblk_t, lblk, lblk)
+       )
 )
 
-TRACE_EVENT(ext4_load_inode,
+LTTNG_TRACEPOINT_EVENT(ext4_load_inode,
        TP_PROTO(struct inode *inode),
 
        TP_ARGS(inode),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev             )
-               __field(        ino_t,  ino             )
-       ),
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+       )
+)
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,5,0))
+
+LTTNG_TRACEPOINT_EVENT(ext4_journal_start,
+       TP_PROTO(struct super_block *sb, int blocks, int rsv_blocks,
+                int revoke_creds, unsigned long IP),
 
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-       ),
+       TP_ARGS(sb, blocks, rsv_blocks, revoke_creds, IP),
 
-       TP_printk("dev %d,%d ino %ld",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, sb->s_dev)
+               ctf_integer(unsigned long, ip, IP)
+               ctf_integer(int, blocks, blocks)
+               ctf_integer(int, rsv_blocks, rsv_blocks)
+               ctf_integer(int, revoke_creds, revoke_creds)
+       )
 )
-#endif
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0))
-TRACE_EVENT(ext4_journal_start,
-       TP_PROTO(struct super_block *sb, int nblocks, unsigned long IP),
+LTTNG_TRACEPOINT_EVENT(ext4_journal_start_reserved,
+       TP_PROTO(struct super_block *sb, int blocks, unsigned long IP),
 
-       TP_ARGS(sb, nblocks, IP),
+       TP_ARGS(sb, blocks, IP),
+
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, sb->s_dev)
+               ctf_integer(unsigned long, ip, IP)
+               ctf_integer(int, blocks, blocks)
+       )
+)
+
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0))
+
+LTTNG_TRACEPOINT_EVENT(ext4_journal_start,
+       TP_PROTO(struct super_block *sb, int blocks, int rsv_blocks,
+                unsigned long IP),
+
+       TP_ARGS(sb, blocks, rsv_blocks, IP),
+
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, sb->s_dev)
+               ctf_integer(unsigned long, ip, IP)
+               ctf_integer(int, blocks, blocks)
+               ctf_integer(int, rsv_blocks, rsv_blocks)
+       )
+)
+
+LTTNG_TRACEPOINT_EVENT(ext4_journal_start_reserved,
+       TP_PROTO(struct super_block *sb, int blocks, unsigned long IP),
+
+       TP_ARGS(sb, blocks, IP),
+
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, sb->s_dev)
+               ctf_integer(unsigned long, ip, IP)
+               ctf_integer(int, blocks, blocks)
+       )
+)
 
-       TP_STRUCT__entry(
-               __field(        dev_t,  dev                     )
-               __field(unsigned long,  ip                      )
-               __field(          int,  nblocks                 )
-       ),
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0))
 
-       TP_fast_assign(
-               tp_assign(dev, sb->s_dev)
-               tp_assign(ip, IP)
-               tp_assign(nblocks, nblocks)
-       ),
+LTTNG_TRACEPOINT_EVENT(ext4_journal_start,
+       TP_PROTO(struct super_block *sb, int nblocks, unsigned long IP),
+
+       TP_ARGS(sb, nblocks, IP),
 
-       TP_printk("dev %d,%d nblocks %d caller %pF",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 __entry->nblocks, (void *)__entry->ip)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, sb->s_dev)
+               ctf_integer(unsigned long, ip, IP)
+               ctf_integer(int, nblocks, nblocks)
+       )
 )
 
-DECLARE_EVENT_CLASS(ext4__trim,
+LTTNG_TRACEPOINT_EVENT_CLASS(ext4__trim,
        TP_PROTO(struct super_block *sb,
                 ext4_group_t group,
                 ext4_grpblk_t start,
@@ -2022,28 +1334,16 @@ DECLARE_EVENT_CLASS(ext4__trim,
 
        TP_ARGS(sb, group, start, len),
 
-       TP_STRUCT__entry(
-               __field(        int,    dev_major               )
-               __field(        int,    dev_minor               )
-               __field(        __u32,  group                   )
-               __field(        int,    start                   )
-               __field(        int,    len                     )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev_major, MAJOR(sb->s_dev))
-               tp_assign(dev_minor, MINOR(sb->s_dev))
-               tp_assign(group, group)
-               tp_assign(start, start)
-               tp_assign(len, len)
-       ),
-
-       TP_printk("dev %d,%d group %u, start %d, len %d",
-                 __entry->dev_major, __entry->dev_minor,
-                 __entry->group, __entry->start, __entry->len)
+       TP_FIELDS(
+               ctf_integer(int, dev_major, MAJOR(sb->s_dev))
+               ctf_integer(int, dev_minor, MINOR(sb->s_dev))
+               ctf_integer(__u32, group, group)
+               ctf_integer(int, start, start)
+               ctf_integer(int, len, len)
+       )
 )
 
-DEFINE_EVENT(ext4__trim, ext4_trim_extent,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__trim, ext4_trim_extent,
 
        TP_PROTO(struct super_block *sb,
                 ext4_group_t group,
@@ -2053,7 +1353,7 @@ DEFINE_EVENT(ext4__trim, ext4_trim_extent,
        TP_ARGS(sb, group, start, len)
 )
 
-DEFINE_EVENT(ext4__trim, ext4_trim_all_free,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__trim, ext4_trim_all_free,
 
        TP_PROTO(struct super_block *sb,
                 ext4_group_t group,
@@ -2066,7 +1366,7 @@ DEFINE_EVENT(ext4__trim, ext4_trim_all_free,
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
 
-TRACE_EVENT(ext4_ext_handle_uninitialized_extents,
+LTTNG_TRACEPOINT_EVENT(ext4_ext_handle_uninitialized_extents,
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
        TP_PROTO(struct inode *inode, struct ext4_map_blocks *map, int flags,
                 unsigned int allocated, ext4_fsblk_t newblock),
@@ -2079,382 +1379,490 @@ TRACE_EVENT(ext4_ext_handle_uninitialized_extents,
        TP_ARGS(inode, map, allocated, newblock),
 #endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) */
 
-       TP_STRUCT__entry(
-               __field(        dev_t,          dev             )
-               __field(        ino_t,          ino             )
-               __field(        int,            flags           )
-               __field(        ext4_lblk_t,    lblk            )
-               __field(        ext4_fsblk_t,   pblk            )
-               __field(        unsigned int,   len             )
-               __field(        unsigned int,   allocated       )
-               __field(        ext4_fsblk_t,   newblk          )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
-               tp_assign(flags, flags)
+               ctf_integer(int, flags, flags)
 #else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) */
-               tp_assign(flags, map->m_flags)
+               ctf_integer(int, flags, map->m_flags)
 #endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) */
-               tp_assign(lblk, map->m_lblk)
-               tp_assign(pblk, map->m_pblk)
-               tp_assign(len, map->m_len)
-               tp_assign(allocated, allocated)
-               tp_assign(newblk, newblock)
-       ),
-
-       TP_printk("dev %d,%d ino %lu m_lblk %u m_pblk %llu m_len %u flags %d"
-                 "allocated %d newblock %llu",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 (unsigned) __entry->lblk, (unsigned long long) __entry->pblk,
-                 __entry->len, __entry->flags,
-                 (unsigned int) __entry->allocated,
-                 (unsigned long long) __entry->newblk)
-)
-
-TRACE_EVENT(ext4_get_implied_cluster_alloc_exit,
+               ctf_integer(ext4_lblk_t, lblk, map->m_lblk)
+               ctf_integer(ext4_fsblk_t, pblk, map->m_pblk)
+               ctf_integer(unsigned int, len, map->m_len)
+               ctf_integer(unsigned int, allocated, allocated)
+               ctf_integer(ext4_fsblk_t, newblk, newblock)
+       )
+)
+
+LTTNG_TRACEPOINT_EVENT(ext4_get_implied_cluster_alloc_exit,
        TP_PROTO(struct super_block *sb, struct ext4_map_blocks *map, int ret),
 
        TP_ARGS(sb, map, ret),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,          dev     )
-               __field(        unsigned int,   flags   )
-               __field(        ext4_lblk_t,    lblk    )
-               __field(        ext4_fsblk_t,   pblk    )
-               __field(        unsigned int,   len     )
-               __field(        int,            ret     )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, sb->s_dev)
-               tp_assign(flags, map->m_flags)
-               tp_assign(lblk, map->m_lblk)
-               tp_assign(pblk, map->m_pblk)
-               tp_assign(len, map->m_len)
-               tp_assign(ret, ret)
-       ),
-
-       TP_printk("dev %d,%d m_lblk %u m_pblk %llu m_len %u m_flags %u ret %d",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 __entry->lblk, (unsigned long long) __entry->pblk,
-                 __entry->len, __entry->flags, __entry->ret)
-)
-
-TRACE_EVENT(ext4_ext_put_in_cache,
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, sb->s_dev)
+               ctf_integer(unsigned int, flags, map->m_flags)
+               ctf_integer(ext4_lblk_t, lblk, map->m_lblk)
+               ctf_integer(ext4_fsblk_t, pblk, map->m_pblk)
+               ctf_integer(unsigned int, len, map->m_len)
+               ctf_integer(int, ret, ret)
+       )
+)
+
+LTTNG_TRACEPOINT_EVENT(ext4_ext_put_in_cache,
        TP_PROTO(struct inode *inode, ext4_lblk_t lblk, unsigned int len,
                 ext4_fsblk_t start),
 
        TP_ARGS(inode, lblk, len, start),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,          dev     )
-               __field(        ino_t,          ino     )
-               __field(        ext4_lblk_t,    lblk    )
-               __field(        unsigned int,   len     )
-               __field(        ext4_fsblk_t,   start   )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(lblk, lblk)
-               tp_assign(len, len)
-               tp_assign(start, start)
-       ),
-
-       TP_printk("dev %d,%d ino %lu lblk %u len %u start %llu",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 (unsigned) __entry->lblk,
-                 __entry->len,
-                 (unsigned long long) __entry->start)
-)
-
-TRACE_EVENT(ext4_ext_in_cache,
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(ext4_lblk_t, lblk, lblk)
+               ctf_integer(unsigned int, len, len)
+               ctf_integer(ext4_fsblk_t, start, start)
+       )
+)
+
+LTTNG_TRACEPOINT_EVENT(ext4_ext_in_cache,
        TP_PROTO(struct inode *inode, ext4_lblk_t lblk, int ret),
 
        TP_ARGS(inode, lblk, ret),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,          dev     )
-               __field(        ino_t,          ino     )
-               __field(        ext4_lblk_t,    lblk    )
-               __field(        int,            ret     )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(lblk, lblk)
-               tp_assign(ret, ret)
-       ),
-
-       TP_printk("dev %d,%d ino %lu lblk %u ret %d",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 (unsigned) __entry->lblk,
-                 __entry->ret)
-
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(ext4_lblk_t, lblk, lblk)
+               ctf_integer(int, ret, ret)
+       )
 )
 
-TRACE_EVENT(ext4_find_delalloc_range,
+LTTNG_TRACEPOINT_EVENT(ext4_find_delalloc_range,
        TP_PROTO(struct inode *inode, ext4_lblk_t from, ext4_lblk_t to,
                int reverse, int found, ext4_lblk_t found_blk),
 
        TP_ARGS(inode, from, to, reverse, found, found_blk),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,          dev             )
-               __field(        ino_t,          ino             )
-               __field(        ext4_lblk_t,    from            )
-               __field(        ext4_lblk_t,    to              )
-               __field(        int,            reverse         )
-               __field(        int,            found           )
-               __field(        ext4_lblk_t,    found_blk       )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(from, from)
-               tp_assign(to, to)
-               tp_assign(reverse, reverse)
-               tp_assign(found, found)
-               tp_assign(found_blk, found_blk)
-       ),
-
-       TP_printk("dev %d,%d ino %lu from %u to %u reverse %d found %d "
-                 "(blk = %u)",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 (unsigned) __entry->from, (unsigned) __entry->to,
-                 __entry->reverse, __entry->found,
-                 (unsigned) __entry->found_blk)
-)
-
-TRACE_EVENT(ext4_get_reserved_cluster_alloc,
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(ext4_lblk_t, from, from)
+               ctf_integer(ext4_lblk_t, to, to)
+               ctf_integer(int, reverse, reverse)
+               ctf_integer(int, found, found)
+               ctf_integer(ext4_lblk_t, found_blk, found_blk)
+       )
+)
+
+LTTNG_TRACEPOINT_EVENT(ext4_get_reserved_cluster_alloc,
        TP_PROTO(struct inode *inode, ext4_lblk_t lblk, unsigned int len),
 
        TP_ARGS(inode, lblk, len),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,          dev     )
-               __field(        ino_t,          ino     )
-               __field(        ext4_lblk_t,    lblk    )
-               __field(        unsigned int,   len     )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(lblk, lblk)
-               tp_assign(len, len)
-       ),
-
-       TP_printk("dev %d,%d ino %lu lblk %u len %u",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 (unsigned) __entry->lblk,
-                 __entry->len)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(ext4_lblk_t, lblk, lblk)
+               ctf_integer(unsigned int, len, len)
+       )
 )
 
-TRACE_EVENT(ext4_ext_show_extent,
+LTTNG_TRACEPOINT_EVENT(ext4_ext_show_extent,
        TP_PROTO(struct inode *inode, ext4_lblk_t lblk, ext4_fsblk_t pblk,
                 unsigned short len),
 
        TP_ARGS(inode, lblk, pblk, len),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,          dev     )
-               __field(        ino_t,          ino     )
-               __field(        ext4_fsblk_t,   pblk    )
-               __field(        ext4_lblk_t,    lblk    )
-               __field(        unsigned short, len     )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(pblk, pblk)
-               tp_assign(lblk, lblk)
-               tp_assign(len, len)
-       ),
-
-       TP_printk("dev %d,%d ino %lu lblk %u pblk %llu len %u",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 (unsigned) __entry->lblk,
-                 (unsigned long long) __entry->pblk,
-                 (unsigned short) __entry->len)
-)
-
-TRACE_EVENT(ext4_remove_blocks,
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(ext4_fsblk_t, pblk, pblk)
+               ctf_integer(ext4_lblk_t, lblk, lblk)
+               ctf_integer(unsigned short, len, len)
+       )
+)
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0))
+
+LTTNG_TRACEPOINT_EVENT(ext4_remove_blocks,
+       TP_PROTO(struct inode *inode, struct ext4_extent *ex,
+                ext4_lblk_t from, ext4_fsblk_t to,
+                struct partial_cluster *pc),
+
+       TP_ARGS(inode, ex, from, to, pc),
+
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(ext4_lblk_t, from, from)
+               ctf_integer(ext4_lblk_t, to, to)
+               ctf_integer(ext4_fsblk_t, ee_pblk, ext4_ext_pblock(ex))
+               ctf_integer(ext4_lblk_t, ee_lblk, le32_to_cpu(ex->ee_block))
+               ctf_integer(unsigned short, ee_len, ext4_ext_get_actual_len(ex))
+               ctf_integer(ext4_fsblk_t, pc_pclu, pc->pclu)
+               ctf_integer(ext4_lblk_t, pc_lblk, pc->lblk)
+               ctf_integer(int, pc_state, pc->state)
+       )
+)
+
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0))
+
+LTTNG_TRACEPOINT_EVENT(ext4_remove_blocks,
+           TP_PROTO(struct inode *inode, struct ext4_extent *ex,
+               ext4_lblk_t from, ext4_fsblk_t to,
+               long long partial_cluster),
+
+       TP_ARGS(inode, ex, from, to, partial_cluster),
+
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(ext4_lblk_t, from, from)
+               ctf_integer(ext4_lblk_t, to, to)
+               ctf_integer(long long, partial, partial_cluster)
+               ctf_integer(ext4_fsblk_t, ee_pblk, ext4_ext_pblock(ex))
+               ctf_integer(ext4_lblk_t, ee_lblk, le32_to_cpu(ex->ee_block))
+               ctf_integer(unsigned short, ee_len, ext4_ext_get_actual_len(ex))
+       )
+)
+
+#else
+
+LTTNG_TRACEPOINT_EVENT(ext4_remove_blocks,
            TP_PROTO(struct inode *inode, struct ext4_extent *ex,
                ext4_lblk_t from, ext4_fsblk_t to,
                ext4_fsblk_t partial_cluster),
 
        TP_ARGS(inode, ex, from, to, partial_cluster),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,          dev     )
-               __field(        ino_t,          ino     )
-               __field(        ext4_lblk_t,    from    )
-               __field(        ext4_lblk_t,    to      )
-               __field(        ext4_fsblk_t,   partial )
-               __field(        ext4_fsblk_t,   ee_pblk )
-               __field(        ext4_lblk_t,    ee_lblk )
-               __field(        unsigned short, ee_len  )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(from, from)
-               tp_assign(to, to)
-               tp_assign(partial, partial_cluster)
-               tp_assign(ee_pblk, ext4_ext_pblock(ex))
-               tp_assign(ee_lblk, cpu_to_le32(ex->ee_block))
-               tp_assign(ee_len, ext4_ext_get_actual_len(ex))
-       ),
-
-       TP_printk("dev %d,%d ino %lu extent [%u(%llu), %u]"
-                 "from %u to %u partial_cluster %u",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 (unsigned) __entry->ee_lblk,
-                 (unsigned long long) __entry->ee_pblk,
-                 (unsigned short) __entry->ee_len,
-                 (unsigned) __entry->from,
-                 (unsigned) __entry->to,
-                 (unsigned) __entry->partial)
-)
-
-TRACE_EVENT(ext4_ext_rm_leaf,
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(ext4_lblk_t, from, from)
+               ctf_integer(ext4_lblk_t, to, to)
+               ctf_integer(ext4_fsblk_t, partial, partial_cluster)
+               ctf_integer(ext4_fsblk_t, ee_pblk, ext4_ext_pblock(ex))
+               ctf_integer(ext4_lblk_t, ee_lblk, le32_to_cpu(ex->ee_block))
+               ctf_integer(unsigned short, ee_len, ext4_ext_get_actual_len(ex))
+       )
+)
+
+#endif
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0))
+
+LTTNG_TRACEPOINT_EVENT(ext4_ext_rm_leaf,
+       TP_PROTO(struct inode *inode, ext4_lblk_t start,
+                struct ext4_extent *ex,
+                struct partial_cluster *pc),
+
+       TP_ARGS(inode, start, ex, pc),
+
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(ext4_lblk_t, start, start)
+               ctf_integer(ext4_lblk_t, ee_lblk, le32_to_cpu(ex->ee_block))
+               ctf_integer(ext4_fsblk_t, ee_pblk, ext4_ext_pblock(ex))
+               ctf_integer(short, ee_len, ext4_ext_get_actual_len(ex))
+               ctf_integer(ext4_fsblk_t, pc_pclu, pc->pclu)
+               ctf_integer(ext4_lblk_t, pc_lblk, pc->lblk)
+               ctf_integer(int, pc_state, pc->state)
+       )
+)
+
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0))
+
+LTTNG_TRACEPOINT_EVENT(ext4_ext_rm_leaf,
+       TP_PROTO(struct inode *inode, ext4_lblk_t start,
+                struct ext4_extent *ex,
+                long long partial_cluster),
+
+       TP_ARGS(inode, start, ex, partial_cluster),
+
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(long long, partial, partial_cluster)
+               ctf_integer(ext4_lblk_t, start, start)
+               ctf_integer(ext4_lblk_t, ee_lblk, le32_to_cpu(ex->ee_block))
+               ctf_integer(ext4_fsblk_t, ee_pblk, ext4_ext_pblock(ex))
+               ctf_integer(short, ee_len, ext4_ext_get_actual_len(ex))
+       )
+)
+
+#else
+
+LTTNG_TRACEPOINT_EVENT(ext4_ext_rm_leaf,
        TP_PROTO(struct inode *inode, ext4_lblk_t start,
                 struct ext4_extent *ex, ext4_fsblk_t partial_cluster),
 
        TP_ARGS(inode, start, ex, partial_cluster),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,          dev     )
-               __field(        ino_t,          ino     )
-               __field(        ext4_fsblk_t,   partial )
-               __field(        ext4_lblk_t,    start   )
-               __field(        ext4_lblk_t,    ee_lblk )
-               __field(        ext4_fsblk_t,   ee_pblk )
-               __field(        short,          ee_len  )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(partial, partial_cluster)
-               tp_assign(start, start)
-               tp_assign(ee_lblk, le32_to_cpu(ex->ee_block))
-               tp_assign(ee_pblk, ext4_ext_pblock(ex))
-               tp_assign(ee_len, ext4_ext_get_actual_len(ex))
-       ),
-
-       TP_printk("dev %d,%d ino %lu start_lblk %u last_extent [%u(%llu), %u]"
-                 "partial_cluster %u",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 (unsigned) __entry->start,
-                 (unsigned) __entry->ee_lblk,
-                 (unsigned long long) __entry->ee_pblk,
-                 (unsigned short) __entry->ee_len,
-                 (unsigned) __entry->partial)
-)
-
-TRACE_EVENT(ext4_ext_rm_idx,
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(long long, partial, partial_cluster)
+               ctf_integer(ext4_lblk_t, start, start)
+               ctf_integer(ext4_lblk_t, ee_lblk, le32_to_cpu(ex->ee_block))
+               ctf_integer(ext4_fsblk_t, ee_pblk, ext4_ext_pblock(ex))
+               ctf_integer(short, ee_len, ext4_ext_get_actual_len(ex))
+       )
+)
+
+#endif
+
+LTTNG_TRACEPOINT_EVENT(ext4_ext_rm_idx,
        TP_PROTO(struct inode *inode, ext4_fsblk_t pblk),
 
        TP_ARGS(inode, pblk),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,          dev     )
-               __field(        ino_t,          ino     )
-               __field(        ext4_fsblk_t,   pblk    )
-       ),
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(ext4_fsblk_t, pblk, pblk)
+       )
+)
 
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(pblk, pblk)
-       ),
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0))
 
-       TP_printk("dev %d,%d ino %lu index_pblk %llu",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 (unsigned long long) __entry->pblk)
+LTTNG_TRACEPOINT_EVENT(ext4_ext_remove_space,
+       TP_PROTO(struct inode *inode, ext4_lblk_t start,
+                ext4_lblk_t end, int depth),
+
+       TP_ARGS(inode, start, end, depth),
+
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(ext4_lblk_t, start, start)
+               ctf_integer(ext4_lblk_t, end, end)
+               ctf_integer(int, depth, depth)
+       )
 )
 
-TRACE_EVENT(ext4_ext_remove_space,
+#else
+
+LTTNG_TRACEPOINT_EVENT(ext4_ext_remove_space,
        TP_PROTO(struct inode *inode, ext4_lblk_t start, int depth),
 
        TP_ARGS(inode, start, depth),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,          dev     )
-               __field(        ino_t,          ino     )
-               __field(        ext4_lblk_t,    start   )
-               __field(        int,            depth   )
-       ),
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(ext4_lblk_t, start, start)
+               ctf_integer(int, depth, depth)
+       )
+)
+
+#endif
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0))
+
+LTTNG_TRACEPOINT_EVENT(ext4_ext_remove_space_done,
+       TP_PROTO(struct inode *inode, ext4_lblk_t start, ext4_lblk_t end,
+                int depth, struct partial_cluster *pc, __le16 eh_entries),
+
+       TP_ARGS(inode, start, end, depth, pc, eh_entries),
+
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(ext4_lblk_t, start, start)
+               ctf_integer(ext4_lblk_t, end, end)
+               ctf_integer(int, depth, depth)
+               ctf_integer(unsigned short, eh_entries, le16_to_cpu(eh_entries))
+               ctf_integer(ext4_fsblk_t, pc_pclu, pc->pclu)
+               ctf_integer(ext4_lblk_t, pc_lblk, pc->lblk)
+               ctf_integer(int, pc_state, pc->state)
+       )
+)
+
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0))
 
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(start, start)
-               tp_assign(depth, depth)
-       ),
+LTTNG_TRACEPOINT_EVENT(ext4_ext_remove_space_done,
+       TP_PROTO(struct inode *inode, ext4_lblk_t start, ext4_lblk_t end,
+                int depth, long long partial, __le16 eh_entries),
 
-       TP_printk("dev %d,%d ino %lu since %u depth %d",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 (unsigned) __entry->start,
-                 __entry->depth)
+       TP_ARGS(inode, start, end, depth, partial, eh_entries),
+
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(ext4_lblk_t, start, start)
+               ctf_integer(ext4_lblk_t, end, end)
+               ctf_integer(int, depth, depth)
+               ctf_integer(long long, partial, partial)
+               ctf_integer(unsigned short, eh_entries, le16_to_cpu(eh_entries))
+       )
 )
 
-TRACE_EVENT(ext4_ext_remove_space_done,
+#else
+
+LTTNG_TRACEPOINT_EVENT(ext4_ext_remove_space_done,
        TP_PROTO(struct inode *inode, ext4_lblk_t start, int depth,
                ext4_lblk_t partial, unsigned short eh_entries),
 
        TP_ARGS(inode, start, depth, partial, eh_entries),
 
-       TP_STRUCT__entry(
-               __field(        dev_t,          dev             )
-               __field(        ino_t,          ino             )
-               __field(        ext4_lblk_t,    start           )
-               __field(        int,            depth           )
-               __field(        ext4_lblk_t,    partial         )
-               __field(        unsigned short, eh_entries      )
-       ),
-
-       TP_fast_assign(
-               tp_assign(dev, inode->i_sb->s_dev)
-               tp_assign(ino, inode->i_ino)
-               tp_assign(start, start)
-               tp_assign(depth, depth)
-               tp_assign(partial, partial)
-               tp_assign(eh_entries, eh_entries)
-       ),
-
-       TP_printk("dev %d,%d ino %lu since %u depth %d partial %u "
-                 "remaining_entries %u",
-                 MAJOR(__entry->dev), MINOR(__entry->dev),
-                 (unsigned long) __entry->ino,
-                 (unsigned) __entry->start,
-                 __entry->depth,
-                 (unsigned) __entry->partial,
-                 (unsigned short) __entry->eh_entries)
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(ext4_lblk_t, start, start)
+               ctf_integer(int, depth, depth)
+               ctf_integer(ext4_lblk_t, partial, partial)
+               ctf_integer(unsigned short, eh_entries, eh_entries)
+       )
 )
+
+#endif
+
+#endif
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0))
+
+LTTNG_TRACEPOINT_EVENT_CLASS(ext4__es_extent,
+       TP_PROTO(struct inode *inode, struct extent_status *es),
+
+       TP_ARGS(inode, es),
+
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(ext4_lblk_t, lblk, es->es_lblk)
+               ctf_integer(ext4_lblk_t, len, es->es_len)
+               ctf_integer(ext4_fsblk_t, pblk, ext4_es_pblock(es))
+               ctf_integer(char, status, ext4_es_status(es))
+       )
+)
+
+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__es_extent, ext4_es_insert_extent,
+       TP_PROTO(struct inode *inode, struct extent_status *es),
+
+       TP_ARGS(inode, es)
+)
+
+LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__es_extent, ext4_es_cache_extent,
+       TP_PROTO(struct inode *inode, struct extent_status *es),
+
+       TP_ARGS(inode, es)
+)
+
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0))
+
+LTTNG_TRACEPOINT_EVENT(ext4_es_insert_extent,
+       TP_PROTO(struct inode *inode, struct extent_status *es),
+
+       TP_ARGS(inode, es),
+
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(ext4_lblk_t, lblk, es->es_lblk)
+               ctf_integer(ext4_lblk_t, len, es->es_len)
+               ctf_integer(ext4_fsblk_t, pblk, ext4_es_pblock(es))
+               ctf_integer(char, status, ext4_es_status(es) >> 60)
+       )
+)
+
+LTTNG_TRACEPOINT_EVENT(ext4_es_remove_extent,
+       TP_PROTO(struct inode *inode, ext4_lblk_t lblk, ext4_lblk_t len),
+
+       TP_ARGS(inode, lblk, len),
+
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(loff_t, lblk, lblk)
+               ctf_integer(loff_t, len, len)
+       )
+)
+
+LTTNG_TRACEPOINT_EVENT(ext4_es_find_delayed_extent_range_enter,
+       TP_PROTO(struct inode *inode, ext4_lblk_t lblk),
+
+       TP_ARGS(inode, lblk),
+
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(ext4_lblk_t, lblk, lblk)
+       )
+)
+
+LTTNG_TRACEPOINT_EVENT(ext4_es_find_delayed_extent_range_exit,
+       TP_PROTO(struct inode *inode, struct extent_status *es),
+
+       TP_ARGS(inode, es),
+
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(ext4_lblk_t, lblk, es->es_lblk)
+               ctf_integer(ext4_lblk_t, len, es->es_len)
+               ctf_integer(ext4_fsblk_t, pblk, ext4_es_pblock(es))
+               ctf_integer(char, status, ext4_es_status(es) >> 60)
+       )
+)
+
+LTTNG_TRACEPOINT_EVENT(ext4_es_lookup_extent_enter,
+       TP_PROTO(struct inode *inode, ext4_lblk_t lblk),
+
+       TP_ARGS(inode, lblk),
+
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(ext4_lblk_t, lblk, lblk)
+       )
+)
+
+LTTNG_TRACEPOINT_EVENT(ext4_es_lookup_extent_exit,
+       TP_PROTO(struct inode *inode, struct extent_status *es,
+                int found),
+
+       TP_ARGS(inode, es, found),
+
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(ext4_lblk_t, lblk, es->es_lblk)
+               ctf_integer(ext4_lblk_t, len, es->es_len)
+               ctf_integer(ext4_fsblk_t, pblk, ext4_es_pblock(es))
+               ctf_integer(char, status, ext4_es_status(es) >> 60)
+               ctf_integer(int, found, found)
+       )
+)
+
+LTTNG_TRACEPOINT_EVENT(ext4_es_shrink_enter,
+       TP_PROTO(struct super_block *sb, int nr_to_scan, int cache_cnt),
+
+       TP_ARGS(sb, nr_to_scan, cache_cnt),
+
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, sb->s_dev)
+               ctf_integer(int, nr_to_scan, nr_to_scan)
+               ctf_integer(int, cache_cnt, cache_cnt)
+       )
+)
+
+LTTNG_TRACEPOINT_EVENT(ext4_es_shrink_exit,
+       TP_PROTO(struct super_block *sb, int shrunk_nr, int cache_cnt),
+
+       TP_ARGS(sb, shrunk_nr, cache_cnt),
+
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, sb->s_dev)
+               ctf_integer(int, shrunk_nr, shrunk_nr)
+               ctf_integer(int, cache_cnt, cache_cnt)
+       )
+)
+
 #endif
 
-#endif /* _TRACE_EXT4_H */
+#endif /* LTTNG_TRACE_EXT4_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>
This page took 0.061062 seconds and 4 git commands to generate.