instrumentation: jbd: remove deprecated probe

diff --git a/instrumentation/events/lttng-module/jbd.h b/instrumentation/events/lttng-module/jbd.h
deleted file mode 100644 (file)
index 1195fea..0000000
--- a/instrumentation/events/lttng-module/jbd.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-#undef TRACE_SYSTEM
-#define TRACE_SYSTEM jbd
-
-#if !defined(LTTNG_TRACE_JBD_H) || defined(TRACE_HEADER_MULTI_READ)
-#define LTTNG_TRACE_JBD_H
-
-#include <probes/lttng-tracepoint-event.h>
-#include <linux/jbd.h>
-#include <linux/version.h>
-
-LTTNG_TRACEPOINT_EVENT(jbd_checkpoint,
-
-       TP_PROTO(journal_t *journal, int result),
-
-       TP_ARGS(journal, result),
-
-       TP_FIELDS(
-               ctf_integer(dev_t, dev, journal->j_fs_dev->bd_dev)
-               ctf_integer(int, result, result)
-       )
-)
-
-LTTNG_TRACEPOINT_EVENT_CLASS(jbd_commit,
-
-       TP_PROTO(journal_t *journal, transaction_t *commit_transaction),
-
-       TP_ARGS(journal, commit_transaction),
-
-       TP_FIELDS(
-               ctf_integer(dev_t, dev, journal->j_fs_dev->bd_dev)
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0))
-               ctf_integer(char, sync_commit, commit_transaction->t_synchronous_commit)
-#endif
-               ctf_integer(int, transaction, commit_transaction->t_tid)
-       )
-)
-
-LTTNG_TRACEPOINT_EVENT_INSTANCE(jbd_commit, jbd_start_commit,
-
-       TP_PROTO(journal_t *journal, transaction_t *commit_transaction),
-
-       TP_ARGS(journal, commit_transaction)
-)
-
-LTTNG_TRACEPOINT_EVENT_INSTANCE(jbd_commit, jbd_commit_locking,
-
-       TP_PROTO(journal_t *journal, transaction_t *commit_transaction),
-
-       TP_ARGS(journal, commit_transaction)
-)
-
-LTTNG_TRACEPOINT_EVENT_INSTANCE(jbd_commit, jbd_commit_flushing,
-
-       TP_PROTO(journal_t *journal, transaction_t *commit_transaction),
-
-       TP_ARGS(journal, commit_transaction)
-)
-
-LTTNG_TRACEPOINT_EVENT_INSTANCE(jbd_commit, jbd_commit_logging,
-
-       TP_PROTO(journal_t *journal, transaction_t *commit_transaction),
-
-       TP_ARGS(journal, commit_transaction)
-)
-
-LTTNG_TRACEPOINT_EVENT(jbd_drop_transaction,
-
-       TP_PROTO(journal_t *journal, transaction_t *commit_transaction),
-
-       TP_ARGS(journal, commit_transaction),
-
-       TP_FIELDS(
-               ctf_integer(dev_t, dev, journal->j_fs_dev->bd_dev)
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0))
-               ctf_integer(char, sync_commit, commit_transaction->t_synchronous_commit)
-#endif
-               ctf_integer(int, transaction, commit_transaction->t_tid)
-       )
-)
-
-LTTNG_TRACEPOINT_EVENT(jbd_end_commit,
-       TP_PROTO(journal_t *journal, transaction_t *commit_transaction),
-
-       TP_ARGS(journal, commit_transaction),
-
-       TP_FIELDS(
-               ctf_integer(dev_t, dev, journal->j_fs_dev->bd_dev)
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0))
-               ctf_integer(char, sync_commit, commit_transaction->t_synchronous_commit)
-#endif
-               ctf_integer(int, transaction, commit_transaction->t_tid)
-               ctf_integer(int, head, journal->j_tail_sequence)
-       )
-)
-
-LTTNG_TRACEPOINT_EVENT(jbd_do_submit_data,
-       TP_PROTO(journal_t *journal, transaction_t *commit_transaction),
-
-       TP_ARGS(journal, commit_transaction),
-
-       TP_FIELDS(
-               ctf_integer(dev_t, dev, journal->j_fs_dev->bd_dev)
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0))
-               ctf_integer(char, sync_commit, commit_transaction->t_synchronous_commit)
-#endif
-               ctf_integer(int, transaction, commit_transaction->t_tid)
-       )
-)
-
-LTTNG_TRACEPOINT_EVENT(jbd_cleanup_journal_tail,
-
-       TP_PROTO(journal_t *journal, tid_t first_tid,
-                unsigned long block_nr, unsigned long freed),
-
-       TP_ARGS(journal, first_tid, block_nr, freed),
-
-       TP_FIELDS(
-               ctf_integer(dev_t, dev, journal->j_fs_dev->bd_dev)
-               ctf_integer(tid_t, tail_sequence, journal->j_tail_sequence)
-               ctf_integer(tid_t, first_tid, first_tid)
-               ctf_integer(unsigned long, block_nr, block_nr)
-               ctf_integer(unsigned long, freed, freed)
-       )
-)
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0))
-LTTNG_TRACEPOINT_EVENT_MAP(journal_write_superblock,
-
-       jbd_journal_write_superblock,
-
-       TP_PROTO(journal_t *journal, int write_op),
-
-       TP_ARGS(journal, write_op),
-
-       TP_FIELDS(
-               ctf_integer(dev_t, dev, journal->j_fs_dev->bd_dev)
-               ctf_integer(int, write_op, write_op)
-       )
-)
-#else
-LTTNG_TRACEPOINT_EVENT(jbd_update_superblock_end,
-       TP_PROTO(journal_t *journal, int wait),
-
-       TP_ARGS(journal, wait),
-
-       TP_FIELDS(
-               ctf_integer(dev_t, dev, journal->j_fs_dev->bd_dev)
-               ctf_integer(int, wait, wait)
-       )
-)
-#endif
-
-#endif /* LTTNG_TRACE_JBD_H */
-
-/* This part must be outside protection */
-#include <probes/define_trace.h>

