X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=config%2Flustre-build-ldiskfs.m4;h=8948c7ee94f10c05768097129ad0dd0dd47d3db5;hp=56a43ef60b56f61a6beb1e02d76316d8d704a666;hb=1970a12d7d559dd6d08765047af2b99a3a388524;hpb=8958ecee22010dfa1b99220c2288f7369f490871

diff --git a/config/lustre-build-ldiskfs.m4 b/config/lustre-build-ldiskfs.m4
index 56a43ef..8948c7e 100644
--- a/config/lustre-build-ldiskfs.m4
+++ b/config/lustre-build-ldiskfs.m4
@@ -340,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], [
@@ -396,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])