X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fbtrfs.h;h=f4fdebcac98f72b045b9f0d44d06471f167ec4d0;hb=369708f464bedc0682151df9308cebfa14dbdb2b;hp=cc7ba507d2ee67cd9141db361123917e0f08d90c;hpb=f1a87e248bc56cf038413542a8c0b895be755928;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/btrfs.h b/instrumentation/events/lttng-module/btrfs.h
index cc7ba507..f4fdebca 100644
--- a/instrumentation/events/lttng-module/btrfs.h
+++ b/instrumentation/events/lttng-module/btrfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM btrfs
 
@@ -6,7 +7,6 @@
 
 #include <probes/lttng-tracepoint-event.h>
 #include <linux/writeback.h>
-#include <linux/version.h>
 
 #ifndef _TRACE_BTRFS_DEF_
 #define _TRACE_BTRFS_DEF_
@@ -19,22 +19,20 @@ struct btrfs_delayed_ref_node;
 struct btrfs_delayed_tree_ref;
 struct btrfs_delayed_data_ref;
 struct btrfs_delayed_ref_head;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0))
-struct btrfs_block_group_cache;
+struct btrfs_block_group;
 struct btrfs_free_cluster;
-#endif
 struct map_lookup;
 struct extent_buffer;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
 struct extent_state;
 #endif
-#endif
 
 #define BTRFS_UUID_SIZE 16
 
