LU-9138 kernel: kernel update [SLES12 SP1 3.12.69-60.64.32]

Update target and kernel_config files for new version
Add an extra ldiskfs patch to adapt to changes from recent landing
of LU-9031.  These changes were required due to new features
in upstream ext4 code seen in both linux 4.4 and linux 3.12.

Test-Parameters: clientdistro=sles12 testgroup=review-ldiskfs \
  mdsdistro=sles12 ossdistro=sles12 mdsfilesystemtype=ldiskfs \
  mdtfilesystemtype=ldiskfs ostfilesystemtype=ldiskfs

Signed-off-by: Bob Glossman <bob.glossman@intel.com>
Change-Id: I0c7f01dfaa087e0799a300531aff45841ba87c68
Reviewed-on: https://review.whamcloud.com/25556
Reviewed-by: Yang Sheng <yang.sheng@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Minh Diep <minh.diep@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/ldiskfs/kernel_patches/patches/sles12sp1/ext4-attach-jinode-in-writepages.patch b/ldiskfs/kernel_patches/patches/sles12sp1/ext4-attach-jinode-in-writepages.patch
new file mode 100644 (file)
index 0000000..7a66a1b
--- /dev/null
+++ b/ldiskfs/kernel_patches/patches/sles12sp1/ext4-attach-jinode-in-writepages.patch
@@ -0,0 +1,31 @@
+--- l1/fs/ext4/inode.c 2016-08-23 23:38:23.238091149 +0800
++++ l2/fs/ext4/inode.c 2017-01-24 04:04:45.100092653 +0800
+@@ -2683,6 +2683,9 @@ static int ext4_writepages(struct addres
+               mpd.last_page = wbc->range_end >> PAGE_CACHE_SHIFT;
+       }
+ 
++      ret = ext4_inode_attach_jinode(inode);
++      if (ret)
++              goto out_writepages;
+       mpd.inode = inode;
+       mpd.wbc = wbc;
+       ext4_io_submit_init(&mpd.io_submit, wbc);
+@@ -4015,6 +4015,7 @@ int ext4_inode_attach_jinode(struct inod
+               jbd2_free_inode(jinode);
+       return 0;
+ }
++EXPORT_SYMBOL(ext4_inode_attach_jinode);
+ 
+ /*
+  * ext4_truncate()
+--- l1/fs/ext4/ext4.h  2017-01-24 04:21:28.989470587 +0800
++++ l2/fs/ext4/ext4.h  2017-01-24 04:32:45.589800986 +0800
+@@ -2462,7 +2462,8 @@ extern int ext4_group_add_blocks(handle_
+ extern int ext4_trim_fs(struct super_block *, struct fstrim_range *);
+ 
+ /* inode.c */
++#define HAVE_LDISKFS_INFO_JINODE
+ struct buffer_head *ext4_getblk(handle_t *, struct inode *,
+                                               ext4_lblk_t, int, int *);
+ struct buffer_head *ext4_bread(handle_t *, struct inode *,
+                                               ext4_lblk_t, int, int *);

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-3.12-sles12sp1.series b/ldiskfs/kernel_patches/series/ldiskfs-3.12-sles12sp1.series
index 65244d0..d7acab4 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-3.12-sles12sp1.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-3.12-sles12sp1.series
@@ -20,3 +20,4 @@ sles12/ext4-corrupted-inode-block-bitmaps-handling-patches.patch
 rhel7/ext4-give-warning-with-dir-htree-growing.patch
 rhel7/ext4-mmp-brelse.patch
 rhel7/ext4-jcb-optimization.patch
 rhel7/ext4-give-warning-with-dir-htree-growing.patch
 rhel7/ext4-mmp-brelse.patch
 rhel7/ext4-jcb-optimization.patch

+sles12sp1/ext4-attach-jinode-in-writepages.patch

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index c8d1910..9935938 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -10,7 +10,7 @@ TBD Intel Corporation
          3.10.0-514.6.1.el7  (RHEL7.3)
          3.0.101-0.47.71     (SLES11 SP3)
          3.0.101-94          (SLES11 SP4)
          3.10.0-514.6.1.el7  (RHEL7.3)
          3.0.101-0.47.71     (SLES11 SP3)
          3.0.101-94          (SLES11 SP4)

