- updated to 2.13.9

diff --git a/jbd2-tid-type.patch b/jbd2-tid-type.patch
deleted file mode 100644 (file)
index a7f4245..0000000
--- a/jbd2-tid-type.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/include/instrumentation/events/jbd2.h b/include/instrumentation/events/jbd2.h
-index d5d8ea0c..be217ffa 100644
---- a/include/instrumentation/events/jbd2.h
-+++ b/include/instrumentation/events/jbd2.h
-@@ -28,6 +28,8 @@ LTTNG_TRACEPOINT_EVENT(jbd2_checkpoint,
- )
- 
- #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \
-+      || LTTNG_KERNEL_RANGE(5,4,229, 5,5,0) \
-+      || LTTNG_KERNEL_RANGE(5,10,163, 5,11,0) \
-       || LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \
-       || LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \
-       || LTTNG_KERNEL_RANGE(6,1,4, 6,2,0))
-@@ -96,6 +98,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(jbd2_commit, jbd2_drop_transaction,
- #endif
- 
- #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \
-+      || LTTNG_KERNEL_RANGE(5,4,229, 5,5,0) \
-+      || LTTNG_KERNEL_RANGE(5,10,163, 5,11,0) \
-       || LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \
-       || LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \
-       || LTTNG_KERNEL_RANGE(6,1,4, 6,2,0))
-@@ -138,6 +142,8 @@ LTTNG_TRACEPOINT_EVENT(jbd2_submit_inode_data,
- )
- 
- #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \
-+      || LTTNG_KERNEL_RANGE(5,4,229, 5,5,0) \
-+      || LTTNG_KERNEL_RANGE(5,10,163, 5,11,0) \
-       || LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \
-       || LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \
-       || LTTNG_KERNEL_RANGE(6,1,4, 6,2,0))

diff --git a/kernel-6.2.patch b/kernel-6.2.patch
deleted file mode 100644 (file)
index 378bca1..0000000
--- a/kernel-6.2.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-commit 4e4fb933c8a6b85ac3d5a60a417726e20e2cc695
-Author: Michael Jeanson <mjeanson@efficios.com>
-Date:   Mon Jan 16 15:01:51 2023 -0500
-
-    fix: btrfs: move accessor helpers into accessors.h (v6.2)
-    
-    See upstream commit :
-    
-      commit 07e81dc94474eb62705c6f96d9ab1a5a797b8703
-      Author: Josef Bacik <josef@toxicpanda.com>
-      Date:   Wed Oct 19 10:51:00 2022 -0400
-    
-        btrfs: move accessor helpers into accessors.h
-    
-        This is a large patch, but because they're all macros it's impossible to
-        split up.  Simply copy all of the item accessors in ctree.h and paste
-        them in accessors.h, and then update any files to include the header so
-        everything compiles.
-    
-    Change-Id: I1f0876dd8b7a8687f6802b60c3e3baabd017cc52
-    Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
-    Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
-
-diff --git a/include/instrumentation/events/btrfs.h b/include/instrumentation/events/btrfs.h
-index 4664d45a..3e4ac56d 100644
---- a/include/instrumentation/events/btrfs.h
-+++ b/include/instrumentation/events/btrfs.h
-@@ -9,6 +9,10 @@
- #include <linux/writeback.h>
- #include <lttng/kernel-version.h>
- 
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0))
-+#include <../fs/btrfs/accessors.h>
-+#endif
-+
- #ifndef _TRACE_BTRFS_DEF_
- #define _TRACE_BTRFS_DEF_
- struct btrfs_root;

diff --git a/lttng-modules.spec b/lttng-modules.spec
index 60acf8ae3db07c0f004dcad102593f7e2f195833..c4a041a45de84a7e1f15254375cbee2b1e88e39f 100644 (file)
--- a/lttng-modules.spec
+++ b/lttng-modules.spec
@@ -6,20 +6,18 @@
 # nothing to be placed to debuginfo package
 %define                _enable_debug_packages  0
 
-%define                rel     3
+%define                rel     1
 %define                pname   lttng-modules
 Summary:       LTTng 2.x kernel modules
 Summary(pl.UTF-8):     Moduły jądra LTTng 2.x
 Name:          %{pname}%{_alt_kernel}
-Version:       2.13.8
+Version:       2.13.9
 Release:       %{rel}@%{_kernel_ver_str}
 License:       GPL v2
 Group:         Base/Kernel
 Source0:       https://lttng.org/files/lttng-modules/%{pname}-%{version}.tar.bz2
-# Source0-md5: 6bc042ac2d67437639d6c77f6ea45f29
+# Source0-md5: aee7fd322982c884d139a2a3615d217a
 Patch0:                build.patch
-Patch1:                jbd2-tid-type.patch
-Patch2:                kernel-6.2.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}}
@@ -96,8 +94,6 @@ p=`pwd`\
 %setup -qc -n %{name}-%{version}
 cd %{pname}-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 cd  %{pname}-%{version}