LU-18526 ldiskfs: restore el9.4 before [5.14.0-427.42.1.el9_4]

5.14.0-427.42.1 includes a ext4 fix for which a common version of
rhel9.4/ext4-delayed-iput.patch is not possible.

Instead we have to provide a fallback series which uses the former
rhel9.1/ext4-delayed-iput.patch

Test-Parameters: trivial clientdistro=el9.4 serverdistro=el9.4
Fixes: 0027b134c4d ("LU-18414 kernel: update RHEL 9.4 [5.14.0-427.42.1.el9_4]")
Signed-off-by: Shaun Tancheff <shaun.tancheff@hpe.com>
Change-Id: I00d875678c0546e7363274634eae9b1d57a059cd
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/57352
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Yang Sheng <ys@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Arshad Hussain <arshad.hussain@aeoncomputing.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/config/lustre-build-ldiskfs.m4 b/config/lustre-build-ldiskfs.m4
index ed498c7..f4086d4 100644 (file)
--- a/config/lustre-build-ldiskfs.m4
+++ b/config/lustre-build-ldiskfs.m4
@@ -23,7 +23,10 @@ esac
 AS_IF([test -z "$LDISKFS_SERIES"], [
 AS_IF([test x$RHEL_KERNEL = xyes], [
        case $RHEL_RELEASE_NO in
-       94)     LDISKFS_SERIES="5.14-rhel9.4.series"    ;;
+       94)     LDISKFS_SERIES="5.14-rhel9.4.series"
+               AS_VERSION_COMPARE([$RHEL_RELEASE_STR],[427.42.1],
+                       [LDISKFS_SERIES="5.14-rhel9.4-427.13.series"],[],[])
+               ;;
        93)     LDISKFS_SERIES="5.14-rhel9.3.series"    ;;
        92)     LDISKFS_SERIES="5.14-rhel9.2.series"    ;;
        91)     LDISKFS_SERIES="5.14-rhel9.1.series"    ;;

diff --git a/config/lustre-build-linux.m4 b/config/lustre-build-linux.m4
index e0a7ba5..64609d1 100644 (file)
--- a/config/lustre-build-linux.m4
+++ b/config/lustre-build-linux.m4
@@ -125,12 +125,16 @@ AC_DEFUN([LB_LINUX_RELEASE], [
                                $LINUX_OBJ/include/$VERSION_HDIR/version.h)$(awk \
                                '/ RHEL_MINOR / { print [$]3 }' \
                                $LINUX_OBJ/include/$VERSION_HDIR/version.h)
+                       lb_cv_rhel_kernel_release=$(awk \
+                               '/ RHEL_RELEASE / { print [$]3 }' \
+                               $LINUX_OBJ/include/$VERSION_HDIR/version.h | tr -d '"')
                ])
        ])
        AS_IF([test -n "$lb_cv_rhel_kernel_version"], [
                RHEL_KERNEL="yes"
                KERNEL_FOUND="yes"
                RHEL_RELEASE_NO=$lb_cv_rhel_kernel_version
+               RHEL_RELEASE_STR=$lb_cv_rhel_kernel_release
        ])
 
        # Check for SuSE

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.4-427.13.series b/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.4-427.13.series
new file mode 100644 (file)
index 0000000..ce45357
--- /dev/null
+++ b/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.4-427.13.series
@@ -0,0 +1,40 @@
+linux-5.16/ext4-inode-version.patch
+linux-5.4/ext4-lookup-dotdot.patch
+linux-5.14/ext4-print-inum-in-htree-warning.patch
+rhel9.4/ext4-prealloc.patch
+linux-5.16/ext4-osd-iop-common.patch
+linux-5.16/ext4-misc.patch
+rhel9.2/ext4-mballoc-extra-checks.patch
+sles15sp4/ext4-hash-indexed-dir-dotdot-update.patch
+linux-5.14/ext4-kill-dx-root.patch
+linux-6.5/ext4-mballoc-pa-free-mismatch.patch
+linux-6.5/ext4-data-in-dirent.patch
+rhel8/ext4-nocmtime.patch
+base/ext4-htree-lock.patch
+linux-6.5/ext4-pdirop.patch
+rhel9/ext4-max-dir-size.patch
+rhel9.4/ext4-corrupted-inode-block-bitmaps-handling-patches.patch
+rhel9/ext4-give-warning-with-dir-htree-growing.patch
+ubuntu18/ext4-jcb-optimization.patch
+linux-6.2/ext4-attach-jinode-in-writepages.patch
+linux-6.5/ext4-dont-check-before-replay.patch
+rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+rhel7.6/ext4-export-orphan-add.patch
+linux-5.18/ext4-export-mb-stream-allocator-variables.patch
+ubuntu19/ext4-iget-with-flags.patch
+linux-5.14/export-ext4fs-dirhash-helper.patch
+linux-5.8/ext4-no-max-dir-size-limit-for-iam-objects.patch
+rhel9/ext4-dquot-commit-speedup.patch
+rhel9.4/ext4-introduce-EXT4_BG_TRIMMED-to-optimize-fstrim.patch
+linux-5.14/ext4-ialloc-uid-gid-and-pass-owner-down.patch
+linux-5.14/ext4-projid-xattrs.patch
+rhel9.1/ext4-delayed-iput.patch
+rhel8/ext4-ext-merge.patch
+linux-5.14/ext4-xattr-disable-credits-check.patch
+rhel9.2/ext4-fiemap-kernel-data.patch
+rhel8/ext4-old_ea_inodes_handling_fix.patch
+rhel9.2/ext4-filename-encode.patch
+rhel9.1/ext4-enc-flag.patch
+rhel9.2/ext4-encdata.patch
+rhel9/ext4-add-periodic-superblock-update.patch
+rhel9.4/ext4-add-IGET_NO_CHECKS-flag.patch