fix: btrfs: pass fs_info to trace_btrfs_transaction_commit (v5.17)

[lttng-modules.git] / include / instrumentation / events / btrfs.h

diff --git a/include/instrumentation/events/btrfs.h b/include/instrumentation/events/btrfs.h
index acab6503a2d8505bca4cc75c46fae9dbdd9de295..785f16acc395b6a742bbc6222447ea74f60a33a6 100644 (file)
--- a/include/instrumentation/events/btrfs.h
+++ b/include/instrumentation/events/btrfs.h
@@ -43,7 +43,19 @@ struct extent_state;
 #define lttng_fs_info_fsid fs_info->fsid
 #endif
 
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,14,0) || \
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0))
+LTTNG_TRACEPOINT_EVENT(btrfs_transaction_commit,
+
+       TP_PROTO(const struct btrfs_fs_info *fs_info),
+
+       TP_ARGS(fs_info),
+
+       TP_FIELDS(
+               ctf_integer(u64, generation, fs_info->generation)
+               ctf_integer(u64, root_objectid, BTRFS_ROOT_TREE_OBJECTID)
+       )
+)
+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,14,0) || \
        LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
        LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
        LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
@@ -59,7 +71,25 @@ LTTNG_TRACEPOINT_EVENT(btrfs_transaction_commit,
                ctf_integer(u64, root_objectid, root->root_key.objectid)
        )
 )
+#else
+LTTNG_TRACEPOINT_EVENT(btrfs_transaction_commit,
+
+       TP_PROTO(struct btrfs_root *root),
 
+       TP_ARGS(root),
+
+       TP_FIELDS(
+               ctf_integer(u64, generation, root->fs_info->generation)
+               ctf_integer(u64, root_objectid, root->root_key.objectid)
+       )
+)
+#endif
+
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,14,0) || \
+       LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
+       LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
+       LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
+       LTTNG_SLE_KERNEL_RANGE(4,4,103,6,0,0, 4,5,0,0,0,0))
 LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__inode,
 
        TP_PROTO(const struct inode *inode),
@@ -99,18 +129,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__inode, btrfs_inode_evict,
        TP_ARGS(inode)
 )
 #else
-LTTNG_TRACEPOINT_EVENT(btrfs_transaction_commit,
-
-       TP_PROTO(struct btrfs_root *root),
-
-       TP_ARGS(root),
-
-       TP_FIELDS(
-               ctf_integer(u64, generation, root->fs_info->generation)
-               ctf_integer(u64, root_objectid, root->root_key.objectid)
-       )
-)
-
 LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__inode,
 
        TP_PROTO(struct inode *inode),
@@ -578,6 +596,65 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__ordered_extent, btrfs_ordered_extent_put,
 )
 #endif
 
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,14,0))
+LTTNG_TRACEPOINT_EVENT(btrfs_writepage_end_io_hook,
+
+       TP_PROTO(const struct btrfs_inode *inode, u64 start, u64 end, int uptodate),
+
+       TP_ARGS(inode, start, end, uptodate),
+
+       TP_FIELDS(
+               ctf_integer(u64, ino, btrfs_ino(inode))
+               ctf_integer(u64, start, start)
+               ctf_integer(u64, end, end)
+               ctf_integer(int, uptodate, uptodate)
+               ctf_integer(u64, root_objectid, inode->root->root_key.objectid)
+       )
+)
+
+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,14,0) || \
+       LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
+       LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
+       LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
+       LTTNG_SLE_KERNEL_RANGE(4,4,103,6,0,0, 4,5,0,0,0,0))
+
+LTTNG_TRACEPOINT_EVENT(btrfs_writepage_end_io_hook,
+
+       TP_PROTO(const struct page *page, u64 start, u64 end, int uptodate),
+
+       TP_ARGS(page, start, end, uptodate),
+
+       TP_FIELDS(
+               ctf_integer(ino_t, ino, page->mapping->host->i_ino)
+               ctf_integer(pgoff_t, index, page->index)
+               ctf_integer(u64, start, start)
+               ctf_integer(u64, end, end)
+               ctf_integer(int, uptodate, uptodate)
+               ctf_integer(u64, root_objectid,
+                       BTRFS_I(page->mapping->host)->root->root_key.objectid)
+       )
+)
+
+#else
+
+LTTNG_TRACEPOINT_EVENT(btrfs_writepage_end_io_hook,
+
+       TP_PROTO(struct page *page, u64 start, u64 end, int uptodate),
+
+       TP_ARGS(page, start, end, uptodate),
+
+       TP_FIELDS(
+               ctf_integer(ino_t, ino, page->mapping->host->i_ino)
+               ctf_integer(pgoff_t, index, page->index)
+               ctf_integer(u64, start, start)
+               ctf_integer(u64, end, end)
+               ctf_integer(int, uptodate, uptodate)
+               ctf_integer(u64, root_objectid,
+                       BTRFS_I(page->mapping->host)->root->root_key.objectid)
+       )
+)
+#endif
+
 #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,14,0) || \
        LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
        LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
@@ -619,23 +696,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(btrfs__writepage,
        TP_ARGS(page, inode, wbc)
 )
 
-LTTNG_TRACEPOINT_EVENT(btrfs_writepage_end_io_hook,
-
-       TP_PROTO(const struct page *page, u64 start, u64 end, int uptodate),
-
-       TP_ARGS(page, start, end, uptodate),
-
-       TP_FIELDS(
-               ctf_integer(ino_t, ino, page->mapping->host->i_ino)
-               ctf_integer(pgoff_t, index, page->index)
-               ctf_integer(u64, start, start)
-               ctf_integer(u64, end, end)
-               ctf_integer(int, uptodate, uptodate)
-               ctf_integer(u64, root_objectid,
-                       BTRFS_I(page->mapping->host)->root->root_key.objectid)
-       )
-)
-
 LTTNG_TRACEPOINT_EVENT(btrfs_sync_file,
 
        TP_PROTO(const struct file *file, int datasync),
@@ -690,23 +750,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(btrfs__writepage,
        TP_ARGS(page, inode, wbc)
 )
 
-LTTNG_TRACEPOINT_EVENT(btrfs_writepage_end_io_hook,
-
-       TP_PROTO(struct page *page, u64 start, u64 end, int uptodate),
-
-       TP_ARGS(page, start, end, uptodate),
-
-       TP_FIELDS(
-               ctf_integer(ino_t, ino, page->mapping->host->i_ino)
-               ctf_integer(pgoff_t, index, page->index)
-               ctf_integer(u64, start, start)
-               ctf_integer(u64, end, end)
-               ctf_integer(int, uptodate, uptodate)
-               ctf_integer(u64, root_objectid,
-                       BTRFS_I(page->mapping->host)->root->root_key.objectid)
-       )
-)
-
 LTTNG_TRACEPOINT_EVENT(btrfs_sync_file,
 
        TP_PROTO(struct file *file, int datasync),