Fix: btrfs: use fs_info for btrfs_handle_em_exist tracepoint

See upstream commit:

  commit f46b24c9457143a367c6707eac82d546e2bcf280
  Author: David Sterba <dsterba@suse.com>
  Date:   Tue Apr 3 21:45:57 2018 +0200

    btrfs: use fs_info for btrfs_handle_em_exist tracepoint

    We really want to know to which filesystem the extent map events belong,
    but as it cannot be reached from the extent_map pointers, we need to
    pass it down the callchain.

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/instrumentation/events/lttng-module/btrfs.h b/instrumentation/events/lttng-module/btrfs.h
index 20b100e8f511b7715c8a7a6e02ef5a0b72731e05..75cc73b3a41513aa7af948c054a7b08df138d390 100644 (file)
--- a/instrumentation/events/lttng-module/btrfs.h
+++ b/instrumentation/events/lttng-module/btrfs.h
@@ -273,7 +273,26 @@ LTTNG_TRACEPOINT_EVENT(btrfs_get_extent,
 
 #endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,17,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,18,0))
+LTTNG_TRACEPOINT_EVENT(btrfs_handle_em_exist,
+
+       TP_PROTO(struct btrfs_fs_info *fs_info,
+               const struct extent_map *existing, const struct extent_map *map,
+               u64 start, u64 len),
+
+       TP_ARGS(fs_info, existing, map, start, len),
+
+       TP_FIELDS(
+               ctf_array(u8, fsid, 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)
+       )
+)
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,17,0))
 LTTNG_TRACEPOINT_EVENT(btrfs_handle_em_exist,
 
        TP_PROTO(const struct extent_map *existing, const struct extent_map *map, u64 start, u64 len),