From 603b53c9736bd21c48f059794dd7d28f8d6ba1a0 Mon Sep 17 00:00:00 2001 From: Bob Glossman Date: Tue, 11 Jul 2017 11:47:57 -0700 Subject: [PATCH] LU-9763 kernel: kernel update RHEL6.9 [2.6.32-696.6.3.el6] Update RHEL6.9 kernel to 2.6.32-696.6.3.el6 kernel patch added as a workaround for LU-9698 Test-Parameters: clientdistro=el6.9 mdsdistro=el6.9 \ ossdistro=el6.9 mdtfilesystemtype=ldiskfs \ ostfilesystemtype=ldiskfs testgroup=review-ldiskfs Signed-off-by: Bob Glossman Change-Id: I4c3d2faa35d70b5aa981e8dc9bc630275c1c61f1 Reviewed-on: https://review.whamcloud.com/28029 Reviewed-by: James Simmons Reviewed-by: Yang Sheng Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/ChangeLog | 4 ++-- lustre/kernel_patches/patches/kallsyms-rhel6.patch | 10 ++++++++++ lustre/kernel_patches/series/2.6-rhel6.8.series | 1 + lustre/kernel_patches/targets/2.6-rhel6.9.target.in | 2 +- lustre/kernel_patches/which_patch | 2 +- 5 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 lustre/kernel_patches/patches/kallsyms-rhel6.patch diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 7f8c2e5..896b125 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -7,7 +7,7 @@ TBD Intel Corporation 2.6.32-504.30.3.el6 (RHEL6.6) 2.6.32-573.26.1.el6 (RHEL6.7) 2.6.32-642.15.1.el6 (RHEL6.8) - 2.6.32-696.3.1.el6 (RHEL6.9) + 2.6.32-696.6.3.el6 (RHEL6.9) 3.10.0-514.26.2.el7 (RHEL7.3) 3.0.101-0.47.71 (SLES11 SP3) 3.0.101-100 (SLES11 SP4) @@ -19,7 +19,7 @@ TBD Intel Corporation 2.6.32-504.30.3.el6 (RHEL6.6) 2.6.32-573.26.1.el6 (RHEL6.7) 2.6.32-642.15.1.el6 (RHEL6.8) - 2.6.32-696.3.1.el6 (RHEL6.9) + 2.6.32-696.6.3.el6 (RHEL6.9) 3.10.0-514.26.2.el7 (RHEL7.3) 3.0.101-0.47.71 (SLES11 SP3) 3.0.101-100 (SLES11 SP4) diff --git a/lustre/kernel_patches/patches/kallsyms-rhel6.patch b/lustre/kernel_patches/patches/kallsyms-rhel6.patch new file mode 100644 index 0000000..94430577 --- /dev/null +++ b/lustre/kernel_patches/patches/kallsyms-rhel6.patch @@ -0,0 +1,10 @@ +--- a/kernel/kallsyms.c.orig 2017-07-12 13:01:00.143416830 -0700 ++++ a/kernel/kallsyms.c 2017-07-12 13:01:40.438112247 -0700 +@@ -181,6 +181,7 @@ unsigned long kallsyms_lookup_name(const + } + return module_kallsyms_lookup_name(name); + } ++EXPORT_SYMBOL_GPL(kallsyms_lookup_name); + + int kallsyms_on_each_symbol(int (*fn)(void *, const char *, struct module *, + unsigned long), diff --git a/lustre/kernel_patches/series/2.6-rhel6.8.series b/lustre/kernel_patches/series/2.6-rhel6.8.series index f93a952..ece4099 100644 --- a/lustre/kernel_patches/series/2.6-rhel6.8.series +++ b/lustre/kernel_patches/series/2.6-rhel6.8.series @@ -7,3 +7,4 @@ quota-replace-dqptr-sem-el6.8.patch quota-avoid-dqget-calls.patch jbd2-log_wait_for_space-2.6-rhel6.patch module-load-deadlock-rhel6.patch +kallsyms-rhel6.patch diff --git a/lustre/kernel_patches/targets/2.6-rhel6.9.target.in b/lustre/kernel_patches/targets/2.6-rhel6.9.target.in index eabc80a..0e5d312 100644 --- a/lustre/kernel_patches/targets/2.6-rhel6.9.target.in +++ b/lustre/kernel_patches/targets/2.6-rhel6.9.target.in @@ -1,5 +1,5 @@ lnxmaj="2.6.32" -lnxrel="696.3.1.el6" +lnxrel="696.6.3.el6" KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm SERIES=2.6-rhel6.8.series diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch index 197c88c..c1807c1 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -17,7 +17,7 @@ PATCH SERIES FOR SERVER KERNELS: 2.6-rhel6.series 2.6.32-504.30.3.el6 (RHEL 6.6) 2.6-rhel6.series 2.6.32-573.26.1.el6 (RHEL 6.7) 2.6-rhel6.8.series 2.6.32-642.15.1.el6 (RHEL 6.8) -2.6-rhel6.8.series 2.6.32-696.3.1.el6 (RHEL 6.9) +2.6-rhel6.8.series 2.6.32-696.6.3.el6 (RHEL 6.9) 3.10-rhel7.series 3.10.0-514.26.2.el7 (RHEL 7.3) 3.0-sles11sp3.series 3.0.101-0.47.71 (SLES11 SP3) 3.0-sles11sp3.series 3.0.101-107 (SLES11 SP4) -- 1.8.3.1