AS_IF([test -z "$LDISKFS_SERIES"], [
AS_IF([test x$RHEL_KERNEL = xyes], [
case $RHEL_RELEASE_NO in
+ 84) LDISKFS_SERIES="4.18-rhel8.4.series" ;;
+ 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" ;;
;;
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.8.0],[
AS_VERSION_COMPARE([$LINUXRELEASE],[5.4.0],[
AS_VERSION_COMPARE([$LINUXRELEASE],[5.0.0],[
AS_VERSION_COMPARE([$LINUXRELEASE],[4.15.0],[
[LDISKFS_SERIES="5.0.0-13-ubuntu19.series"],
[LDISKFS_SERIES="5.0.0-13-ubuntu19.series"])],
[LDISKFS_SERIES="5.4.0-42-ubuntu20.series"],
- [LDISKFS_SERIES="5.4.0-42-ubuntu20.series"],
- [LDISKFS_SERIES="5.4.0-ml.series"])
+ [
+ KPLEV=$(echo $LINUXRELEASE | cut -d'-' -f2)
+ AS_IF(
+ [test -z "$KPLEV"], [
+ 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"],
+ [LDISKFS_SERIES="5.4.0-42-ubuntu20.series"]
+ )
+ ],
+ [LDISKFS_SERIES="5.4.0-ml.series"])],
+ [LDISKFS_SERIES="5.8.0-53-ubuntu20.series"],
+ [LDISKFS_SERIES="5.8.0-53-ubuntu20.series"],
+ [LDISKFS_SERIES="5.8.0-ml.series"])
])
])
# Not RHEL/SLES or Ubuntu .. probably mainline
[
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
+ [AS_VERSION_COMPARE([$LINUXRELEASE],[5.8.0],
+ [LDISKFS_SERIES="5.4.21-ml.series"], # lt
+ [LDISKFS_SERIES="5.8.0-ml.series"], # eq
+ [LDISKFS_SERIES="5.8.0-ml.series"], # gt
+ )]
)])
],
[])
]) # 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
]) # LB_JBD2_H_TOTAL_CREDITS
#
+# LB_EXT4_GET_BLOCKS_KEEP_SIZE
+#
+# kernel 5.6-rc4 commit 9e52484c713321e84e8834803a44ca0a001376d2
+# ext4: remove EXT4_GET_BLOCKS_KEEP_SIZE flag
+#
+AC_DEFUN([LB_EXT4_GET_BLOCKS_KEEP_SIZE], [
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_CHECK_COMPILE([if EXT4_GET_BLOCKS_KEEP_SIZE exists],
+ext4_get_blocks_keep_size, [
+ #include <linux/fs.h>
+ #include "$EXT4_SRC_DIR/ext4.h"
+],[
+ int f = EXT4_IGET_SPECIAL;
+ (void)f;
+],[
+ AC_DEFINE(HAVE_LDISKFS_GET_BLOCKS_KEEP_SIZE, 1,
+ [EXT4_GET_BLOCKS_KEEP_SIZE hasn't been removed])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+]) # LB_EXT4_GET_BLOCKS_KEEP_SIZE
+
+#
# LB_CONFIG_LDISKFS
#
AC_DEFUN([LB_CONFIG_LDISKFS], [
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
+ LB_EXT4_GET_BLOCKS_KEEP_SIZE
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])