remove jbd2-tid-type patch

diff --git a/jbd2-tid-type.patch b/jbd2-tid-type.patch
deleted file mode 100644 (file)
index 78a7f27..0000000
--- a/jbd2-tid-type.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- lttng-modules-2.13.7/include/instrumentation/events/jbd2.h.orig    2022-09-30 23:11:06.000000000 +0200
-+++ lttng-modules-2.13.7/include/instrumentation/events/jbd2.h 2023-01-08 14:25:51.090957315 +0100
-@@ -15,6 +15,14 @@
- struct transaction_run_stats_s;
- #endif
- 
-+#ifndef _TRACE_JBD2_TID_T
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,1,4)) || (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,0,18) && LTTNG_LINUX_VERSION_CODE < LTTNG_KERNEL_VERSION(6,1,0))
-+#define _TRACE_JBD2_TID_T tid_t
-+#else
-+#define _TRACE_JBD2_TID_T unsigned long
-+#endif
-+#endif
-+
- LTTNG_TRACEPOINT_EVENT(jbd2_checkpoint,
- 
-       TP_PROTO(journal_t *journal, int result),
-@@ -102,14 +110,14 @@
- )
- 
- LTTNG_TRACEPOINT_EVENT(jbd2_run_stats,
--      TP_PROTO(dev_t dev, unsigned long tid,
-+      TP_PROTO(dev_t dev, _TRACE_JBD2_TID_T tid,
-                struct transaction_run_stats_s *stats),
- 
-       TP_ARGS(dev, tid, stats),
- 
-       TP_FIELDS(
-               ctf_integer(dev_t, dev, dev)
--              ctf_integer(unsigned long, tid, tid)
-+              ctf_integer(_TRACE_JBD2_TID_T, tid, tid)
-               ctf_integer(unsigned long, wait, stats->rs_wait)
-               ctf_integer(unsigned long, running, stats->rs_running)
-               ctf_integer(unsigned long, locked, stats->rs_locked)
-@@ -122,14 +130,14 @@
- )
- 
- LTTNG_TRACEPOINT_EVENT(jbd2_checkpoint_stats,
--      TP_PROTO(dev_t dev, unsigned long tid,
-+      TP_PROTO(dev_t dev, _TRACE_JBD2_TID_T tid,
-                struct transaction_chp_stats_s *stats),
- 
-       TP_ARGS(dev, tid, stats),
- 
-       TP_FIELDS(
-               ctf_integer(dev_t, dev, dev)
--              ctf_integer(unsigned long, tid, tid)
-+              ctf_integer(_TRACE_JBD2_TID_T, tid, tid)
-               ctf_integer(unsigned long, chp_time, stats->cs_chp_time)
-               ctf_integer(__u32, forced_to_close, stats->cs_forced_to_close)
-               ctf_integer(__u32, written, stats->cs_written)

diff --git a/lttng-modules.spec b/lttng-modules.spec
index f564d124115c3e726bd749ae55c47d6b386dfb5d..2a9360e322d8d2bbf8ce66881accb1a6d4f3b5a5 100644 (file)
--- a/lttng-modules.spec
+++ b/lttng-modules.spec
@@ -19,7 +19,6 @@ Source0:      https://lttng.org/files/lttng-modules/%{pname}-%{version}.tar.bz2
 # Source0-md5: 6bc042ac2d67437639d6c77f6ea45f29
 Patch0:                build.patch
 Patch1:                kernel-6.1.patch
-Patch2:                jbd2-tid-type.patch
 URL:           https://lttng.org/
 %{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:3.0}
 %{?with_kernelsrc:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-source >= 3:3.0}}
@@ -97,7 +96,6 @@ p=`pwd`\
 cd %{pname}-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 cd  %{pname}-%{version}