+#define lttng_fs_info_fsid fs_info->fs_devices->fsid
+
 LTTNG_TRACEPOINT_EVENT(btrfs_transaction_commit,
 
-	TP_PROTO(struct btrfs_root *root),
+	TP_PROTO(const struct btrfs_root *root),
 
 	TP_ARGS(root),
 
@@ -46,7 +44,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_transaction_commit,
 
 LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__inode,
 
-	TP_PROTO(struct inode *inode),
+	TP_PROTO(const struct inode *inode),
 
 	TP_ARGS(inode),
 
@@ -64,31 +62,29 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__inode,
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__inode, btrfs_inode_new,
 
-	TP_PROTO(struct inode *inode),
+	TP_PROTO(const struct inode *inode),
 
 	TP_ARGS(inode)
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__inode, btrfs_inode_request,
 
-	TP_PROTO(struct inode *inode),
+	TP_PROTO(const struct inode *inode),
 
 	TP_ARGS(inode)
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__inode, btrfs_inode_evict,
 
-	TP_PROTO(struct inode *inode),
+	TP_PROTO(const struct inode *inode),
 
 	TP_ARGS(inode)
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0))
-
 LTTNG_TRACEPOINT_EVENT(btrfs_get_extent,
 
-	TP_PROTO(struct btrfs_root *root, struct inode *inode,
-		struct extent_map *map),
+	TP_PROTO(const struct btrfs_root *root, const struct btrfs_inode *inode,
+		const struct extent_map *map),
 
 	TP_ARGS(root, inode, map),
 
@@ -101,50 +97,47 @@ LTTNG_TRACEPOINT_EVENT(btrfs_get_extent,
 		ctf_integer(u64, block_start, map->block_start)
 		ctf_integer(u64, block_len, map->block_len)
 		ctf_integer(unsigned long, flags, map->flags)
-		ctf_integer(int, refs, atomic_read(&map->refs))
+		ctf_integer(int, refs, refcount_read(&map->refs))
 		ctf_integer(unsigned int, compress_type, map->compress_type)
 	)
 )
 
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */
-
-LTTNG_TRACEPOINT_EVENT(btrfs_get_extent,
+LTTNG_TRACEPOINT_EVENT(btrfs_handle_em_exist,
 
-	TP_PROTO(struct btrfs_root *root, struct extent_map *map),
+	TP_PROTO(const struct btrfs_fs_info *fs_info,
+		const struct extent_map *existing, const struct extent_map *map,
+		u64 start, u64 len),
 
-	TP_ARGS(root, map),
+	TP_ARGS(fs_info, existing, map, start, len),
 
 	TP_FIELDS(
-		ctf_integer(u64, root_objectid, root->root_key.objectid)
-		ctf_integer(u64, start, map->start)
-		ctf_integer(u64, len, map->len)
-		ctf_integer(u64, orig_start, map->orig_start)
-		ctf_integer(u64, block_start, map->block_start)
-		ctf_integer(u64, block_len, map->block_len)
-		ctf_integer(unsigned long, flags, map->flags)
-		ctf_integer(int, refs, atomic_read(&map->refs))
-		ctf_integer(unsigned int, compress_type, map->compress_type)
+		ctf_array(u8, fsid, lttng_fs_info_fsid, BTRFS_UUID_SIZE)
+		ctf_integer(u64, e_start, existing->start)
+		ctf_integer(u64, e_len, existing->len)
+		ctf_integer(u64, map_start, map->start)
+		ctf_integer(u64, map_len, map->len)
+		ctf_integer(u64, start, start)
+		ctf_integer(u64, len, len)
 	)
 )
 
-#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */
-
 LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__ordered_extent,
 
-	TP_PROTO(struct inode *inode, struct btrfs_ordered_extent *ordered),
+	TP_PROTO(const struct inode *inode,
+		 const struct btrfs_ordered_extent *ordered),
 
 	TP_ARGS(inode, ordered),
 
 	TP_FIELDS(
 		ctf_integer(ino_t, ino, inode->i_ino)
 		ctf_integer(u64, file_offset, ordered->file_offset)
-		ctf_integer(u64, start, ordered->start)
-		ctf_integer(u64, len, ordered->len)
-		ctf_integer(u64, disk_len, ordered->disk_len)
+		ctf_integer(u64, start, ordered->disk_bytenr)
+		ctf_integer(u64, len, ordered->num_bytes)
+		ctf_integer(u64, disk_len, ordered->disk_num_bytes)
 		ctf_integer(u64, bytes_left, ordered->bytes_left)
 		ctf_integer(unsigned long, flags, ordered->flags)
 		ctf_integer(int, compress_type, ordered->compress_type)
-		ctf_integer(int, refs, atomic_read(&ordered->refs))
+		ctf_integer(int, refs, refcount_read(&ordered->refs))
 		ctf_integer(u64, root_objectid,
 				BTRFS_I(inode)->root->root_key.objectid)
 	)
@@ -152,36 +145,40 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__ordered_extent,
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__ordered_extent, btrfs_ordered_extent_add,
 
-	TP_PROTO(struct inode *inode, struct btrfs_ordered_extent *ordered),
+	TP_PROTO(const struct inode *inode,
+		 const struct btrfs_ordered_extent *ordered),
 
 	TP_ARGS(inode, ordered)
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__ordered_extent, btrfs_ordered_extent_remove,
 
-	TP_PROTO(struct inode *inode, struct btrfs_ordered_extent *ordered),
+	TP_PROTO(const struct inode *inode,
+		 const struct btrfs_ordered_extent *ordered),
 
 	TP_ARGS(inode, ordered)
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__ordered_extent, btrfs_ordered_extent_start,
 
-	TP_PROTO(struct inode *inode, struct btrfs_ordered_extent *ordered),
+	TP_PROTO(const struct inode *inode,
+		 const struct btrfs_ordered_extent *ordered),
 
 	TP_ARGS(inode, ordered)
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__ordered_extent, btrfs_ordered_extent_put,
 
-	TP_PROTO(struct inode *inode, struct btrfs_ordered_extent *ordered),
+	TP_PROTO(const struct inode *inode,
+		 const struct btrfs_ordered_extent *ordered),
 
 	TP_ARGS(inode, ordered)
 )
 
 LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__writepage,
 
-	TP_PROTO(struct page *page, struct inode *inode,
-		 struct writeback_control *wbc),
+	TP_PROTO(const struct page *page, const struct inode *inode,
+		 const struct writeback_control *wbc),
 
 	TP_ARGS(page, inode, wbc),
 
@@ -192,9 +189,6 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__writepage,
 		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)
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0))
-		ctf_integer(char, nonblocking, wbc->nonblocking)
-#endif
 		ctf_integer(char, for_kupdate, wbc->for_kupdate)
 		ctf_integer(char, for_reclaim, wbc->for_reclaim)
 		ctf_integer(char, range_cyclic, wbc->range_cyclic)
