All 3 merged into master, thanks! Mathieu
----- On Jun 7, 2018, at 3:48 PM, Michael Jeanson mjean...@efficios.com wrote: > See upstream commits: > > commit 393da91819e35af538ef97c7c6a04899e2fbfe0e > Author: Liu Bo <bo.li....@oracle.com> > Date: Fri Jan 5 12:51:16 2018 -0700 > > Btrfs: add tracepoint for em's EEXIST case > > This is adding a tracepoint 'btrfs_handle_em_exist' to help debug the > subtle bugs around merge_extent_mapping. > > Signed-off-by: Michael Jeanson <mjean...@efficios.com> > --- > instrumentation/events/lttng-module/btrfs.h | 18 ++++++++++++++++++ > 1 file changed, 18 insertions(+) > > diff --git a/instrumentation/events/lttng-module/btrfs.h > b/instrumentation/events/lttng-module/btrfs.h > index 4eb0db2..c413e92 100644 > --- a/instrumentation/events/lttng-module/btrfs.h > +++ b/instrumentation/events/lttng-module/btrfs.h > @@ -273,6 +273,24 @@ 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)) > +LTTNG_TRACEPOINT_EVENT(btrfs_handle_em_exist, > + > + TP_PROTO(const struct extent_map *existing, const struct extent_map > *map, u64 > start, u64 len), > + > + TP_ARGS(existing, map, start, len), > + > + TP_FIELDS( > + 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 > + > #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)) > LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__ordered_extent, > > -- > 2.17.1 -- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list lttng-dev@lists.lttng.org https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev