From: Bob Glossman Date: Tue, 28 Feb 2017 19:39:37 +0000 (-0800) Subject: LU-9169 kernel: kernel update [SLES12 SP2 4.4.49-92.11] X-Git-Tag: 2.9.55~33 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=088f862a4e6cb3af5209c21768ec085166088818;p=fs%2Flustre-release.git LU-9169 kernel: kernel update [SLES12 SP2 4.4.49-92.11] Update target and kernel_config files for new version Test-Parameters: clientdistro=sles12sp2 testgroup=review-ldiskfs \ mdsdistro=sles12sp2 ossdistro=sles12sp2 mdsfilesystemtype=ldiskfs \ mdtfilesystemtype=ldiskfs ostfilesystemtype=ldiskfs Signed-off-by: Bob Glossman Change-Id: I210b548c1f27a9e444626a29dfd61953850d60ff Reviewed-on: https://review.whamcloud.com/25688 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Yang Sheng Reviewed-by: Minh Diep Reviewed-by: Oleg Drokin --- diff --git a/ldiskfs/kernel_patches/patches/sles12sp2/ext4-large-dir.patch b/ldiskfs/kernel_patches/patches/sles12sp2/ext4-large-dir.patch index 019daca..72bfc52 100644 --- a/ldiskfs/kernel_patches/patches/sles12sp2/ext4-large-dir.patch +++ b/ldiskfs/kernel_patches/patches/sles12sp2/ext4-large-dir.patch @@ -317,12 +317,17 @@ Index: linux-3.10.0-229.1.2.fc21.x86_64/fs/ext4/inode.c =================================================================== --- linux-3.10.0-229.1.2.fc21.x86_64.orig/fs/ext4/inode.c +++ linux-3.10.0-229.1.2.fc21.x86_64/fs/ext4/inode.c -@@ -4056,7 +4056,7 @@ struct inode *ext4_iget(struct super_blo - if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_64BIT)) +@@ -4056,12 +4056,12 @@ struct inode *ext4_iget(struct super_blo + if (ext4_has_feature_64bit(sb)) ei->i_file_acl |= ((__u64)le16_to_cpu(raw_inode->i_file_acl_high)) << 32; - inode->i_size = ext4_isize(raw_inode); + inode->i_size = ext4_isize(sb, raw_inode); + if ((size = i_size_read(inode)) < 0) { + EXT4_ERROR_INODE(inode, "bad i_size value: %lld", size); + ret = -EFSCORRUPTED; + goto bad_inode; + } ei->i_disksize = inode->i_size; #ifdef CONFIG_QUOTA ei->i_reserved_quota = 0; diff --git a/lustre/ChangeLog b/lustre/ChangeLog index b9b9a9d..64d6c64 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -11,7 +11,7 @@ TBD Intel Corporation 3.0.101-0.47.71 (SLES11 SP3) 3.0.101-94 (SLES11 SP4) 3.12.69-60.64.32 (SLES12 SP1) - 4.4.38-93 (SLES12 SP2) + 4.4.49-92.11 (SLES12 SP2) vanilla linux 4.6.7 (ZFS only) * Client known to build on unpatched kernels: 2.6.32-431.29.2.el6 (RHEL6.5) @@ -22,7 +22,7 @@ TBD Intel Corporation 3.0.101-0.47.71 (SLES11 SP3) 3.0.101-94 (SLES11 SP4) 3.12.69-60.64.32 (SLES12 SP1) - 4.4.38-93 (SLES12 SP2) + 4.4.49-92.11 (SLES12 SP2) vanilla linux 4.6.7 * Recommended e2fsprogs version: 1.42.13.wc4 or newer * Recommended ZFS / SPL version: 0.6.5.9 diff --git a/lustre/kernel_patches/kernel_configs/kernel-4.4-4.4-sles12-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-4.4-4.4-sles12-x86_64.config index cd03d3c..92c9baa 100644 --- a/lustre/kernel_patches/kernel_configs/kernel-4.4-4.4-sles12-x86_64.config +++ b/lustre/kernel_patches/kernel_configs/kernel-4.4-4.4-sles12-x86_64.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.4.38 Kernel Configuration +# Linux/x86 4.4.49 Kernel Configuration # 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_LOCALVERSION="-93-default" +CONFIG_LOCALVERSION="-92.11-default" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y @@ -2657,7 +2657,6 @@ CONFIG_MDIO_BITBANG=m CONFIG_MDIO_GPIO=m # CONFIG_MDIO_OCTEON is not set CONFIG_MDIO_BCM_UNIMAC=m -# CONFIG_MDIO_XGENE is not set CONFIG_PLIP=m CONFIG_PPP=m CONFIG_PPP_BSDCOMP=m @@ -3353,6 +3352,7 @@ CONFIG_SERIAL_EARLYCON=y CONFIG_SERIAL_8250=y # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set CONFIG_SERIAL_8250_PNP=y +CONFIG_SERIAL_8250_FINTEK=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_DMA=y CONFIG_SERIAL_8250_PCI=y @@ -3362,7 +3362,6 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=32 # CONFIG_SERIAL_8250_FSL is not set CONFIG_SERIAL_8250_DW=m CONFIG_SERIAL_8250_RT288X=y -CONFIG_SERIAL_8250_FINTEK=m CONFIG_SERIAL_8250_MID=m # @@ -6118,7 +6117,7 @@ CONFIG_OCFS2_FS=m CONFIG_OCFS2_FS_O2CB=m CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m # CONFIG_OCFS2_FS_STATS is not set -# CONFIG_OCFS2_DEBUG_MASKLOG is not set +CONFIG_OCFS2_DEBUG_MASKLOG=y # CONFIG_OCFS2_DEBUG_FS is not set CONFIG_BTRFS_FS=m CONFIG_BTRFS_FS_POSIX_ACL=y diff --git a/lustre/kernel_patches/targets/4.4-sles12.target.in b/lustre/kernel_patches/targets/4.4-sles12.target.in index 7ceb8d1..aaad081 100644 --- a/lustre/kernel_patches/targets/4.4-sles12.target.in +++ b/lustre/kernel_patches/targets/4.4-sles12.target.in @@ -1,6 +1,6 @@ lnxmaj="4.4" -lnxmin=".38" -lnxrel="93" +lnxmin=".49" +lnxrel="92.11" # 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 3efca6d..d9c42a5 100644 --- a/lustre/kernel_patches/which_patch +++ b/lustre/kernel_patches/which_patch @@ -21,6 +21,6 @@ PATCH SERIES FOR SERVER KERNELS: 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.69-60.64.32 (SLES12 SP1) -4.4-sles12.series 4.4.38-93 (SLES12 SP2) +4.4-sles12.series 4.4.49-92.11 (SLES12 SP2) See lustre/ChangeLog for supported client kernel versions.