LU-6069 kernel: kernel update [SLES11 SP3 3.0.101-0.46]

Update target and config files for new version
Revision of the ldiskfs patch series for only sles11sp3 is included.
It is no longer the same as the sp2 series.

Test-Parameters: envdefinitions=SANITY_EXCEPT=170\
 mdsdistro=sles11sp3 ossdistro=sles11sp3\
 clientdistro=sles11sp3 mdsfilesystemtype=ldiskfs\
 mdtfilesystemtype=ldiskfs ostfilesystemtype=ldiskfs

Signed-off-by: Bob Glossman <bob.glossman@intel.com>
Change-Id: I9a20662339ca9c95a4bfabd182d43aba3c4443ea
Reviewed-on: http://review.whamcloud.com/13186
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: James Simmons <uja.ornl@gmail.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-3.0-sles11.series b/ldiskfs/kernel_patches/series/ldiskfs-3.0-sles11.series
deleted file mode 120000 (symlink)
index 8241b1c882c76795776dcb4faeb8ad53cf8ebe2c..0000000000000000000000000000000000000000
--- a/ldiskfs/kernel_patches/series/ldiskfs-3.0-sles11.series
+++ /dev/null
@@ -1 +0,0 @@
-ldiskfs-3.0-sles11sp3.series
\ No newline at end of file

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-3.0-sles11.series b/ldiskfs/kernel_patches/series/ldiskfs-3.0-sles11.series
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..e69fa59ce504336a08cba6284ba04fa5eb532cb8
--- /dev/null
+++ b/ldiskfs/kernel_patches/series/ldiskfs-3.0-sles11.series
@@ -0,0 +1,45 @@
+sles11sp2/ext4-introduce-ext4_kvmalloc-ext4_kzalloc-and-ext4_kvfree.patch
+sles11sp2/ext4-speed-up-fitrim-by-recording-flags-in-ext4_group_info.patch
+sles11sp2/ext4-use-ext4_kvzalloc-ext4_kvmalloc-for-s_group_desc-and-s_group_info.patch
+sles11sp2/ext4-use-ext4_msg-instead-of-printk-in-mballoc.patch
+sles11sp2/revert-ext4-avoid-uninitialized-memory-references-in-ext3_htree_next_block.patch
+sles11sp2/ext4-journal-callback.patch
+sles11sp2/ext4-make-quota-as-first-class-supported-feature.patch
+
+sles11sp2/ext4-handle-cleanup-after-quota-failure.patch
+rhel6.3/ext4-wantedi-2.6.patch
+sles11sp2/ext4-map_inode_page-3.0.patch
+sles11sp2/export-ext4-3.0.patch
+rhel6.3/ext4-remove-cond_resched-calls.patch
+rhel6.3/ext4-nlink-2.6.patch
+sles11sp2/ext4-ext_generation.patch
+rhel6.3/ext4-inode-version.patch
+sles11sp2/ext4-lookup-dotdot.patch
+rhel6.3/ext4-print-inum-in-htree-warning.patch
+rhel6.3/ext4-xattr-no-update-ctime.patch
+sles11sp2/ext4-prealloc.patch
+sles11sp2/ext4-mballoc-extra-checks.patch
+sles11sp2/restore-path-in-walk_extent_callback.patch
+sles11sp2/ext4-misc.patch
+sles11sp2/ext4-big-endian-check-3.0.patch
+rhel6.3/ext4-alloc-policy-2.6.patch
+sles11sp2/ext4-force_over_128tb.patch
+rhel6.3/ext4-pdir-fix.patch
+sles11sp2/ext4-osd-iop-common.patch
+rhel6.3/ext4-osd-iam-exports.patch
+rhel6.3/ext4-hash-indexed-dir-dotdot-update.patch
+sles11sp2/ext4-kill-dx_root.patch
+sles11sp2/ext4-extents-mount-option.patch
+rhel6.3/ext4-fiemap-2.6.patch
+sles11sp2/ext4-mballoc-pa_free-mismatch.patch
+sles11sp2/ext4-data-in-dirent.patch
+sles11sp2/ext4-large-eas.patch
+sles11sp2/ext4-disable-mb-cache.patch
+rhel6.3/ext4-nocmtime-2.6.patch
+rhel6.3/ext4-export-64bit-name-hash.patch
+sles11sp2/ext4-store-tree-generation-at-find.patch
+sles11sp2/ext4-pdirop.patch
+rhel6.3/ext4-max-dir-size.patch
+sles11sp2/ext4-max-dir-size-options.patch
+rhel6.3/ext4-not-discard-preallocation-umount.patch
+rhel6.3/ext4-journal-path-opt.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-3.0-sles11sp3.series b/ldiskfs/kernel_patches/series/ldiskfs-3.0-sles11sp3.series
index e69fa59..7a9f122 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-3.0-sles11sp3.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-3.0-sles11sp3.series
@@ -36,7 +36,6 @@ sles11sp2/ext4-data-in-dirent.patch
 sles11sp2/ext4-large-eas.patch
 sles11sp2/ext4-disable-mb-cache.patch
 rhel6.3/ext4-nocmtime-2.6.patch
 sles11sp2/ext4-large-eas.patch
 sles11sp2/ext4-disable-mb-cache.patch
 rhel6.3/ext4-nocmtime-2.6.patch

-rhel6.3/ext4-export-64bit-name-hash.patch

 sles11sp2/ext4-store-tree-generation-at-find.patch
 sles11sp2/ext4-pdirop.patch
 rhel6.3/ext4-max-dir-size.patch
 sles11sp2/ext4-store-tree-generation-at-find.patch
 sles11sp2/ext4-pdirop.patch
 rhel6.3/ext4-max-dir-size.patch

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 9f10688..fe8e8e1 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -5,12 +5,12 @@ TBD Intel Corporation
        * Server known to build on patched kernels:
          2.6.32-431.29.2.el6 (RHEL6.5)
          2.6.32-504.3.3.el6  (RHEL6.6)
        * Server known to build on patched kernels:
          2.6.32-431.29.2.el6 (RHEL6.5)
          2.6.32-504.3.3.el6  (RHEL6.6)

-         3.0.101-0.40        (SLES11 SP3)
+         3.0.101-0.46        (SLES11 SP3)

        * Client known to build on unpatched kernels:
          2.6.32-431.29.2.el6 (RHEL6.5)
          2.6.32-504.3.3.el6  (RHEL6.6)
          3.10.0-123.9.2.el7  (RHEL7)
        * Client known to build on unpatched kernels:
          2.6.32-431.29.2.el6 (RHEL6.5)
          2.6.32-504.3.3.el6  (RHEL6.6)
          3.10.0-123.9.2.el7  (RHEL7)

-         3.0.101-0.40        (SLES11 SP3)
+         3.0.101-0.46        (SLES11 SP3)

        * Recommended e2fsprogs version: 1.42.9.wc1 or newer
        * NFS export disabled when stack size < 8192 (32-bit Lustre clients),
          since the NFSv4 export of Lustre filesystem with 4K stack may cause a
        * Recommended e2fsprogs version: 1.42.9.wc1 or newer
        * NFS export disabled when stack size < 8192 (32-bit Lustre clients),
          since the NFSv4 export of Lustre filesystem with 4K stack may cause a

diff --git a/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11sp3-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11sp3-x86_64.config
index 181ec5e..e089feb 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11sp3-x86_64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11sp3-x86_64.config
@@ -66,7 +66,7 @@ CONFIG_IRQ_WORK=y
 CONFIG_EXPERIMENTAL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 CONFIG_EXPERIMENTAL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""

-CONFIG_LOCALVERSION="-0.40-default"
+CONFIG_LOCALVERSION="-0.46-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


@@ -377,6 +377,8 @@ CONFIG_X86_MCE_AMD=y
 CONFIG_X86_MCE_THRESHOLD=y
 CONFIG_X86_MCE_INJECT=m
 CONFIG_X86_THERMAL_VECTOR=y
 CONFIG_X86_MCE_THRESHOLD=y
 CONFIG_X86_MCE_INJECT=m
 CONFIG_X86_THERMAL_VECTOR=y

+CONFIG_X86_16BIT=y
+CONFIG_X86_ESPFIX64=y

 CONFIG_I8K=m
 CONFIG_MICROCODE=m
 CONFIG_MICROCODE_INTEL=y
 CONFIG_I8K=m
 CONFIG_MICROCODE=m
 CONFIG_MICROCODE_INTEL=y


@@ -5560,7 +5562,6 @@ CONFIG_NLS_KOI8_U=m
 CONFIG_NLS_UTF8=m
 CONFIG_DLM=m
 CONFIG_DLM_DEBUG=y
 CONFIG_NLS_UTF8=m
 CONFIG_DLM=m
 CONFIG_DLM_DEBUG=y

-CONFIG_BH_LRU_SIZE=16

 
 #
 # Kernel hacking
 
 #
 # Kernel hacking

diff --git a/lustre/kernel_patches/targets/3.0-sles11sp3.target.in b/lustre/kernel_patches/targets/3.0-sles11sp3.target.in
index 8a6fd69..6b56444 100644 (file)
--- a/lustre/kernel_patches/targets/3.0-sles11sp3.target.in
+++ b/lustre/kernel_patches/targets/3.0-sles11sp3.target.in
@@ -1,6 +1,6 @@
 lnxmaj="3.0"
 lnxmin=".101"
 lnxmaj="3.0"
 lnxmin=".101"

-lnxrel="0.40"
+lnxrel="0.46"

 # 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 e231532..871b2f7 100644 (file)
--- a/lustre/kernel_patches/which_patch
+++ b/lustre/kernel_patches/which_patch
@@ -15,6 +15,6 @@ Clients since 2.6.18 DO NOT need any patches.
 PATCH SERIES FOR SERVER KERNELS:
 2.6-rhel6.series        2.6.32-431.29.2.el6 (RHEL 6.5)
 2.6-rhel6.series        2.6.32-504.3.3.el6  (RHEL 6.6)
 PATCH SERIES FOR SERVER KERNELS:
 2.6-rhel6.series        2.6.32-431.29.2.el6 (RHEL 6.5)
 2.6-rhel6.series        2.6.32-504.3.3.el6  (RHEL 6.6)

-3.0-sles11sp3.series    3.0.101-0.40        (SLES11 SP3)
+3.0-sles11sp3.series    3.0.101-0.46        (SLES11 SP3)

 
 See lustre/ChangeLog for supported client kernel versions.
 
 See lustre/ChangeLog for supported client kernel versions.