@@ -211,15 +205,15 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(btrfs__writepage,
 
 	btrfs__extent_writepage,
 
-	TP_PROTO(struct page *page, struct inode *inode,
-		 struct writeback_control *wbc),
+	TP_PROTO(const struct page *page, const struct inode *inode,
+		 const struct writeback_control *wbc),
 
 	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_PROTO(const struct page *page, u64 start, u64 end, int uptodate),
 
 	TP_ARGS(page, start, end, uptodate),
 
@@ -236,7 +230,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_writepage_end_io_hook,
 
 LTTNG_TRACEPOINT_EVENT(btrfs_sync_file,
 
-	TP_PROTO(struct file *file, int datasync),
+	TP_PROTO(const struct file *file, int datasync),
 
 	TP_ARGS(file, datasync),
 
@@ -249,10 +243,9 @@ LTTNG_TRACEPOINT_EVENT(btrfs_sync_file,
 	)
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0))
 LTTNG_TRACEPOINT_EVENT(btrfs_sync_fs,
 
-	TP_PROTO(struct btrfs_fs_info *fs_info, int wait),
+	TP_PROTO(const struct btrfs_fs_info *fs_info, int wait),
 
 	TP_ARGS(fs_info, wait),
 
@@ -260,48 +253,36 @@ LTTNG_TRACEPOINT_EVENT(btrfs_sync_fs,
 		ctf_integer(int, wait, wait)
 	)
 )
