From: Jian Yu Date: Thu, 1 Apr 2021 01:50:31 +0000 (-0700) Subject: LU-14577 ldiskfs: support Ubuntu 20.04 kernel 5.4.0-1007 X-Git-Tag: 2.14.52~152 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=e6c63940ab354dddffb90b66f7aa9bfdb2a33677;hp=4a6ed7d6351e4fffd8af5745bfe7cbb161c46858;p=fs%2Flustre-release.git LU-14577 ldiskfs: support Ubuntu 20.04 kernel 5.4.0-1007 While applying 5.4.0-66-ubuntu20.series ldiskfs patches to kernel 5.4.0-1007, there is a conflict in ext4_update_dx_flag() in ubuntu2004/ext4-pdirop.patch. It turns out the ext4_update_dx_flag() codes in kernel 5.4.0-1007 are the same with those in kernel version smaller than 5.4.0-66. So, 5.4.0-42-ubuntu20.series works. This patch fixes lustre-build-ldiskfs.m4 to detect 5.4.0-42-ubuntu20.series for kernel 5.4.0-1007. Test-Parameters: trivial Change-Id: I3cd932b8ae2d7c7f4f900b8b18647a4252d100b2 Signed-off-by: Jian Yu Reviewed-on: https://review.whamcloud.com/43187 Tested-by: jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Yang Sheng Reviewed-by: Sebastien Buisson Reviewed-by: Li Dongyang Reviewed-by: Oleg Drokin --- diff --git a/config/lustre-build-ldiskfs.m4 b/config/lustre-build-ldiskfs.m4 index dd05fcc..67e3b41 100644 --- a/config/lustre-build-ldiskfs.m4 +++ b/config/lustre-build-ldiskfs.m4 @@ -89,8 +89,8 @@ AS_IF([test x$RHEL_KERNEL = xyes], [ AC_MSG_WARN([Failed to determine Kernel patch level. Assume latest.]) LDISKFS_SERIES="5.4.0-66-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 26], [LDISKFS_SERIES="5.4.0-42-ubuntu20.series"], [LDISKFS_SERIES="5.4.0-42-ubuntu20.series"] ) ],