X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fbtrfs.h;h=c30571c0ad23452ad22f5b18295ce7b19079146e;hb=2c054599f20c4abba83e11221d71056dc15448cf;hp=b4f2fe70342c2b98dcb6ce5193c46748e43b83a4;hpb=ae5af8ea3f781227d37bb8633e960e759422942c;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/btrfs.h b/instrumentation/events/lttng-module/btrfs.h
index b4f2fe70..c30571c0 100644
--- a/instrumentation/events/lttng-module/btrfs.h
+++ b/instrumentation/events/lttng-module/btrfs.h
@@ -346,7 +346,29 @@ LTTNG_TRACEPOINT_EVENT(btrfs_handle_em_exist,
 )
 #endif
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0))
+LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__ordered_extent,
+
+	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->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, refcount_read(&ordered->refs))
+		ctf_integer(u64, root_objectid,
+				BTRFS_I(inode)->root->root_key.objectid)
+	)
+)
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0))
 LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__ordered_extent,
 
 	TP_PROTO(const struct inode *inode,
@@ -2309,7 +2331,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(alloc_extent_state,
 	TP_FIELDS(
 		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)
 	)
 )
 
@@ -2323,7 +2345,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(free_extent_state,
 
 	TP_FIELDS(
 		ctf_integer_hex(const struct extent_state *, state, state)
-		ctf_integer(unsigned long, ip, IP)
+		ctf_integer_hex(unsigned long, ip, IP)
 	)
 )
 #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
@@ -2338,7 +2360,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(alloc_extent_state,
 	TP_FIELDS(
 		ctf_integer_hex(struct extent_state *, state, state)
 		ctf_integer(gfp_t, mask, mask)
-		ctf_integer(unsigned long, ip, IP)
+		ctf_integer_hex(unsigned long, ip, IP)
 	)
 )
 
@@ -2352,7 +2374,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(free_extent_state,
 
 	TP_FIELDS(
 		ctf_integer_hex(struct extent_state *, state, state)
-		ctf_integer(unsigned long, ip, IP)
+		ctf_integer_hex(unsigned long, ip, IP)
 	)
 )
 #endif