From: Shaun Tancheff Date: Thu, 8 Oct 2020 20:09:51 +0000 (-0500) Subject: LU-14020 ldiskfs: SUSE 15 SP2 and mainline 5.4.21 and newer X-Git-Tag: 2.13.57~131 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=20144e92fcaed217fa5485edafa6bda7e34e69b0;p=fs%2Flustre-release.git LU-14020 ldiskfs: SUSE 15 SP2 and mainline 5.4.21 and newer The updated pdirop for Ubuntu 5.4.0-42 kernel also aligns with Linux LTS 5.4.21 through to current 5.4.60 In addition this series is also suitable for the current SUSE 15 SP2 kernel, tested with 5.3.18-24.15. Test-Parameters: trivial HPE-bug-id: LUS-9092 Signed-off-by: Shaun Tancheff Change-Id: I75ee53c4096b31c3a2d13748401ed1a12306215b Reviewed-on: https://review.whamcloud.com/40179 Tested-by: jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Yang Sheng Reviewed-by: Petros Koutoupis Reviewed-by: Oleg Drokin --- diff --git a/config/lustre-build-ldiskfs.m4 b/config/lustre-build-ldiskfs.m4 index 86d0327..91ae691 100644 --- a/config/lustre-build-ldiskfs.m4 +++ b/config/lustre-build-ldiskfs.m4 @@ -45,8 +45,8 @@ AS_IF([test x$RHEL_KERNEL = xyes], [ ;; esac ] - )], [LDISKFS_SERIES="5.4.0-ml.series"], - [LDISKFS_SERIES="5.4.0-ml.series"]) + )], [LDISKFS_SERIES="5.4.21-ml.series"], + [LDISKFS_SERIES="5.4.21-ml.series"]) ], [test x$UBUNTU_KERNEL = xyes], [ AS_VERSION_COMPARE([$LINUXRELEASE],[5.4.0],[ AS_VERSION_COMPARE([$LINUXRELEASE],[5.0.0],[ @@ -90,10 +90,10 @@ AS_IF([test -z "$LDISKFS_SERIES"], [ AS_VERSION_COMPARE([$LINUXRELEASE],[5.4.0],[], [LDISKFS_SERIES="5.4.0-ml.series"],[ - AS_VERSION_COMPARE([$LINUXRELEASE],[5.4.0], - [LDISKFS_SERIES="5.4.0-ml.series"], # lt - [LDISKFS_SERIES="5.4.0-ml.series"], # eq - [LDISKFS_SERIES="5.4.0-ml.series"] # gt + AS_VERSION_COMPARE([$LINUXRELEASE],[5.4.21], + [LDISKFS_SERIES="5.4.0-ml.series"], # lt + [LDISKFS_SERIES="5.4.21-ml.series"], # eq + [LDISKFS_SERIES="5.4.21-ml.series"] # gt )]) ], []) diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.4.21-ml.series b/ldiskfs/kernel_patches/series/ldiskfs-5.4.21-ml.series new file mode 100644 index 0000000..0e439de --- /dev/null +++ b/ldiskfs/kernel_patches/series/ldiskfs-5.4.21-ml.series @@ -0,0 +1,28 @@ +rhel8/ext4-inode-version.patch +linux-5.4/ext4-lookup-dotdot.patch +suse15/ext4-print-inum-in-htree-warning.patch +rhel8/ext4-prealloc.patch +ubuntu18/ext4-osd-iop-common.patch +ubuntu19/ext4-misc.patch +rhel8/ext4-mballoc-extra-checks.patch +linux-5.4/ext4-hash-indexed-dir-dotdot-update.patch +linux-5.4/ext4-kill-dx-root.patch +rhel7.6/ext4-mballoc-pa-free-mismatch.patch +linux-5.4/ext4-data-in-dirent.patch +rhel8/ext4-nocmtime.patch +base/ext4-htree-lock.patch +ubuntu20/ext4-pdirop.patch +rhel8/ext4-max-dir-size.patch +rhel8/ext4-corrupted-inode-block-bitmaps-handling-patches.patch +linux-5.4/ext4-give-warning-with-dir-htree-growing.patch +ubuntu18/ext4-jcb-optimization.patch +linux-5.4/ext4-attach-jinode-in-writepages.patch +rhel8/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 +rhel8/ext4-export-mb-stream-allocator-variables.patch +ubuntu19/ext4-iget-with-flags.patch +linux-5.4/export-ext4fs-dirhash-helper.patch +linux-5.4/ext4-misc.patch +rhel8/ext4-simple-blockalloc.patch +base/ext4-no-max-dir-size-limit-for-iam-objects.patch