diff --git a/probes/Kbuild b/probes/Kbuild
index 261c0123be5a138b47dc13a9e17bee18e5883568..ae563203da789cb7665a4e962a60f13a2a40a6a0 100644 (file)
--- a/probes/Kbuild
+++ b/probes/Kbuild
@@ -93,13 +93,6 @@ ifneq ($(CONFIG_JBD2),)
   obj-$(CONFIG_LTTNG) += lttng-probe-jbd2.o
 endif # CONFIG_JBD2
 
-ifneq ($(CONFIG_JBD),)
-  obj-$(CONFIG_LTTNG) +=  $(shell \
-    if [ $(VERSION) -ge 4 \
-      -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 1 \) ] ; then \
-      echo "lttng-probe-jbd.o" ; fi;)
-endif # CONFIG_JBD
-
 ifneq ($(CONFIG_REGULATOR),)
   obj-$(CONFIG_LTTNG) += lttng-probe-regulator.o
 endif # CONFIG_REGULATOR

diff --git a/probes/lttng-probe-jbd.c b/probes/lttng-probe-jbd.c
deleted file mode 100644 (file)
index 25b34e7..0000000
--- a/probes/lttng-probe-jbd.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
- *
- * probes/lttng-probe-jbd.c
- *
- * LTTng jbd probes.
- *
- * Copyright (C) 2010-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- * Copyright (C) 2012 Mentor Graphics Corp.
- */
-
-#include <linux/module.h>
-#include <lttng-tracer.h>
-
-/*
- * Create the tracepoint static inlines from the kernel to validate that our
- * trace event macros match the kernel we run on.
- */
-#include <trace/events/jbd.h>
-
-/*
- * Create LTTng tracepoint probes.
- */
-#define LTTNG_PACKAGE_BUILD
-#define CREATE_TRACE_POINTS
-#define TRACE_INCLUDE_PATH instrumentation/events/lttng-module
-
-#include <instrumentation/events/lttng-module/jbd.h>
-
-MODULE_LICENSE("GPL and additional rights");
-MODULE_AUTHOR("Wade Farnsworth <wade_farnsworth@mentor.com>, Paul Woegerer <paul_woegerer@mentor.com>, and Andrew Gabbasov <andrew_gabbasov@mentor.com>");
-MODULE_DESCRIPTION("LTTng jbd probes");
-MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
-       __stringify(LTTNG_MODULES_MINOR_VERSION) "."
-       __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION)
-       LTTNG_MODULES_EXTRAVERSION);