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 <bob.glossman@intel.com>
Change-Id: I752d3330d4a974bcf2b91392eca449d973cee6c1
Signed-off-by: Jian Yu <jian.yu@intel.com>
Reviewed-on: http://review.whamcloud.com/7516
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/contrib/lbuild/lbuild-rhel6 b/contrib/lbuild/lbuild-rhel6
index 137aaf2..188f4fc 100644 (file)
--- 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 (file)
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 409e8cd..6fd2bab 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.4.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.4.series
@@ -35,6 +35,7 @@ rhel6.4/ext4-vmalloc.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/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 (file)
--- 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 (file)
--- 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 (file)
--- 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)