From 89ad68452012624d4d29553b271080305b2a44d4 Mon Sep 17 00:00:00 2001 From: James Simmons Date: Wed, 18 Aug 2021 12:15:29 -0400 Subject: [PATCH] LU-14904 ldiskfs: add support for Ubuntu20 kernel 5.4.0.80 Changes from newer 5.4.0 kernel version have been backported to Ubuntu20. Test for Ubuntu 5.4.0.80 kernels so we use the correct series file with the updated ext-simple-blockalloc.patch. Test-Parameters: trivial Change-Id: I73ad558a306ec50fb1ba45e6ab2c59aaec047197 Signed-off-by: James Simmons Reviewed-on: https://review.whamcloud.com/44703 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Yang Sheng Reviewed-by: Jian Yu Reviewed-by: Oleg Drokin --- config/lustre-build-ldiskfs.m4 | 3 ++- .../series/ldiskfs-5.4.0-80-ubuntu20.series | 29 ++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 ldiskfs/kernel_patches/series/ldiskfs-5.4.0-80-ubuntu20.series diff --git a/config/lustre-build-ldiskfs.m4 b/config/lustre-build-ldiskfs.m4 index 38e336c..17b36e2 100644 --- a/config/lustre-build-ldiskfs.m4 +++ b/config/lustre-build-ldiskfs.m4 @@ -89,10 +89,11 @@ AS_IF([test x$RHEL_KERNEL = xyes], [ AS_IF( [test -z "$KPLEV"], [ AC_MSG_WARN([Failed to determine Kernel patch level. Assume latest.]) - LDISKFS_SERIES="5.4.0-66-ubuntu20.series" + LDISKFS_SERIES="5.4.0-80-ubuntu20.series" ], [test $KPLEV -eq 1007], [LDISKFS_SERIES="5.4.0-42-ubuntu20.series"], [test $KPLEV -ge 66], [LDISKFS_SERIES="5.4.0-66-ubuntu20.series"], + [test $KPLEV -ge 80], [LDISKFS_SERIES="5.4.0-80-ubuntu20.series"], [LDISKFS_SERIES="5.4.0-42-ubuntu20.series"] ) ], diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-80-ubuntu20.series b/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-80-ubuntu20.series new file mode 100644 index 0000000..7594d4c --- /dev/null +++ b/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-80-ubuntu20.series @@ -0,0 +1,29 @@ +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 +ubuntu2004/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 +linux-5.4/ext4-simple-blockalloc.patch +base/ext4-no-max-dir-size-limit-for-iam-objects.patch +rhel8/ext4-ialloc-uid-gid-and-pass-owner-down.patch -- 1.8.3.1