-#else
-LTTNG_TRACEPOINT_EVENT(btrfs_sync_fs,
-
-	TP_PROTO(int wait),
-
-	TP_ARGS(wait),
-
-	TP_FIELDS(
-		ctf_integer(int, wait, wait)
-	)
-)
-#endif
 
 LTTNG_TRACEPOINT_EVENT(btrfs_add_block_group,
 
-	TP_PROTO(struct btrfs_fs_info *fs_info,
-		struct btrfs_block_group_cache *block_group, int create),
+	TP_PROTO(const struct btrfs_fs_info *fs_info,
+		 const struct btrfs_block_group *block_group, int create),
 
 	TP_ARGS(fs_info, block_group, create),
 
 	TP_FIELDS(
-		ctf_array(u8, fsid, fs_info->fsid, BTRFS_UUID_SIZE)
-		ctf_integer(u64, offset, block_group->key.objectid)
-		ctf_integer(u64, size, block_group->key.offset)
+		ctf_array(u8, fsid, lttng_fs_info_fsid, BTRFS_UUID_SIZE)
+		ctf_integer(u64, offset, block_group->start)
+		ctf_integer(u64, size, block_group->length)
 		ctf_integer(u64, flags, block_group->flags)
-		ctf_integer(u64, bytes_used, btrfs_block_group_used(&block_group->item))
+		ctf_integer(u64, bytes_used, block_group->used)
 		ctf_integer(u64, bytes_super, block_group->bytes_super)
 		ctf_integer(int, create, create)
 	)
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0))
-LTTNG_TRACEPOINT_EVENT(btrfs_delayed_tree_ref,
+LTTNG_TRACEPOINT_EVENT_CLASS(btrfs_delayed_tree_ref,
 
-	TP_PROTO(struct btrfs_fs_info *fs_info,
-		 struct btrfs_delayed_ref_node *ref,
-		 struct btrfs_delayed_tree_ref *full_ref,
+	TP_PROTO(const struct btrfs_fs_info *fs_info,
+		 const struct btrfs_delayed_ref_node *ref,
+		 const struct btrfs_delayed_tree_ref *full_ref,
 		 int action),
 
 	TP_ARGS(fs_info, ref, full_ref, action),
 
 	TP_FIELDS(
+		ctf_array(u8, fsid, lttng_fs_info_fsid, BTRFS_UUID_SIZE)
 		ctf_integer(u64, bytenr, ref->bytenr)
 		ctf_integer(u64, num_bytes, ref->num_bytes)
 		ctf_integer(int, action, action)
@@ -312,39 +293,46 @@ LTTNG_TRACEPOINT_EVENT(btrfs_delayed_tree_ref,
 		ctf_integer(u64, seq, ref->seq)
 	)
 )
-#else
-LTTNG_TRACEPOINT_EVENT(btrfs_delayed_tree_ref,
 
-	TP_PROTO(struct btrfs_delayed_ref_node *ref,
-		 struct btrfs_delayed_tree_ref *full_ref,
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(btrfs_delayed_tree_ref,
+
+	add_delayed_tree_ref,
+
+	btrfs_add_delayed_tree_ref,
+
+	TP_PROTO(const struct btrfs_fs_info *fs_info,
+		 const struct btrfs_delayed_ref_node *ref,
+		 const struct btrfs_delayed_tree_ref *full_ref,
 		 int action),
 
-	TP_ARGS(ref, full_ref, action),
+	TP_ARGS(fs_info, ref, full_ref, action)
+)
 
-	TP_FIELDS(
-		ctf_integer(u64, bytenr, ref->bytenr)
-		ctf_integer(u64, num_bytes, ref->num_bytes)
-		ctf_integer(int, action, action)
-		ctf_integer(u64, parent, full_ref->parent)
-		ctf_integer(u64, ref_root, full_ref->root)
-		ctf_integer(int, level, full_ref->level)
-		ctf_integer(int, type, ref->type)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0))
-		ctf_integer(u64, seq, ref->seq)
-#endif
-	)
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(btrfs_delayed_tree_ref,
+
+	run_delayed_tree_ref,
+
+	btrfs_run_delayed_tree_ref,
+
+	TP_PROTO(const struct btrfs_fs_info *fs_info,
+		 const struct btrfs_delayed_ref_node *ref,
+		 const struct btrfs_delayed_tree_ref *full_ref,
+		 int action),
+
+	TP_ARGS(fs_info, ref, full_ref, action)
 )
-#endif
 
-LTTNG_TRACEPOINT_EVENT(btrfs_delayed_data_ref,
+LTTNG_TRACEPOINT_EVENT_CLASS(btrfs_delayed_data_ref,
 
-	TP_PROTO(struct btrfs_delayed_ref_node *ref,
-		 struct btrfs_delayed_data_ref *full_ref,
+	TP_PROTO(const struct btrfs_fs_info *fs_info,
+		 const struct btrfs_delayed_ref_node *ref,
+		 const struct btrfs_delayed_data_ref *full_ref,
 		 int action),
 
-	TP_ARGS(ref, full_ref, action),
+	TP_ARGS(fs_info, ref, full_ref, action),
 
 	TP_FIELDS(
+		ctf_array(u8, fsid, lttng_fs_info_fsid, BTRFS_UUID_SIZE)
 		ctf_integer(u64, bytenr, ref->bytenr)
 		ctf_integer(u64, num_bytes, ref->num_bytes)
 		ctf_integer(int, action, action)
@@ -353,91 +341,86 @@ LTTNG_TRACEPOINT_EVENT(btrfs_delayed_data_ref,
 		ctf_integer(u64, owner, full_ref->objectid)
 		ctf_integer(u64, offset, full_ref->offset)
 		ctf_integer(int, type, ref->type)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0))
 		ctf_integer(u64, seq, ref->seq)
-#endif
 	)
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0))
-LTTNG_TRACEPOINT_EVENT(btrfs_delayed_ref_head,
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(btrfs_delayed_data_ref,
+
+	add_delayed_data_ref,
 
-	TP_PROTO(struct btrfs_fs_info *fs_info,
-		 struct btrfs_delayed_ref_node *ref,
-		 struct btrfs_delayed_ref_head *head_ref,
+	btrfs_add_delayed_data_ref,
+
+	TP_PROTO(const struct btrfs_fs_info *fs_info,
+		 const struct btrfs_delayed_ref_node *ref,
+		 const struct btrfs_delayed_data_ref *full_ref,
 		 int action),
 
-	TP_ARGS(fs_info, ref, head_ref, action),
+	TP_ARGS(fs_info, ref, full_ref, action)
+)
 
-	TP_FIELDS(
-		ctf_integer(u64, bytenr, ref->bytenr)
-		ctf_integer(u64, num_bytes, ref->num_bytes)
-		ctf_integer(int, action, action)
-		ctf_integer(int, is_data, head_ref->is_data)
-	)
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(btrfs_delayed_data_ref,
+
+	run_delayed_data_ref,
+
+	btrfs_run_delayed_data_ref,
+
+	TP_PROTO(const struct btrfs_fs_info *fs_info,
+		 const struct btrfs_delayed_ref_node *ref,
+		 const struct btrfs_delayed_data_ref *full_ref,
+		 int action),
+
+	TP_ARGS(fs_info, ref, full_ref, action)
 )
 
-#else
-LTTNG_TRACEPOINT_EVENT(btrfs_delayed_ref_head,
+LTTNG_TRACEPOINT_EVENT_CLASS(btrfs_delayed_ref_head,
 
-	TP_PROTO(struct btrfs_delayed_ref_node *ref,
-		 struct btrfs_delayed_ref_head *head_ref,
+	TP_PROTO(const struct btrfs_fs_info *fs_info,
+		 const struct btrfs_delayed_ref_head *head_ref,
 		 int action),
 
-	TP_ARGS(ref, head_ref, action),
+	TP_ARGS(fs_info, head_ref, action),
 
 	TP_FIELDS(
-		ctf_integer(u64, bytenr, ref->bytenr)
-		ctf_integer(u64, num_bytes, ref->num_bytes)
+		ctf_integer(u64, bytenr, head_ref->bytenr)
+		ctf_integer(u64, num_bytes, head_ref->num_bytes)
 		ctf_integer(int, action, action)
 		ctf_integer(int, is_data, head_ref->is_data)
 	)
 )
-#endif
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0))
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(btrfs_delayed_ref_head,
 
-LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__chunk,
+	add_delayed_ref_head,
 
-	TP_PROTO(struct btrfs_fs_info *fs_info, struct map_lookup *map,
-		 u64 offset, u64 size),
+	btrfs_add_delayed_ref_head,
 
-	TP_ARGS(fs_info, map, offset, size),
+	TP_PROTO(const struct btrfs_fs_info *fs_info,
+		 const struct btrfs_delayed_ref_head *head_ref,
+		 int action),
 
-	TP_FIELDS(
-		ctf_integer(int, num_stripes, map->num_stripes)
-		ctf_integer(u64, type, map->type)
-		ctf_integer(int, sub_stripes, map->sub_stripes)
-		ctf_integer(u64, offset, offset)
-		ctf_integer(u64, size, size)
-		ctf_integer(u64, root_objectid, fs_info->chunk_root->root_key.objectid)
-	)
+	TP_ARGS(fs_info, head_ref, action)
 )
 
-LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__chunk,  btrfs_chunk_alloc,
-
-	TP_PROTO(struct btrfs_fs_info *info, struct map_lookup *map,
-		 u64 offset, u64 size),
+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(btrfs_delayed_ref_head,
 
-	TP_ARGS(info, map, offset, size)
-)
+	run_delayed_ref_head,
 
-LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__chunk,  btrfs_chunk_free,
+	btrfs_run_delayed_ref_head,
 
-	TP_PROTO(struct btrfs_fs_info *info, struct map_lookup *map,
-		 u64 offset, u64 size),
+	TP_PROTO(const struct btrfs_fs_info *fs_info,
+		 const struct btrfs_delayed_ref_head *head_ref,
+		 int action),
 
-	TP_ARGS(info, map, offset, size)
+	TP_ARGS(fs_info, head_ref, action)
 )
 
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */
-
 LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__chunk,
 
-	TP_PROTO(struct btrfs_root *root, struct map_lookup *map,
+	TP_PROTO(const struct btrfs_fs_info *fs_info, const struct map_lookup *map,
 		 u64 offset, u64 size),
 
-	TP_ARGS(root, map, offset, size),
+	TP_ARGS(fs_info, map, offset, size),
 
 	TP_FIELDS(
 		ctf_integer(int, num_stripes, map->num_stripes)
@@ -445,32 +428,30 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__chunk,
 		ctf_integer(int, sub_stripes, map->sub_stripes)
 		ctf_integer(u64, offset, offset)
 		ctf_integer(u64, size, size)
-		ctf_integer(u64, root_objectid, root->root_key.objectid)
+		ctf_integer(u64, root_objectid, fs_info->chunk_root->root_key.objectid)
 	)
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__chunk,  btrfs_chunk_alloc,
 
-	TP_PROTO(struct btrfs_root *root, struct map_lookup *map,
+	TP_PROTO(const struct btrfs_fs_info *fs_info, const struct map_lookup *map,
 		 u64 offset, u64 size),
 
-	TP_ARGS(root, map, offset, size)
+	TP_ARGS(fs_info, map, offset, size)
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__chunk,  btrfs_chunk_free,
 
-	TP_PROTO(struct btrfs_root *root, struct map_lookup *map,
+	TP_PROTO(const struct btrfs_fs_info *fs_info, const struct map_lookup *map,
 		 u64 offset, u64 size),
 
-	TP_ARGS(root, map, offset, size)
+	TP_ARGS(fs_info, map, offset, size)
 )
 
-#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */
-
 LTTNG_TRACEPOINT_EVENT(btrfs_cow_block,
 
-	TP_PROTO(struct btrfs_root *root, struct extent_buffer *buf,
-		 struct extent_buffer *cow),
+	TP_PROTO(const struct btrfs_root *root, const struct extent_buffer *buf,
+		 const struct extent_buffer *cow),
 
 	TP_ARGS(root, buf, cow),
 
@@ -484,31 +465,27 @@ LTTNG_TRACEPOINT_EVENT(btrfs_cow_block,
 	)
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0))
 LTTNG_TRACEPOINT_EVENT(btrfs_space_reservation,
 
-	TP_PROTO(struct btrfs_fs_info *fs_info, char *type, u64 val,
+	TP_PROTO(const struct btrfs_fs_info *fs_info, const char *type, u64 val,
 		 u64 bytes, int reserve),
 
 	TP_ARGS(fs_info, type, val, bytes, reserve),
 
 	TP_FIELDS(
-		ctf_array(u8, fsid, fs_info->fsid, BTRFS_UUID_SIZE)
+		ctf_array(u8, fsid, lttng_fs_info_fsid, BTRFS_UUID_SIZE)
 		ctf_string(type, type)
 		ctf_integer(u64, val, val)
 		ctf_integer(u64, bytes, bytes)
 		ctf_integer(int, reserve, reserve)
 	)
 )
-#endif
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0))
 
 LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserved_extent,
 
-	TP_PROTO(struct btrfs_fs_info *info, u64 start, u64 len),
+	TP_PROTO(const struct btrfs_fs_info *fs_info, u64 start, u64 len),
 
-	TP_ARGS(info, start, len),
+	TP_ARGS(fs_info, start, len),
 
 	TP_FIELDS(
 		ctf_integer(u64, start, start)
@@ -518,63 +495,29 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserved_extent,
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserved_extent,  btrfs_reserved_extent_alloc,
 
-	TP_PROTO(struct btrfs_fs_info *info, u64 start, u64 len),
+	TP_PROTO(const struct btrfs_fs_info *fs_info, u64 start, u64 len),
 
-	TP_ARGS(info, start, len)
+	TP_ARGS(fs_info, start, len)
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserved_extent,  btrfs_reserved_extent_free,
 
-	TP_PROTO(struct btrfs_fs_info *info, u64 start, u64 len),
+	TP_PROTO(const struct btrfs_fs_info *fs_info, u64 start, u64 len),
 
-	TP_ARGS(info, start, len)
+	TP_ARGS(fs_info, start, len)
 )
 
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */
-
-LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserved_extent,
-
-	TP_PROTO(struct btrfs_root *root, u64 start, u64 len),
-
-	TP_ARGS(root, start, len),
-
-	TP_FIELDS(
-		ctf_integer(u64, root_objectid, root->root_key.objectid)
-		ctf_integer(u64, start, start)
-		ctf_integer(u64, len, len)
-	)
-)
-
-LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserved_extent,  btrfs_reserved_extent_alloc,
-
-	TP_PROTO(struct btrfs_root *root, u64 start, u64 len),
-
-	TP_ARGS(root, start, len)
-)
-
-LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserved_extent,  btrfs_reserved_extent_free,
-
-	TP_PROTO(struct btrfs_root *root, u64 start, u64 len),
-
-	TP_ARGS(root, start, len)
-)
-
-#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0))
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0))
-
 LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent,
 
 	btrfs_find_free_extent,
 
