From 3bb63f33238157c12e59f589ec8324bc8b181af9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Thu, 16 Nov 2017 09:56:02 +0100 Subject: [PATCH] - up to 2.10.4 --- kernel-4.13.patch | 181 --------------------------------------------- lttng-modules.spec | 6 +- 2 files changed, 2 insertions(+), 185 deletions(-) delete mode 100644 kernel-4.13.patch diff --git a/kernel-4.13.patch b/kernel-4.13.patch deleted file mode 100644 index 4028b06..0000000 --- a/kernel-4.13.patch +++ /dev/null @@ -1,181 +0,0 @@ -commit cf101116238c2e18f6bf927822dbe47aa4e71dec -Author: Michael Jeanson -Date: Mon Aug 21 14:47:08 2017 -0400 - - Fix: update ext4 instrumentation for kernel 4.13 - - See this upstream commit : - - commit a627b0a7c15ee4d2c87a86d5be5c8167382e8d0d - Author: Eric Whitney - Date: Sun Jul 30 22:30:11 2017 -0400 - - ext4: remove unused metadata accounting variables - - Two variables in ext4_inode_info, i_reserved_meta_blocks and - i_allocated_meta_blocks, are unused. Removing them saves a little - memory per in-memory inode and cleans up clutter in several tracepoints. - Adjust tracepoint output from ext4_alloc_da_blocks() for consistency - and fix a typo and whitespace near these changes. - - Signed-off-by: Eric Whitney - Signed-off-by: Theodore Ts'o - Reviewed-by: Jan Kara - - Signed-off-by: Michael Jeanson - Signed-off-by: Mathieu Desnoyers - -diff --git a/instrumentation/events/lttng-module/ext4.h b/instrumentation/events/lttng-module/ext4.h -index e87b534..fe6f802 100644 ---- a/instrumentation/events/lttng-module/ext4.h -+++ b/instrumentation/events/lttng-module/ext4.h -@@ -689,6 +689,19 @@ LTTNG_TRACEPOINT_EVENT(ext4_sync_fs, - ) - ) - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,13,0)) -+LTTNG_TRACEPOINT_EVENT(ext4_alloc_da_blocks, -+ TP_PROTO(struct inode *inode), -+ -+ TP_ARGS(inode), -+ -+ TP_FIELDS( -+ ctf_integer(dev_t, dev, inode->i_sb->s_dev) -+ ctf_integer(ino_t, ino, inode->i_ino) -+ ctf_integer(unsigned int, data_blocks, EXT4_I(inode)->i_reserved_data_blocks) -+ ) -+) -+#else - LTTNG_TRACEPOINT_EVENT(ext4_alloc_da_blocks, - TP_PROTO(struct inode *inode), - -@@ -701,6 +714,7 @@ LTTNG_TRACEPOINT_EVENT(ext4_alloc_da_blocks, - ctf_integer(unsigned int, meta_blocks, EXT4_I(inode)->i_reserved_meta_blocks) - ) - ) -+#endif - - LTTNG_TRACEPOINT_EVENT(ext4_mballoc_alloc, - TP_PROTO(struct ext4_allocation_context *ac), -@@ -833,17 +847,49 @@ LTTNG_TRACEPOINT_EVENT(ext4_forget, - ) - #endif - --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,13,0)) - LTTNG_TRACEPOINT_EVENT(ext4_da_update_reserve_space, --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)) - TP_PROTO(struct inode *inode, int used_blocks, int quota_claim), - - TP_ARGS(inode, used_blocks, quota_claim), --#else -+ -+ TP_FIELDS( -+ ctf_integer(dev_t, dev, inode->i_sb->s_dev) -+ ctf_integer(ino_t, ino, inode->i_ino) -+ ctf_integer(__u64, i_blocks, inode->i_blocks) -+ ctf_integer(int, used_blocks, used_blocks) -+ ctf_integer(int, reserved_data_blocks, -+ EXT4_I(inode)->i_reserved_data_blocks) -+ ctf_integer(int, quota_claim, quota_claim) -+ ctf_integer(TP_MODE_T, mode, inode->i_mode) -+ ) -+) -+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)) -+LTTNG_TRACEPOINT_EVENT(ext4_da_update_reserve_space, -+ TP_PROTO(struct inode *inode, int used_blocks, int quota_claim), -+ -+ TP_ARGS(inode, used_blocks, quota_claim), -+ -+ TP_FIELDS( -+ ctf_integer(dev_t, dev, inode->i_sb->s_dev) -+ ctf_integer(ino_t, ino, inode->i_ino) -+ ctf_integer(__u64, i_blocks, inode->i_blocks) -+ ctf_integer(int, used_blocks, used_blocks) -+ ctf_integer(int, reserved_data_blocks, -+ EXT4_I(inode)->i_reserved_data_blocks) -+ ctf_integer(int, reserved_meta_blocks, -+ EXT4_I(inode)->i_reserved_meta_blocks) -+ ctf_integer(int, allocated_meta_blocks, -+ EXT4_I(inode)->i_allocated_meta_blocks) -+ ctf_integer(int, quota_claim, quota_claim) -+ ctf_integer(TP_MODE_T, mode, inode->i_mode) -+ ) -+) -+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) -+LTTNG_TRACEPOINT_EVENT(ext4_da_update_reserve_space, - TP_PROTO(struct inode *inode, int used_blocks), - - TP_ARGS(inode, used_blocks), --#endif - - TP_FIELDS( - ctf_integer(dev_t, dev, inode->i_sb->s_dev) -@@ -856,14 +902,27 @@ LTTNG_TRACEPOINT_EVENT(ext4_da_update_reserve_space, - EXT4_I(inode)->i_reserved_meta_blocks) - ctf_integer(int, allocated_meta_blocks, - EXT4_I(inode)->i_allocated_meta_blocks) --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)) -- ctf_integer(int, quota_claim, quota_claim) --#endif - ctf_integer(TP_MODE_T, mode, inode->i_mode) - ) - ) -+#endif - --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,13,0)) -+LTTNG_TRACEPOINT_EVENT(ext4_da_reserve_space, -+ TP_PROTO(struct inode *inode), -+ -+ TP_ARGS(inode), -+ -+ TP_FIELDS( -+ ctf_integer(dev_t, dev, inode->i_sb->s_dev) -+ ctf_integer(ino_t, ino, inode->i_ino) -+ ctf_integer(__u64, i_blocks, inode->i_blocks) -+ ctf_integer(int, reserved_data_blocks, -+ EXT4_I(inode)->i_reserved_data_blocks) -+ ctf_integer(TP_MODE_T, mode, inode->i_mode) -+ ) -+) -+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)) - LTTNG_TRACEPOINT_EVENT(ext4_da_reserve_space, - TP_PROTO(struct inode *inode), - -@@ -880,7 +939,7 @@ LTTNG_TRACEPOINT_EVENT(ext4_da_reserve_space, - ctf_integer(TP_MODE_T, mode, inode->i_mode) - ) - ) --#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)) */ -+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) - LTTNG_TRACEPOINT_EVENT(ext4_da_reserve_space, - TP_PROTO(struct inode *inode, int md_needed), - -@@ -898,8 +957,25 @@ LTTNG_TRACEPOINT_EVENT(ext4_da_reserve_space, - ctf_integer(TP_MODE_T, mode, inode->i_mode) - ) - ) --#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)) */ -+#endif -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,13,0)) -+LTTNG_TRACEPOINT_EVENT(ext4_da_release_space, -+ TP_PROTO(struct inode *inode, int freed_blocks), -+ -+ TP_ARGS(inode, freed_blocks), - -+ TP_FIELDS( -+ ctf_integer(dev_t, dev, inode->i_sb->s_dev) -+ ctf_integer(ino_t, ino, inode->i_ino) -+ ctf_integer(__u64, i_blocks, inode->i_blocks) -+ ctf_integer(int, freed_blocks, freed_blocks) -+ ctf_integer(int, reserved_data_blocks, -+ EXT4_I(inode)->i_reserved_data_blocks) -+ ctf_integer(TP_MODE_T, mode, inode->i_mode) -+ ) -+) -+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) - LTTNG_TRACEPOINT_EVENT(ext4_da_release_space, - TP_PROTO(struct inode *inode, int freed_blocks), - diff --git a/lttng-modules.spec b/lttng-modules.spec index aaffe0e..77eb800 100644 --- a/lttng-modules.spec +++ b/lttng-modules.spec @@ -12,14 +12,13 @@ Summary: LTTng 2.x kernel modules Summary(pl.UTF-8): Moduły jądra LTTng 2.x Name: %{pname}%{_alt_kernel} -Version: 2.10.0 +Version: 2.10.4 Release: %{rel}@%{_kernel_ver_str} License: GPL v2 Group: Base/Kernel Source0: http://lttng.org/files/lttng-modules/%{pname}-%{version}.tar.bz2 -# Source0-md5: 874bcf80ce8c12ad669ddb991b2cc380 +# Source0-md5: 832452b321a4df6836549e72d05b2ce9 Patch0: build.patch -Patch1: kernel-4.13.patch URL: http://lttng.org/ %{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.38} %{?with_kernelsrc:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-source >= 3:2.6.38}} @@ -89,7 +88,6 @@ p=`pwd`\ %prep %setup -q -n %{pname}-%{version} %patch0 -p1 -%patch1 -p1 %build %{expand:%build_kernel_packages} -- 2.44.0