From f379c50c6ab8a3f08f838873f4c62e0abdcf6899 Mon Sep 17 00:00:00 2001 From: Bob Glossman Date: Wed, 7 May 2014 12:21:35 -0700 Subject: [PATCH] LU-5025 kernel: kernel update [RHEL6.5 2.6.32-431.17.1.el6] update RHEL6.5 kernel to 2.6.32-431.17.1.el6 Signed-off-by: Bob Glossman Change-Id: I0dee02ddca3accadc81aa2c5114caa67ec8ae1b0 Reviewed-on: http://review.whamcloud.com/10282 Reviewed-by: James Simmons Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Yang Sheng Reviewed-by: Oleg Drokin --- lustre/ChangeLog | 4 ++-- lustre/kernel_patches/patches/vfs_linkat_leakfix.patch | 10 ---------- lustre/kernel_patches/series/2.6-rhel6.series | 1 - lustre/kernel_patches/targets/2.6-rhel6.target.in | 2 +- lustre/kernel_patches/which_patch | 2 +- 5 files changed, 4 insertions(+), 15 deletions(-) delete mode 100644 lustre/kernel_patches/patches/vfs_linkat_leakfix.patch diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 159089b..c8eb457 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -3,10 +3,10 @@ TBD Intel Corporation * See http://wiki.whamcloud.com/display/PUB/Lustre+Support+Matrix for currently supported client and server kernel versions. * Server known to build on patched kernels: - 2.6.32-431.11.2.el6 (RHEL6.5) + 2.6.32-431.17.1.el6 (RHEL6.5) 3.0.101-0.21 (SLES11 SP3) * Client known to build on unpatched kernels: - 2.6.32-431.11.2.el6 (RHEL6.5) + 2.6.32-431.17.1.el6 (RHEL6.5) 3.0.101-0.21 (SLES11 SP3) 3.6.10-4.fc18 (FC18) 3.10 (kernel.org) diff --git a/lustre/kernel_patches/patches/vfs_linkat_leakfix.patch b/lustre/kernel_patches/patches/vfs_linkat_leakfix.patch deleted file mode 100644 index 3a7a327..0000000 --- a/lustre/kernel_patches/patches/vfs_linkat_leakfix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- linux-2.6.32-431.3.1.el6-debug/fs/namei.c-orig 2014-01-30 19:53:32.885946633 -0500 -+++ linux-2.6.32-431.3.1.el6-debug/fs/namei.c 2014-01-30 21:10:31.880946625 -0500 -@@ -2897,6 +2897,7 @@ out_release: - path_put(&nd.path); - putname(to); - if (retry_estale(error, how)) { -+ path_put(&old_path); - how |= LOOKUP_REVAL; - goto retry; - } diff --git a/lustre/kernel_patches/series/2.6-rhel6.series b/lustre/kernel_patches/series/2.6-rhel6.series index 50da2c5..517aff6 100644 --- a/lustre/kernel_patches/series/2.6-rhel6.series +++ b/lustre/kernel_patches/series/2.6-rhel6.series @@ -5,4 +5,3 @@ blkdev_tunables-2.6-rhel6.patch bh_lru_size_config.patch quota-replace-dqptr-sem.patch quota-avoid-dqget-calls.patch -vfs_linkat_leakfix.patch diff --git a/lustre/kernel_patches/targets/2.6-rhel6.target.in b/lustre/kernel_patches/targets/2.6-rhel6.target.in index c080ef4..3695356 100644 --- a/lustre/kernel_patches/targets/2.6-rhel6.target.in +++ b/lustre/kernel_patches/targets/2.6-rhel6.target.in @@ -1,5 +1,5 @@ lnxmaj="2.6.32" -lnxrel="431.11.2.el6" +lnxrel="431.17.1.el6" KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm SERIES=2.6-rhel6.series diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch index bc1bee3..32a96a7 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -13,7 +13,7 @@ Servers running only ZFS OSDs DO NOT need any patches. Clients since 2.6.18 DO NOT need any patches. PATCH SERIES FOR SERVER KERNELS: -2.6-rhel6.series 2.6.32-431.11.2.el6 +2.6-rhel6.series 2.6.32-431.17.1.el6 3.0-sles11sp3.series 3.0.101-0.21 See lustre/ChangeLog for supported client kernel versions. -- 1.8.3.1