From e7433f65a7d118c16f8082d04a4a334e2a268e7c Mon Sep 17 00:00:00 2001 From: Bob Glossman Date: Fri, 30 Aug 2013 11:41:48 -0700 Subject: [PATCH] LU-3847 kernel: Kernel update [RHEL6.4 2.6.32-358.18.1.el6] Kernel update [RHEL6.4 2.6.32-358.18.1.el6] Signed-off-by: Bob Glossman Change-Id: Iba2692be9fa85c5bfe4a7c2c8152981c43b4defc Reviewed-on: http://review.whamcloud.com/7514 Tested-by: Hudson Tested-by: Maloo Reviewed-by: Jinshan Xiong Reviewed-by: Alex Zhuravlev Reviewed-by: Oleg Drokin --- contrib/lbuild/lbuild-rhel6 | 2 +- .../kernel_patches/patches/rhel6.4/ext4_extra_isize.patch | 13 +++++++++++++ ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.4.series | 1 + lustre/ChangeLog | 4 ++-- .../kernel_configs/kernel-2.6.32-2.6-rhel6-x86_64.config | 3 ++- lustre/kernel_patches/targets/2.6-rhel6.target.in | 2 +- lustre/kernel_patches/which_patch | 4 ++-- 7 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 ldiskfs/kernel_patches/patches/rhel6.4/ext4_extra_isize.patch diff --git a/contrib/lbuild/lbuild-rhel6 b/contrib/lbuild/lbuild-rhel6 index 137aaf2..188f4fc 100644 --- a/contrib/lbuild/lbuild-rhel6 +++ b/contrib/lbuild/lbuild-rhel6 @@ -76,6 +76,6 @@ find_linux_rpm-rhel6() { kernel_srpm_location() { - echo "ftp://ftp.redhat.com/pub/redhat/linux/enterprise/6Server/en/os/SRPMS/" + echo "http://ftp.redhat.com/pub/redhat/linux/enterprise/6Server/en/os/SRPMS/" } diff --git a/ldiskfs/kernel_patches/patches/rhel6.4/ext4_extra_isize.patch b/ldiskfs/kernel_patches/patches/rhel6.4/ext4_extra_isize.patch new file mode 100644 index 0000000..3ab4c00 --- /dev/null +++ b/ldiskfs/kernel_patches/patches/rhel6.4/ext4_extra_isize.patch @@ -0,0 +1,13 @@ +Index: linux-stage/fs/ext4/inode.c +=================================================================== +--- linux-stage.orig/fs/ext4/inode.c ++++ linux-stage/fs/ext4/inode.c +@@ -5654,7 +5654,7 @@ static int ext4_do_update_inode(handle_t + raw_inode->i_file_acl_high = + cpu_to_le16(ei->i_file_acl >> 32); + raw_inode->i_file_acl_lo = cpu_to_le32(ei->i_file_acl); +- if (ei->i_disksize != ext4_isize(raw_inode)) { ++ if (ei->i_disksize != ext4_isize(inode->i_sb, raw_inode)) { + ext4_isize_set(raw_inode, ei->i_disksize); + need_datasync = 1; + } diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.4.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.4.series index 705d3c0..5e9698d 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.4.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.4.series @@ -37,6 +37,7 @@ rhel6.3/ext4-nocmtime-2.6.patch rhel6.3/ext4-journal-callback.patch rhel6.3/ext4-store-tree-generation-at-find.patch rhel6.3/ext4_pdirop.patch +rhel6.4/ext4_extra_isize.patch rhel6.3/ext4-quota-force-block-alloc-quotaoff.patch rhel6.3/ext4-quota-dont-update-cmtime.patch rhel6.3/ext4-quota-first-class.patch diff --git a/lustre/ChangeLog b/lustre/ChangeLog index bc4a67f..d045017 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -2,9 +2,9 @@ TBD Intel Corporation * version 2.5.0 * See http://wiki.whamcloud.com/display/PUB/Lustre+Support+Matrix * Server support for kernels: - 2.6.32-358.14.1.el6 (RHEL6) + 2.6.32-358.18.1.el6 (RHEL6) * Client support for unpatched kernels: - 2.6.32-358.14.1.el6 (RHEL6) + 2.6.32-358.18.1.el6 (RHEL6) 2.6.27.19-5 (SLES11) 2.6.18-348.3.1.el5 (RHEL5) 2.6.16.60-0.69.1 (SLES10) diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6-x86_64.config index 15a8d7d..d54c6da 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6-x86_64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.32-2.6-rhel6-x86_64.config @@ -2,7 +2,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32 -# Thu Feb 21 23:39:58 2013 +# Thu Aug 29 08:49:23 2013 # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -381,6 +381,7 @@ CONFIG_MIGRATION=y CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_ZONE_DMA_FLAG=1 CONFIG_BOUNCE=y +CONFIG_NEED_BOUNCE_POOL=y CONFIG_VIRT_TO_BUS=y CONFIG_MMU_NOTIFIER=y CONFIG_KSM=y diff --git a/lustre/kernel_patches/targets/2.6-rhel6.target.in b/lustre/kernel_patches/targets/2.6-rhel6.target.in index 5fd5cfe..26b308a 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="358.14.1.el6" +lnxrel="358.18.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 eb48f20..15d6291 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -1,10 +1,10 @@ SERIES VERSION COMMENT SUPPORTED KERNELS: -2.6-rhel6 RHEL6: 2.6.32-358.14.1.el6 +2.6-rhel6 RHEL6: 2.6.32-358.18.1.el6 CLIENT SUPPORT FOR UNPATCHED KERNELS: 2.6.18-348.3.1.el5 (RHEL5) - 2.6.32-358.14.1.el6 (RHEL6) + 2.6.32-358.18.1.el6 (RHEL6) 2.6.16.60-0.69.1 (SLES10) 2.6.27.19-5 (SLES11) -- 1.8.3.1