jbd2 types update now also in 5.10.163

diff --git a/jbd2-tid-type.patch b/jbd2-tid-type.patch
new file mode 100644 (file)
index 0000000..0b793b4
--- /dev/null
+++ b/jbd2-tid-type.patch
@@ -0,0 +1,26 @@
+--- lttng-modules-2.13.8/include/instrumentation/events/jbd2.h.orig    2023-01-13 22:08:06.000000000 +0100
++++ lttng-modules-2.13.8/include/instrumentation/events/jbd2.h 2023-01-16 13:39:32.430153844 +0100
+@@ -28,6 +28,7 @@
+ )
+ 
+ #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,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 +97,7 @@
+ #endif
+ 
+ #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,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 +140,7 @@
+ )
+ 
+ #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,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/lttng-modules.spec b/lttng-modules.spec
index b6e954ff76077c0d35aa41f464564f0802ced5a9..959144c6ba9460ad35532cc62d7847e3749d9ad0 100644 (file)
--- a/lttng-modules.spec
+++ b/lttng-modules.spec
@@ -18,6 +18,7 @@ Group:                Base/Kernel
 Source0:       https://lttng.org/files/lttng-modules/%{pname}-%{version}.tar.bz2
 # Source0-md5: 6bc042ac2d67437639d6c77f6ea45f29
 Patch0:                build.patch
+Patch1:                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}}
@@ -94,6 +95,7 @@ p=`pwd`\
 %setup -qc -n %{name}-%{version}
 cd %{pname}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 cd  %{pname}-%{version}