From 3ae78057501236ddb662041ba766109c25160152 Mon Sep 17 00:00:00 2001 From: Shaun Tancheff Date: Wed, 1 Nov 2023 04:52:49 -0500 Subject: [PATCH] LU-17246 build: Refine SUSE 15 SP3 ldiskfs version SUSE linux-5.3.18-150300.59.60_7.0.4.15 should select 5.3.18-sles15sp3.series however a recent change maps linux-5.3.18-150300.59.* to 5.3.18-sles15sp3-59.series which does not apply. Lustre should also consider the patch level [Ex: 60] and map 59.60* to 5.3.18-sles15sp3.series while 61 and later should map to 5.3.18-sles15sp3-59.series The sles15sp3*.series should also include base/ext4-delayed-iput.patch base/ext4-delayed-iput.patch Test-Parameters: trivial HPE-bug-id: LUS-11910 Signed-off-by: Shaun Tancheff Change-Id: I68d6ecfc94e9edf7c657e743fbdbdb58b39bf191 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/52943 Reviewed-by: Andreas Dilger Reviewed-by: Petros Koutoupis Reviewed-by: Oleg Drokin Tested-by: jenkins Tested-by: Maloo --- config/lustre-build-ldiskfs.m4 | 4 ++++ ldiskfs/kernel_patches/series/ldiskfs-5.3.18-sles15sp3-59.series | 1 + ldiskfs/kernel_patches/series/ldiskfs-5.3.18-sles15sp3.series | 1 + 3 files changed, 6 insertions(+) diff --git a/config/lustre-build-ldiskfs.m4 b/config/lustre-build-ldiskfs.m4 index f1bda1c..46be323 100644 --- a/config/lustre-build-ldiskfs.m4 +++ b/config/lustre-build-ldiskfs.m4 @@ -76,6 +76,10 @@ AS_IF([test x$RHEL_KERNEL = xyes], [ update=$(echo $LINUXRELEASE | cut -d- -f2 | cut -d. -f2) if test $update -ge 59; then LDISKFS_SERIES="5.3.18-sles15sp3-59.series" + up_patch=$(echo $LINUXRELEASE | cut -d- -f2 | cut -d. -f3 | cut -d_ -f1) + if test $update -eq 59 -a $up_patch -le 60; then + LDISKFS_SERIES="5.3.18-sles15sp3.series" + fi fi ;; 15sp4 ) LDISKFS_SERIES="5.14.21-sles15sp4.series" diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.3.18-sles15sp3-59.series b/ldiskfs/kernel_patches/series/ldiskfs-5.3.18-sles15sp3-59.series index 7e6e7b3..78bbe54 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-5.3.18-sles15sp3-59.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-5.3.18-sles15sp3-59.series @@ -31,5 +31,6 @@ rhel8/ext4-ialloc-uid-gid-and-pass-owner-down.patch rhel8/ext4-ext-merge.patch base/ext4-projid-xattrs.patch linux-5.8/ext4-enc-flag.patch +base/ext4-delayed-iput.patch rhel8/ext4-old_ea_inodes_handling_fix.patch rhel8/ext4-encdata.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.3.18-sles15sp3.series b/ldiskfs/kernel_patches/series/ldiskfs-5.3.18-sles15sp3.series index 8eae8ad..6316047 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-5.3.18-sles15sp3.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-5.3.18-sles15sp3.series @@ -31,5 +31,6 @@ rhel8/ext4-ialloc-uid-gid-and-pass-owner-down.patch rhel8/ext4-ext-merge.patch base/ext4-projid-xattrs.patch linux-5.8/ext4-enc-flag.patch +base/ext4-delayed-iput.patch rhel8/ext4-old_ea_inodes_handling_fix.patch rhel8/ext4-encdata.patch -- 1.8.3.1