LU-13606 lnet: Allow router to forward to healthier NID

[fs/lustre-release.git] / config / lustre-build-ldiskfs.m4

diff --git a/config/lustre-build-ldiskfs.m4 b/config/lustre-build-ldiskfs.m4
index 6358dbf..8948c7e 100644 (file)
--- a/config/lustre-build-ldiskfs.m4
+++ b/config/lustre-build-ldiskfs.m4
@@ -13,6 +13,7 @@ esac
 AS_IF([test -z "$LDISKFS_SERIES"], [
 AS_IF([test x$RHEL_KERNEL = xyes], [
        case $RHEL_RELEASE_NO in
+       82)     LDISKFS_SERIES="4.18-rhel8.2.series"    ;;
        81)     LDISKFS_SERIES="4.18-rhel8.1.series"    ;;
        80)     LDISKFS_SERIES="4.18-rhel8.series"      ;;
        78)     LDISKFS_SERIES="3.10-rhel7.8.series"    ;;
@@ -21,23 +22,7 @@ AS_IF([test x$RHEL_KERNEL = xyes], [
        esac
 ], [test x$SUSE_KERNEL = xyes], [
        AS_VERSION_COMPARE([$LINUXRELEASE],[5.3.18],[
-       AS_VERSION_COMPARE([$LINUXRELEASE],[4.12.14],[
-       AS_VERSION_COMPARE([$LINUXRELEASE],[4.4.82],[
-       AS_VERSION_COMPARE([$LINUXRELEASE],[4.4.0],[
-       AS_VERSION_COMPARE([$LINUXRELEASE],[3.12.0],[],
-       [LDISKFS_SERIES="3.12-sles12.series"],[
-               PLEV=$(grep PATCHLEVEL /etc/SuSE-release | sed -e 's/.*= *//')
-               case $PLEV in # (
-               1) LDISKFS_SERIES="3.12-sles12sp1.series"
-                       ;; # (
-               *) LDISKFS_SERIES="3.12-sles12.series"
-                       ;;
-               esac
-       ])],[LDISKFS_SERIES="4.4-sles12sp2.series"],
-           [LDISKFS_SERIES="4.4-sles12sp2.series"]
-       )], [LDISKFS_SERIES="4.4-sles12sp3.series"],
-           [LDISKFS_SERIES="4.4-sles12sp3.series"]
-       )], [], [
+       AS_VERSION_COMPARE([$LINUXRELEASE],[4.12.14],[], [], [
                suse_conf=$LINUX_OBJ/include/generated/uapi/linux/suse_version.h
                suse_vers=$(awk '[$]2 == "SUSE_VERSION" {print [$]3 }' $suse_conf)
                suse_patchlevel=$(awk '[$]2 == "SUSE_PATCHLEVEL" {print [$]3 }' $suse_conf)
@@ -355,12 +340,34 @@ ext4fs_dirhash, [
        (void)f;
 ],[
        AC_DEFINE(HAVE_LDISKFSFS_GETHASH_INODE_ARG, 1,
-               [if ldiskfsfs_dirhash takes an inode argument])
+               [ldiskfsfs_dirhash takes an inode argument])
 ])
 EXTRA_KCFLAGS="$tmp_flags"
 ]) # LB_LDISKFSFS_DIRHASH_WANTS_DIR
 
 #
+# LB_JBD2_H_TOTAL_CREDITS
+#
+# kernel 5.5 commit 933f1c1e0b75bbc29730eef07c9e196c6dfd37e5
+# jbd2: Reserve space for revoke descriptor blocks
+#
+AC_DEFUN([LB_JBD2_H_TOTAL_CREDITS], [
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_CHECK_COMPILE([if struct jbd2_journal_handle has h_total_credits member],
+handle_t_h_revoke_credits, [
+       #include <linux/jbd2.h>
+],[
+       int x = offsetof(struct jbd2_journal_handle, h_total_credits);
+       (void)x;
+],[
+       AC_DEFINE(HAVE_JOURNAL_TOTAL_CREDITS, 1,
+               [struct jbd2_journal_handle has h_total_credits member])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+]) # LB_JBD2_H_TOTAL_CREDITS
+
+#
 # LB_CONFIG_LDISKFS
 #
 AC_DEFUN([LB_CONFIG_LDISKFS], [
@@ -411,6 +418,7 @@ AS_IF([test x$enable_ldiskfs != xno],[
        LB_LDISKFS_IGET_HAS_FLAGS_ARG
        LB_LDISKFS_FIND_ENTRY_LOCKED_EXISTS
        LB_LDISKFSFS_DIRHASH_WANTS_DIR
+       LB_JBD2_H_TOTAL_CREDITS
        AC_DEFINE(CONFIG_LDISKFS_FS_POSIX_ACL, 1, [posix acls for ldiskfs])
        AC_DEFINE(CONFIG_LDISKFS_FS_SECURITY, 1, [fs security for ldiskfs])
        AC_DEFINE(CONFIG_LDISKFS_FS_XATTR, 1, [extened attributes for ldiskfs])