-         3.12.67-60.64.24    (SLES12 SP1)
+         3.12.69-60.64.32    (SLES12 SP1)

          4.4.38-93           (SLES12 SP2)
          vanilla linux 4.6.7 (ZFS only)
        * Client known to build on unpatched kernels:
          4.4.38-93           (SLES12 SP2)
          vanilla linux 4.6.7 (ZFS only)
        * Client known to build on unpatched kernels:


@@ -21,7 +21,7 @@ TBD Intel Corporation
          3.10.0-514.6.1.el7  (RHEL7.3)
          3.0.101-0.47.71     (SLES11 SP3)
          3.0.101-94          (SLES11 SP4)
          3.10.0-514.6.1.el7  (RHEL7.3)
          3.0.101-0.47.71     (SLES11 SP3)
          3.0.101-94          (SLES11 SP4)

-         3.12.67-60.64.24    (SLES12 SP1)
+         3.12.69-60.64.32    (SLES12 SP1)

          4.4.38-93           (SLES12 SP2)
          vanilla linux 4.6.7
        * Recommended e2fsprogs version: 1.42.13.wc4 or newer
          4.4.38-93           (SLES12 SP2)
          vanilla linux 4.6.7
        * Recommended e2fsprogs version: 1.42.13.wc4 or newer

diff --git a/lustre/kernel_patches/kernel_configs/kernel-3.12-3.12-sles12-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-3.12-3.12-sles12-x86_64.config
index 60c7dee..753c11b 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-3.12-3.12-sles12-x86_64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-3.12-3.12-sles12-x86_64.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
 #
 # Automatically generated file; DO NOT EDIT.

-# Linux/x86 3.12.67 Kernel Configuration
+# Linux/x86 3.12.69 Kernel Configuration

 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y


@@ -54,7 +54,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set

-CONFIG_LOCALVERSION="-60.64.24-default"
+CONFIG_LOCALVERSION="-60.64.32-default"

 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y

diff --git a/lustre/kernel_patches/targets/3.12-sles12.target.in b/lustre/kernel_patches/targets/3.12-sles12.target.in
index ec92ecf..15c0772 100644 (file)
--- a/lustre/kernel_patches/targets/3.12-sles12.target.in
+++ b/lustre/kernel_patches/targets/3.12-sles12.target.in
@@ -1,6 +1,6 @@
 lnxmaj="3.12"
 lnxmaj="3.12"

-lnxmin=".67"
-lnxrel="60.64.24"
+lnxmin=".69"
+lnxrel="60.64.32"

 # use this when there is an "RPM fix" which means that the name of the
 # (source) RPM has been updated but the version of the kernel inside the
 # RPM is not also updated
 # use this when there is an "RPM fix" which means that the name of the
 # (source) RPM has been updated but the version of the kernel inside the
 # RPM is not also updated

diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch
index c79910d..8329bd6 100644 (file)
--- a/lustre/kernel_patches/which_patch
+++ b/lustre/kernel_patches/which_patch
@@ -20,7 +20,7 @@ PATCH SERIES FOR SERVER KERNELS:
 3.10-rhel7.series       3.10.0-514.6.1.el7  (RHEL 7.3)
 3.0-sles11sp3.series    3.0.101-0.47.71     (SLES11 SP3)
 3.0-sles11sp3.series    3.0.101-94          (SLES11 SP4)
 3.10-rhel7.series       3.10.0-514.6.1.el7  (RHEL 7.3)
 3.0-sles11sp3.series    3.0.101-0.47.71     (SLES11 SP3)
 3.0-sles11sp3.series    3.0.101-94          (SLES11 SP4)

-3.12-sles12.series      3.12.67-60.64.24    (SLES12 SP1)
+3.12-sles12.series      3.12.69-60.64.32    (SLES12 SP1)

 4.4-sles12.series       4.4.38-93           (SLES12 SP2)
 
 See lustre/ChangeLog for supported client kernel versions.
 4.4-sles12.series       4.4.38-93           (SLES12 SP2)
 
 See lustre/ChangeLog for supported client kernel versions.