LU-13839 ldiskfs: fix detecting ext4_journal_ensure_credits

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

diff --git a/config/lustre-build-ldiskfs.m4 b/config/lustre-build-ldiskfs.m4
index 0835d52..74fdbf3 100644 (file)
--- a/config/lustre-build-ldiskfs.m4
+++ b/config/lustre-build-ldiskfs.m4
@@ -13,8 +13,11 @@ esac
 AS_IF([test -z "$LDISKFS_SERIES"], [
 AS_IF([test x$RHEL_KERNEL = xyes], [
        case $RHEL_RELEASE_NO in
+       83)     LDISKFS_SERIES="4.18-rhel8.3.series"    ;;
+       82)     LDISKFS_SERIES="4.18-rhel8.2.series"    ;;
        81)     LDISKFS_SERIES="4.18-rhel8.1.series"    ;;
        80)     LDISKFS_SERIES="4.18-rhel8.series"      ;;
+       79)     LDISKFS_SERIES="3.10-rhel7.9.series"    ;;
        78)     LDISKFS_SERIES="3.10-rhel7.8.series"    ;;
        77)     LDISKFS_SERIES="3.10-rhel7.7.series"    ;;
        76)     LDISKFS_SERIES="3.10-rhel7.6.series"    ;;
@@ -43,10 +46,10 @@ 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.3.0],[
+       AS_VERSION_COMPARE([$LINUXRELEASE],[5.4.0],[
        AS_VERSION_COMPARE([$LINUXRELEASE],[5.0.0],[
        AS_VERSION_COMPARE([$LINUXRELEASE],[4.15.0],[
        AS_VERSION_COMPARE([$LINUXRELEASE],[4.4.0], [],
@@ -78,7 +81,8 @@ AS_IF([test x$RHEL_KERNEL = xyes], [
        [LDISKFS_SERIES="4.15.0-24-ubuntu18.series"])],
        [LDISKFS_SERIES="5.0.0-13-ubuntu19.series"],
        [LDISKFS_SERIES="5.0.0-13-ubuntu19.series"])],
-       [LDISKFS_SERIES="5.4.0-ml.series"],
+       [LDISKFS_SERIES="5.4.0-42-ubuntu20.series"],
+       [LDISKFS_SERIES="5.4.0-42-ubuntu20.series"],
        [LDISKFS_SERIES="5.4.0-ml.series"])
 ])
 ])
@@ -87,10 +91,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
                )])
        ],
 [])
@@ -223,6 +227,33 @@ ext4_i_crypt_info, [
 ]) # LB_EXT4_HAVE_I_CRYPT_INFO
 
 #
+# LB_LDISKFS_JOURNAL_ENSURE_CREDITS
+#
+# kernel 4.18.0-240.1.1.el8 and
+# kernel 5.4 commit a413036791d040e33badcc634453a4d0c0705499
+#
+# ext4_journal_ensure_credits was introduced to ensure given handle
+# has at least requested amount of credits available, and possibly
+# restarting transaction if needed.
+#
+AC_DEFUN([LB_LDISKFS_JOURNAL_ENSURE_CREDITS], [
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_CHECK_COMPILE([if 'ext4_journal_ensure_credits' exists],
+ext4_journal_ensure_credits, [
+       #include "$EXT4_SRC_DIR/ext4_jbd2.h"
+       int __ext4_journal_ensure_credits(handle_t *handle, int check_cred,
+               int extend_cred, int revoke_cred) { return 0; }
+],[
+       ext4_journal_ensure_credits(NULL, 0, 0);
+],[
+       AC_DEFINE(HAVE_LDISKFS_JOURNAL_ENSURE_CREDITS, 1,
+               ['ext4_journal_ensure_credits' exists])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+]) # LB_LDISKFS_JOURNAL_ENSURE_CREDITS
+
+#
 # LB_LDISKFS_IGET_HAS_FLAGS_ARG
 #
 # kernel 4.19 commit 8a363970d1dc38c4ec4ad575c862f776f468d057
@@ -339,12 +370,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], [
@@ -392,9 +445,11 @@ AS_IF([test x$enable_ldiskfs != xno],[
        LB_EXT4_BREAD_4ARGS
        LB_EXT4_HAVE_INFO_DQUOT
        LB_EXT4_HAVE_I_CRYPT_INFO
+       LB_LDISKFS_JOURNAL_ENSURE_CREDITS
        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])