LU-3990 kernel: kernel update [SLES SP2 3.0.93-0.5]

Update of config and build files to new kernel version.

Signed-off-by: Bob Glossman <bob.glossman@intel.com>
Change-Id: Ia5e3ad75966e98e567d06d41c3ccb810fb62168d
Reviewed-on: http://review.whamcloud.com/7753
Reviewed-by: James Simmons <uja.ornl@gmail.com>
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Minh Diep <minh.diep@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/ldiskfs/kernel_patches/patches/sles11sp2/ext4-read-write.patch b/ldiskfs/kernel_patches/patches/sles11sp2/ext4-read-write.patch
deleted file mode 100644 (file)
index 31f2dd3..0000000
--- a/ldiskfs/kernel_patches/patches/sles11sp2/ext4-read-write.patch
+++ /dev/null
@@ -1,32 +0,0 @@
----
- fs/ext4/super.c |   12 ------------
- 1 file changed, 12 deletions(-)
-
---- a/fs/ext4/super.c
-+++ b/fs/ext4/super.c
-@@ -3216,10 +3216,6 @@ static int ext4_fill_super(struct super_
-               goto cantfind_ext4;
-       sbi->s_kbytes_written = le64_to_cpu(es->s_kbytes_written);
-
--#ifndef CONFIG_EXT4_FS_RW
--      sb->s_flags |= MS_RDONLY;
--      ext4_msg(sb, KERN_INFO, "ext4 is supported in read-only mode only");
--#endif
-       /* Set defaults before we parse the mount options */
-       def_mount_opts = le32_to_cpu(es->s_default_mount_opts);
-       set_opt(sb, INIT_INODE_TABLE);
-@@ -4487,14 +4483,6 @@ static int ext4_remount(struct super_blo
-       if (sbi->s_journal && sbi->s_journal->j_task->io_context)
-               journal_ioprio = sbi->s_journal->j_task->io_context->ioprio;
-
--#ifndef CONFIG_EXT4_FS_RW
--      if (!(*flags & MS_RDONLY)) {
--              *flags |= MS_RDONLY;
--              ext4_msg(sb, KERN_INFO,
--                       "ext4 is supported in read-only mode only");
--      }
--#endif
--
-       /*
-        * Allow the "check" option to be passed as a remount option.
-        */

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 100644 (file)
index 35d04d24f213ed7e2672ec4b1600c428aabfba23..0000000000000000000000000000000000000000
--- a/ldiskfs/kernel_patches/series/ldiskfs-3.0-sles11.series
+++ /dev/null
@@ -1,45 +0,0 @@
-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-read-write.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

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 120000 (symlink)
index 0000000000000000000000000000000000000000..8241b1c882c76795776dcb4faeb8ad53cf8ebe2c
--- /dev/null
+++ b/ldiskfs/kernel_patches/series/ldiskfs-3.0-sles11.series
@@ -0,0 +1 @@
+ldiskfs-3.0-sles11sp3.series
\ No newline at end of file

diff --git a/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11-x86_64.config
index bd2c632..ba77771 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11-x86_64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-3.0-3.0-sles11-x86_64.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
 #
 # Automatically generated make config: don't edit

-# Linux/x86_64 3.0.80 Kernel Configuration
+# Linux/x86_64 3.0.93 Kernel Configuration

 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set


@@ -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.7-default"
+CONFIG_LOCALVERSION="-0.5-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


@@ -649,10 +649,7 @@ CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_ROUTE_MULTIPATH=y
 CONFIG_IP_ROUTE_VERBOSE=y
 CONFIG_IP_ROUTE_CLASSID=y
 CONFIG_IP_ROUTE_MULTIPATH=y
 CONFIG_IP_ROUTE_VERBOSE=y
 CONFIG_IP_ROUTE_CLASSID=y

-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_RARP=y
+# CONFIG_IP_PNP is not set

 CONFIG_NET_IPIP=m
 CONFIG_NET_IPGRE_DEMUX=m
 CONFIG_NET_IPGRE=m
 CONFIG_NET_IPIP=m
 CONFIG_NET_IPGRE_DEMUX=m
 CONFIG_NET_IPGRE=m

diff --git a/lustre/kernel_patches/targets/3.0-sles11.target.in b/lustre/kernel_patches/targets/3.0-sles11.target.in
index fba9c3d..3570640 100644 (file)
--- a/lustre/kernel_patches/targets/3.0-sles11.target.in
+++ b/lustre/kernel_patches/targets/3.0-sles11.target.in
@@ -1,6 +1,6 @@
 lnxmaj="3.0"
 lnxmaj="3.0"

-lnxmin=".80"
-lnxrel="0.7"
+lnxmin=".93"
+lnxrel="0.5"

 # 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