-	TP_PROTO(struct btrfs_fs_info *info, u64 num_bytes, u64 empty_size,
+	TP_PROTO(const struct btrfs_fs_info *fs_info, u64 num_bytes, u64 empty_size,
 		 u64 data),
 
-	TP_ARGS(info, num_bytes, empty_size, data),
+	TP_ARGS(fs_info, num_bytes, empty_size, data),
 
 	TP_FIELDS(
+		ctf_array(u8, fsid, lttng_fs_info_fsid, BTRFS_UUID_SIZE)
 		ctf_integer(u64, num_bytes, num_bytes)
 		ctf_integer(u64, empty_size, empty_size)
 		ctf_integer(u64, data, data)
@@ -583,14 +526,14 @@ LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent,
 
 LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserve_extent,
 
-	TP_PROTO(struct btrfs_fs_info *info,
-		 struct btrfs_block_group_cache *block_group, u64 start,
+	TP_PROTO(const struct btrfs_block_group *block_group, u64 start,
 		 u64 len),
 
-	TP_ARGS(info, block_group, start, len),
+	TP_ARGS(block_group, start, len),
 
 	TP_FIELDS(
-		ctf_integer(u64, bg_objectid, block_group->key.objectid)
+		ctf_array(u8, fsid, block_group->lttng_fs_info_fsid, BTRFS_UUID_SIZE)
+		ctf_integer(u64, bg_objectid, block_group->start)
 		ctf_integer(u64, flags, block_group->flags)
 		ctf_integer(u64, start, start)
 		ctf_integer(u64, len, len)
@@ -599,87 +542,29 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserve_extent,
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserve_extent, btrfs_reserve_extent,
 
-	TP_PROTO(struct btrfs_fs_info *info,
-		 struct btrfs_block_group_cache *block_group, u64 start,
+	TP_PROTO(const struct btrfs_block_group *block_group, u64 start,
 		 u64 len),
 
-	TP_ARGS(info, block_group, start, len)
+	TP_ARGS(block_group, start, len)
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserve_extent, btrfs_reserve_extent_cluster,
 
-	TP_PROTO(struct btrfs_fs_info *info,
-		 struct btrfs_block_group_cache *block_group, u64 start,
+	TP_PROTO(const struct btrfs_block_group *block_group, u64 start,
 		 u64 len),
 
-	TP_ARGS(info, block_group, start, len)
+	TP_ARGS(block_group, start, len)
 )
 
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */
-
-LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent,
-
-	btrfs_find_free_extent,
-
-	TP_PROTO(struct btrfs_root *root, u64 num_bytes, u64 empty_size,
-		 u64 data),
-
-	TP_ARGS(root, num_bytes, empty_size, data),
-
-	TP_FIELDS(
-		ctf_integer(u64, root_objectid, root->root_key.objectid)
-		ctf_integer(u64, num_bytes, num_bytes)
-		ctf_integer(u64, empty_size, empty_size)
-		ctf_integer(u64, data, data)
-	)
-)
-
-LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserve_extent,
-
-	TP_PROTO(struct btrfs_root *root,
-		 struct btrfs_block_group_cache *block_group, u64 start,
-		 u64 len),
-
-	TP_ARGS(root, block_group, start, len),
-
-	TP_FIELDS(
-		ctf_integer(u64, root_objectid, root->root_key.objectid)
-		ctf_integer(u64, bg_objectid, block_group->key.objectid)
-		ctf_integer(u64, flags, block_group->flags)
-		ctf_integer(u64, start, start)
-		ctf_integer(u64, len, len)
-	)
-)
-
-LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserve_extent, btrfs_reserve_extent,
-
-	TP_PROTO(struct btrfs_root *root,
-		 struct btrfs_block_group_cache *block_group, u64 start,
-		 u64 len),
-
-	TP_ARGS(root, block_group, start, len)
-)
-
-LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__reserve_extent, btrfs_reserve_extent_cluster,
-
-	TP_PROTO(struct btrfs_root *root,
-		 struct btrfs_block_group_cache *block_group, u64 start,
-		 u64 len),
-
-	TP_ARGS(root, block_group, start, len)
-)
-
-#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */
-
 LTTNG_TRACEPOINT_EVENT(btrfs_find_cluster,
 
-	TP_PROTO(struct btrfs_block_group_cache *block_group, u64 start,
+	TP_PROTO(const struct btrfs_block_group *block_group, u64 start,
 		 u64 bytes, u64 empty_size, u64 min_bytes),
 
 	TP_ARGS(block_group, start, bytes, empty_size, min_bytes),
 
 	TP_FIELDS(
-		ctf_integer(u64, bg_objectid, block_group->key.objectid)
+		ctf_integer(u64, bg_objectid, block_group->start)
 		ctf_integer(u64, flags, block_group->flags)
 		ctf_integer(u64, start, start)
 		ctf_integer(u64, bytes, bytes)
@@ -690,24 +575,24 @@ LTTNG_TRACEPOINT_EVENT(btrfs_find_cluster,
 
 LTTNG_TRACEPOINT_EVENT(btrfs_failed_cluster_setup,
 
-	TP_PROTO(struct btrfs_block_group_cache *block_group),
+	TP_PROTO(const struct btrfs_block_group *block_group),
 
 	TP_ARGS(block_group),
 
 	TP_FIELDS(
-		ctf_integer(u64, bg_objectid, block_group->key.objectid)
+		ctf_integer(u64, bg_objectid, block_group->start)
 	)
 )
 
 LTTNG_TRACEPOINT_EVENT(btrfs_setup_cluster,
 
-	TP_PROTO(struct btrfs_block_group_cache *block_group,
-		 struct btrfs_free_cluster *cluster, u64 size, int bitmap),
+	TP_PROTO(const struct btrfs_block_group *block_group,
+		 const struct btrfs_free_cluster *cluster, u64 size, int bitmap),
 
 	TP_ARGS(block_group, cluster, size, bitmap),
 
 	TP_FIELDS(
-		ctf_integer(u64, bg_objectid, block_group->key.objectid)
+		ctf_integer(u64, bg_objectid, block_group->start)
 		ctf_integer(u64, flags, block_group->flags)
 		ctf_integer(u64, start, cluster->window_start)
 		ctf_integer(u64, max_size, cluster->max_size)
@@ -715,21 +600,19 @@ LTTNG_TRACEPOINT_EVENT(btrfs_setup_cluster,
 		ctf_integer(int, bitmap, bitmap)
 	)
 )
-#endif
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
 LTTNG_TRACEPOINT_EVENT_MAP(alloc_extent_state,
 
 	btrfs_alloc_extent_state,
 
-	TP_PROTO(struct extent_state *state, gfp_t mask, unsigned long IP),
+	TP_PROTO(const struct extent_state *state, gfp_t mask, unsigned long IP),
 
 	TP_ARGS(state, mask, IP),
 
 	TP_FIELDS(
-		ctf_integer_hex(struct extent_state *, state, state)
+		ctf_integer_hex(const struct extent_state *, state, state)
 		ctf_integer(gfp_t, mask, mask)
-		ctf_integer(unsigned long, ip, IP)
+		ctf_integer_hex(unsigned long, ip, IP)
 	)
 )
 
@@ -737,16 +620,15 @@ LTTNG_TRACEPOINT_EVENT_MAP(free_extent_state,
 
 	btrfs_free_extent_state,
 
-	TP_PROTO(struct extent_state *state, unsigned long IP),
+	TP_PROTO(const struct extent_state *state, unsigned long IP),
 
 	TP_ARGS(state, IP),
 
 	TP_FIELDS(
-		ctf_integer_hex(struct extent_state *, state, state)
-		ctf_integer(unsigned long, ip, IP)
+		ctf_integer_hex(const struct extent_state *, state, state)
+		ctf_integer_hex(unsigned long, ip, IP)
 	)
 )
-#endif
 
 #endif /* LTTNG_TRACE_BTRFS_H */