From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 27 Jun 2018 16:42:52 +0000 (-0400)
Subject: Revert "Add btrfs file item tracepoints"
X-Git-Tag: v2.11.0-rc1~16
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=1591c06c477522c32a1e9f1457f73961002076f4;p=lttng-modules.git

Revert "Add btrfs file item tracepoints"

This reverts commit b42b2955e13153b7283f20613f15fe98e6427baf.

It introduces the following warnings:

>>> depmod: WARNING: /lib/modules/4.18.0-rc1+/extra/probes/lttng-probe-btrfs.ko
>>> needs unknown symbol btrfs_get_token_32
>>> depmod: WARNING: /lib/modules/4.18.0-rc1+/extra/probes/lttng-probe-btrfs.ko
>>> needs unknown symbol btrfs_get_token_8
>>> depmod: WARNING: /lib/modules/4.18.0-rc1+/extra/probes/lttng-probe-btrfs.ko
>>> needs unknown symbol btrfs_get_token_16
>>> depmod: WARNING: /lib/modules/4.18.0-rc1+/extra/probes/lttng-probe-btrfs.ko
>>> needs unknown symbol btrfs_get_token_64
>>> make[1]: Leaving directory `/home/efficios/git/linux-percpu-dev'

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 fd1b6b8f..7c17de64 100644
--- a/instrumentation/events/lttng-module/btrfs.h
+++ b/instrumentation/events/lttng-module/btrfs.h
@@ -310,89 +310,6 @@ LTTNG_TRACEPOINT_EVENT(btrfs_handle_em_exist,
 )
 #endif
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0))
-LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__file_extent_item_regular,
-
-	TP_PROTO(struct btrfs_inode *bi, struct extent_buffer *l,
-		 struct btrfs_file_extent_item *fi, u64 start),
-
-	TP_ARGS(bi, l, fi, start),
-
-	TP_FIELDS(
-		ctf_array(u8, fsid, bi->root->fs_info, BTRFS_FSID_SIZE)
-		ctf_integer(u64, root_obj, bi->root->objectid)
-		ctf_integer(u64, ino, btrfs_ino(bi))
-		ctf_integer(loff_t, isize, bi->vfs_inode.i_size)
-		ctf_integer(u64, disk_isize, bi->disk_i_size)
-		ctf_integer(u64, num_bytes, btrfs_file_extent_num_bytes(l, fi))
-		ctf_integer(u64, ram_bytes, btrfs_file_extent_ram_bytes(l, fi))
-		ctf_integer(u64, disk_bytenr, btrfs_file_extent_disk_bytenr(l, fi))
-		ctf_integer(u64, disk_num_bytes, btrfs_file_extent_disk_num_bytes(l, fi))
-		ctf_integer(u64, extent_offset, btrfs_file_extent_offset(l, fi))
-		ctf_integer(u8, extent_type, btrfs_file_extent_type(l, fi))
-		ctf_integer(u8, compression, btrfs_file_extent_compression(l, fi))
-		ctf_integer(u64, extent_start, start)
-		ctf_integer(u64, extent_end, (start + btrfs_file_extent_num_bytes(l, fi)))
-	)
-)
-
-LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__file_extent_item_inline,
-
-	TP_PROTO(struct btrfs_inode *bi, struct extent_buffer *l,
-		 struct btrfs_file_extent_item *fi, int slot, u64 start),
-
-	TP_ARGS(bi, l, fi, slot, start),
-
-	TP_FIELDS(
-		ctf_array(u8, fsid, bi->root->fs_info, BTRFS_FSID_SIZE)
-		ctf_integer(u64, root_obj, bi->root->objectid)
-		ctf_integer(u64, ino, btrfs_ino(bi))
-		ctf_integer(loff_t, isize, bi->vfs_inode.i_size)
-		ctf_integer(u64, disk_isize, bi->disk_i_size)
-		ctf_integer(u8, extent_type, btrfs_file_extent_type(l, fi))
-		ctf_integer(u8, compression, btrfs_file_extent_compression(l, fi))
-		ctf_integer(u64, extent_start, start)
-		ctf_integer(u64, extent_end, (start + btrfs_file_extent_inline_len(l, slot, fi)))
-	)
-)
-
-LTTNG_TRACEPOINT_EVENT_INSTANCE(
-	btrfs__file_extent_item_regular, btrfs_get_extent_show_fi_regular,
-
-	TP_PROTO(struct btrfs_inode *bi, struct extent_buffer *l,
-		 struct btrfs_file_extent_item *fi, u64 start),
-
-	TP_ARGS(bi, l, fi, start)
-)
-
-LTTNG_TRACEPOINT_EVENT_INSTANCE(
-	btrfs__file_extent_item_regular, btrfs_truncate_show_fi_regular,
-
-	TP_PROTO(struct btrfs_inode *bi, struct extent_buffer *l,
-		 struct btrfs_file_extent_item *fi, u64 start),
-
-	TP_ARGS(bi, l, fi, start)
-)
-
-LTTNG_TRACEPOINT_EVENT_INSTANCE(
-	btrfs__file_extent_item_inline, btrfs_get_extent_show_fi_inline,
-
-	TP_PROTO(struct btrfs_inode *bi, struct extent_buffer *l,
-		 struct btrfs_file_extent_item *fi, int slot, u64 start),
-
-	TP_ARGS(bi, l, fi, slot, start)
-)
-
-LTTNG_TRACEPOINT_EVENT_INSTANCE(
-	btrfs__file_extent_item_inline, btrfs_truncate_show_fi_inline,
-
-	TP_PROTO(struct btrfs_inode *bi, struct extent_buffer *l,
-		 struct btrfs_file_extent_item *fi, int slot, u64 start),
-
-	TP_ARGS(bi, l, fi, slot, start)
-)
-#endif
-
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0))
 LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__ordered_extent,