LU-18250 ldiskfs: refresh Ubuntu 24.04 6.8.0-45-generic

A recent kernel update needs to use newer patches from 6.10:
   ext4-prealloc.patch
   ext4-delayed-iput.patch

Also add a kernel patch level check for Ubuntu 6.8 in to
select pick the newer series and fix a typo in the 5.11 check

Test-Parameters: trivial
Signed-off-by: Shaun Tancheff <shaun.tancheff@hpe.com>
Change-Id: I0fffb37fc29c1747d6aa7833111116095c55b666
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/56445
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Tested-by: Shuichi Ihara <sihara@ddn.com>
Reviewed-by: Shuichi Ihara <sihara@ddn.com>
Reviewed-by: Jian Yu <yujian@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/config/lustre-build-ldiskfs.m4 b/config/lustre-build-ldiskfs.m4
index 440f4e0..ed498c7 100644 (file)
--- a/config/lustre-build-ldiskfs.m4
+++ b/config/lustre-build-ldiskfs.m4
@@ -144,7 +144,7 @@ AS_IF([test x$RHEL_KERNEL = xyes], [
        [LDISKFS_SERIES="5.11.0-40-ubuntu20.series"],
        [LDISKFS_SERIES="5.11.0-40-ubuntu20.series"])],
        [
-               PLEV=$(echo $LINUXRELEASE | cut -d'-' -f2)
+               KPLEV=$(echo $LINUXRELEASE | cut -d'-' -f2)
                AS_IF(
                        [test -z "$KPLEV"], [
                                AC_MSG_WARN([Failed to determine Kernel patch level. Assume latest.])
@@ -157,7 +157,17 @@ AS_IF([test x$RHEL_KERNEL = xyes], [
        [LDISKFS_SERIES="5.15.0-83-ubuntu20.series"])],
        [LDISKFS_SERIES="5.19.0-35-ubuntu.series"],
        [LDISKFS_SERIES="5.19.0-35-ubuntu.series"])],
-       [LDISKFS_SERIES="6.7-ml.series"],
+       [
+               KPLEV=$(echo $LINUXRELEASE | cut -d'-' -f2)
+               AS_IF(
+                       [test -z "$KPLEV"], [
+                               AC_MSG_WARN([Failed to determine Kernel patch level. Assume latest.])
+                               LDISKFS_SERIES="6.8.0-45-ubuntu24.series"
+                       ],
+                       [test $KPLEV -ge 44], [LDISKFS_SERIES="6.8.0-45-ubuntu24.series"],
+                       [LDISKFS_SERIES="6.7-ml.series"]
+               )
+       ],
        [LDISKFS_SERIES="6.7-ml.series"])],
        [LDISKFS_SERIES="6.10-ml.series"],
        [LDISKFS_SERIES="6.10-ml.series"])

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-6.8.0-45-ubuntu24.series b/ldiskfs/kernel_patches/series/ldiskfs-6.8.0-45-ubuntu24.series
new file mode 100644 (file)
index 0000000..17ffb37
--- /dev/null
+++ b/ldiskfs/kernel_patches/series/ldiskfs-6.8.0-45-ubuntu24.series
@@ -0,0 +1,38 @@
+linux-5.16/ext4-inode-version.patch
+linux-5.18/ext4-lookup-dotdot.patch
+linux-5.14/ext4-print-inum-in-htree-warning.patch
+linux-6.10/ext4-prealloc.patch
+linux-5.16/ext4-osd-iop-common.patch
+linux-5.16/ext4-misc.patch
+linux-6.6/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
+linux-6.6/ext4-nocmtime.patch
+base/ext4-htree-lock.patch
+linux-6.5/ext4-pdirop.patch
+rhel9/ext4-max-dir-size.patch
+linux-6.7/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
+linux-6.7/ext4-ialloc-uid-gid-and-pass-owner-down.patch
+linux-5.14/ext4-projid-xattrs.patch
+linux-6.10/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
+ubuntu20.04.5/ext4-filename-encode.patch
+rhel9.1/ext4-enc-flag.patch
+linux-6.6/ext4-encdata.patch
+rhel9.4/ext4-add-IGET_NO_CHECKS-flag.patch