+# SPDX-License-Identifier: GPL-2.0
+
+#
+# This file is part of Lustre, http://www.lustre.org/
+#
+# config/lustre-build-ldiskfs.m4
+#
+# ldiskfs OSD related configuration
+#
+
#
# LDISKFS_LINUX_SERIES
#
AS_IF([test -z "$LDISKFS_SERIES"], [
AS_IF([test x$RHEL_KERNEL = xyes], [
case $RHEL_RELEASE_NO in
+ 93) LDISKFS_SERIES="5.14-rhel9.3.series" ;;
+ 92) LDISKFS_SERIES="5.14-rhel9.2.series" ;;
+ 91) LDISKFS_SERIES="5.14-rhel9.1.series" ;;
+ 90) LDISKFS_SERIES="5.14-rhel9.series" ;;
+ 89) LDISKFS_SERIES="4.18-rhel8.9.series" ;;
+ 88) LDISKFS_SERIES="4.18-rhel8.8.series" ;;
+ 87) LDISKFS_SERIES="4.18-rhel8.7.series" ;;
+ 86) LDISKFS_SERIES="4.18-rhel8.6.series" ;;
85) LDISKFS_SERIES="4.18-rhel8.5.series" ;;
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" ;;
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" ;;
esac
], [test x$SUSE_KERNEL = xyes], [
AS_VERSION_COMPARE([$LINUXRELEASE],[5.3.18],[
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)
- echo "$suse_conf $suse_vers $suse_patchlevel ${suse_vers}sp$suse_patchlevel" >> /tmp/log-nb
case ${suse_vers}sp$suse_patchlevel in # (
15sp0 ) LDISKFS_SERIES="4.12-sles15.series"
if test ! -f $LINUX/arch/x86/kernel/cpu/hygon.c ; then
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)
- echo "$suse_conf $suse_vers $suse_patchlevel ${suse_vers}sp$suse_patchlevel" >> /tmp/log-nb
-
case ${suse_vers}sp${suse_patchlevel} in # (
15sp2 ) LDISKFS_SERIES="5.4.21-ml.series"
- grep -A3 ext4_update_dx_flag $LINUX/fs/ext4/ext4.h \
+ grep -A3 ext4_update_dx_flag $LINUX/fs/ext4/ext4.h \
| grep ext4_test_inode_flag
if test $? -eq 0; then
LDISKFS_SERIES="5.4.0-66-ubuntu20.series"
fi
;; # (
- 15sp3 ) LDISKFS_SERIES="5.3.18-sles15sp2.series"
+ 15sp3 ) LDISKFS_SERIES="5.3.18-sles15sp3.series"
+ update=$(echo $LINUXRELEASE | cut -d- -f2 | cut -d. -f2)
+ if test $update -ge 59; then
+ LDISKFS_SERIES="5.3.18-sles15sp3-59.series"
+ fi
+ ;;
+ 15sp4 ) LDISKFS_SERIES="5.14.21-sles15sp4.series"
+ ;;
+ 15sp5 ) LDISKFS_SERIES="5.14.21-sles15sp5.series"
;;
esac
])
], [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],[
- AS_VERSION_COMPARE([$LINUXRELEASE],[4.4.0], [],
+ BASEVER=$(echo $LINUXRELEASE | cut -d'-' -f1)
+ AS_VERSION_COMPARE([$BASEVER],[5.15.0],[
+ AS_VERSION_COMPARE([$BASEVER],[5.11.0],[
+ AS_VERSION_COMPARE([$BASEVER],[5.8.0],[
+ AS_VERSION_COMPARE([$BASEVER],[5.4.0],[
+ AS_VERSION_COMPARE([$BASEVER],[5.0.0],[
+ AS_VERSION_COMPARE([$BASEVER],[4.15.0],[
+ AS_VERSION_COMPARE([$BASEVER],[4.4.0], [],
[
- KPLEV=$(echo $LINUXRELEASE | sed -n 's/.*-\([0-9]\+\).*/\1/p')
+ KPLEV=$(echo $LINUXRELEASE | cut -d'-' -f2)
AS_IF(
[test -z "$KPLEV"], [
AC_MSG_WARN([Failed to determine Kernel patch level. Assume latest.])
],
[LDISKFS_SERIES="4.4.0-73-ubuntu14+16.series"])],
[
- KPLEV=$(echo $LINUXRELEASE | sed -n 's/.*-\([0-9]\+\).*/\1/p')
+ KPLEV=$(echo $LINUXRELEASE | cut -d'-' -f2)
AS_IF(
[test -z "$KPLEV"], [
AC_MSG_WARN([Failed to determine Kernel patch level. Assume latest.])
[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-42-ubuntu20.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-80-ubuntu20.series"
+ LDISKFS_SERIES="5.4.0-90-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 90], [LDISKFS_SERIES="5.4.0-90-ubuntu20.series"],
[test $KPLEV -ge 80], [LDISKFS_SERIES="5.4.0-80-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"])
+ [
+ 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.8.0-63-ubuntu20.series"
+ ],
+ [test $KPLEV -ge 63], [LDISKFS_SERIES="5.8.0-63-ubuntu20.series"],
+ [LDISKFS_SERIES="5.8.0-53-ubuntu20.series"]
+ )
+ ],
+ [LDISKFS_SERIES="5.8.0-ml.series"])],
+ [LDISKFS_SERIES="5.11.0-40-ubuntu20.series"],
+ [LDISKFS_SERIES="5.11.0-40-ubuntu20.series"])],
+ [LDISKFS_SERIES="5.15.0-83-ubuntu20.series"],
+ [LDISKFS_SERIES="5.15.0-83-ubuntu20.series"])
+], [test x$OPENEULER_KERNEL = xyes], [
+ case $OPENEULER_VERSION_NO in
+ 2203.0) LDISKFS_SERIES="5.10.0-oe2203.series" ;;
+ 2203.*) LDISKFS_SERIES="5.10.0-oe2203sp1.series" ;;
+ esac
])
])
-# Not RHEL/SLES or Ubuntu .. probably mainline
+# Not RHEL/SLES/openEuler or Ubuntu .. probably mainline
AS_IF([test -z "$LDISKFS_SERIES"],
[
AS_VERSION_COMPARE([$LINUXRELEASE],[5.4.0],[],
[AS_VERSION_COMPARE([$LINUXRELEASE],[5.9.0],
[LDISKFS_SERIES="5.8.0-ml.series"], # lt
[LDISKFS_SERIES="5.9.0-ml.series"], # eq
- [LDISKFS_SERIES="5.9.0-ml.series"], # gt
+ [AS_VERSION_COMPARE([$LINUXRELEASE],[5.10.0],
+ [LDISKFS_SERIES="5.9.0-ml.series"], # lt
+ [LDISKFS_SERIES="5.10.0-ml.series"], # eq
+ [LDISKFS_SERIES="5.10.0-ml.series"], # gt
+ )]
)]
)]
)])
]) # LDISKFS_LINUX_SERIES
#
-# LB_EXT_FREE_BLOCKS_WITH_BUFFER_HEAD
-#
-# 2.6.32-rc7 ext4_free_blocks requires struct buffer_head
-# Note that RHEL6 is pre 2.6.32-rc7 so this check is still needed.
-#
-AC_DEFUN([LB_EXT_FREE_BLOCKS_WITH_BUFFER_HEAD], [
-LB_CHECK_COMPILE([if 'ext4_free_blocks' needs 'struct buffer_head'],
-ext4_free_blocks_with_buffer_head, [
- #include <linux/fs.h>
- #include "$EXT4_SRC_DIR/ext4.h"
-],[
- ext4_free_blocks(NULL, NULL, NULL, 0, 0, 0);
-],[
- AC_DEFINE(HAVE_EXT_FREE_BLOCK_WITH_BUFFER_HEAD, 1,
- [ext4_free_blocks do not require struct buffer_head])
-])
-]) # LB_EXT_FREE_BLOCKS_WITH_BUFFER_HEAD
-
-#
-# LB_EXT4_JOURNAL_START_3ARGS
-#
-# 3.9 added a type argument to ext4_journal_start and friends
-#
-AC_DEFUN([LB_EXT4_JOURNAL_START_3ARGS], [
-LB_CHECK_COMPILE([if ext4_journal_start takes 3 arguments],
-ext4_journal_start, [
- #include <linux/fs.h>
- #include "$EXT4_SRC_DIR/ext4_jbd2.h"
-],[
- ext4_journal_start(NULL, 0, 0);
-],[
- AC_DEFINE(JOURNAL_START_HAS_3ARGS, 1, [ext4_journal_start takes 3 arguments])
-])
-]) # LB_EXT4_JOURNAL_START_3ARGS
-
-#
# LB_EXT4_BREAD_4ARGS
#
# 3.18 ext4_bread has 4 arguments
# NOTE: It may not be exported for modules, use a positive compiler test here.
#
-AC_DEFUN([LB_EXT4_BREAD_4ARGS], [
-LB_CHECK_COMPILE([if ext4_bread takes 4 arguments],
-ext4_bread, [
- #include <linux/fs.h>
- #include "$EXT4_SRC_DIR/ext4.h"
-
- struct buffer_head *ext4_bread(handle_t *handle, struct inode *inode,
- ext4_lblk_t block, int map_flags)
- {
- struct buffer_head *bh = NULL;
- (void)handle;
- (void)inode;
- (void)block;
- (void)map_flags;
- return bh;
- }
-],[
- ext4_bread(NULL, NULL, 0, 0);
-],[
- AC_DEFINE(HAVE_EXT4_BREAD_4ARGS, 1, [ext4_bread takes 4 arguments])
+AC_DEFUN([LB_SRC_EXT4_BREAD_4ARGS], [
+ LB2_LINUX_TEST_SRC([ext4_bread], [
+ #include <linux/fs.h>
+ #include "$EXT4_SRC_DIR/ext4.h"
+
+ struct buffer_head *ext4_bread(handle_t *handle,
+ struct inode *inode,
+ ext4_lblk_t block, int map_flags)
+ {
+ struct buffer_head *bh = NULL;
+ (void)handle;
+ (void)inode;
+ (void)block;
+ (void)map_flags;
+ return bh;
+ }
+ ],[
+ ext4_bread(NULL, NULL, 0, 0);
+ ],[],[],[ext4_bread])
])
+AC_DEFUN([LB_EXT4_BREAD_4ARGS], [
+ LB2_MSG_LINUX_TEST_RESULT([if ext4_bread takes 4 arguments],
+ [ext4_bread], [
+ AC_DEFINE(HAVE_EXT4_BREAD_4ARGS, 1,
+ [ext4_bread takes 4 arguments])
+ ])
]) # LB_EXT4_BREAD_4ARGS
#
#
# in linux 4.4 i_dqout is in ext4_inode_info, not in struct inode
#
-AC_DEFUN([LB_EXT4_HAVE_INFO_DQUOT], [
-LB_CHECK_COMPILE([if i_dquot is in ext4_inode_info],
-ext4_info_dquot, [
- #include <linux/fs.h>
- #include <linux/quota.h>
- #include "$EXT4_SRC_DIR/ext4.h"
-],[
- struct ext4_inode_info in;
- struct dquot *dq;
+AC_DEFUN([LB_SRC_EXT4_HAVE_INFO_DQUOT], [
+ LB2_LINUX_TEST_SRC([ext4_info_dquot], [
+ #include <linux/fs.h>
+ #include <linux/quota.h>
+ #include "$EXT4_SRC_DIR/ext4.h"
+ ],[
+ struct ext4_inode_info in;
+ struct dquot *dq;
- dq = in.i_dquot[0];
-],[
- AC_DEFINE(HAVE_EXT4_INFO_DQUOT, 1, [i_dquot is in ext4_inode_info])
+ dq = in.i_dquot[0];
+ ])
])
+AC_DEFUN([LB_EXT4_HAVE_INFO_DQUOT], [
+ LB2_MSG_LINUX_TEST_RESULT([if i_dquot is in ext4_inode_info],
+ [ext4_info_dquot], [
+ AC_DEFINE(HAVE_EXT4_INFO_DQUOT, 1,
+ [i_dquot is in ext4_inode_info])
+ ])
]) # LB_EXT4_HAVE_INFO_DQUOT
#
# Otherwise i_crypy_info is in struct inode, we need to check kernel
# config option to determine that.
#
-AC_DEFUN([LB_EXT4_HAVE_I_CRYPT_INFO], [
-LB_CHECK_COMPILE([if i_crypt_info is in ext4_inode_info],
-ext4_i_crypt_info, [
- #define CONFIG_EXT4_FS_ENCRYPTION 1
- #include <linux/fs.h>
- #include "$EXT4_SRC_DIR/ext4.h"
-],[
- struct ext4_inode_info in;
+AC_DEFUN([LB_SRC_EXT4_HAVE_I_CRYPT_INFO], [
+ LB2_SRC_CHECK_CONFIG([EXT4_FS_ENCRYPTION])
+ LB2_LINUX_TEST_SRC([ext4_i_crypt_info], [
+ #define CONFIG_EXT4_FS_ENCRYPTION 1
+ #include <linux/fs.h>
+ #include "$EXT4_SRC_DIR/ext4.h"
+ ],[
+ struct ext4_inode_info in;
- in.i_crypt_info = NULL;
-],[
- AC_DEFINE(
- CONFIG_LDISKFS_FS_ENCRYPTION, 1,
- [enable encryption for ldiskfs]
- )
-],[
- LB_CHECK_CONFIG([EXT4_FS_ENCRYPTION],[
- AC_DEFINE(
- CONFIG_LDISKFS_FS_ENCRYPTION, 1,
- [enable encryption for ldiskfs]
- )
+ in.i_crypt_info = NULL;
])
])
+AC_DEFUN([LB_EXT4_HAVE_I_CRYPT_INFO], [
+ LB2_MSG_LINUX_TEST_RESULT([if i_crypt_info is in ext4_inode_info],
+ [ext4_i_crypt_info], [
+ AC_DEFINE(CONFIG_LDISKFS_FS_ENCRYPTION, 1,
+ [enable encryption for ldiskfs])
+ test_have_i_crypt_info=yes
+ ],[
+ test_have_i_crypt_info=no
+ ])
+ AS_IF([test x$test_have_i_crypt_info = xno], [
+ LB2_TEST_CHECK_CONFIG([EXT4_FS_ENCRYPTION],[
+ AC_DEFINE(CONFIG_LDISKFS_FS_ENCRYPTION, 1,
+ [enable encryption for ldiskfs])
+ ])
+ ])
]) # LB_EXT4_HAVE_I_CRYPT_INFO
#
# 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])
+AC_DEFUN([LB_SRC_LDISKFS_JOURNAL_ENSURE_CREDITS], [
+ LB2_LINUX_TEST_SRC([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);
+ ],[-Werror],[],[__ext4_journal_ensure_credits])
])
-EXTRA_KCFLAGS="$tmp_flags"
+AC_DEFUN([LB_LDISKFS_JOURNAL_ENSURE_CREDITS], [
+ LB2_MSG_LINUX_TEST_RESULT([if 'ext4_journal_ensure_credits' exists],
+ [ext4_journal_ensure_credits], [
+ AC_DEFINE(HAVE_LDISKFS_JOURNAL_ENSURE_CREDITS, 1,
+ ['ext4_journal_ensure_credits' exists])
+ ])
]) # LB_LDISKFS_JOURNAL_ENSURE_CREDITS
#
# kernel 4.19 commit 8a363970d1dc38c4ec4ad575c862f776f468d057
# ext4_iget changed to a macro with 3 args was function with 2 args
#
-AC_DEFUN([LB_LDISKFS_IGET_HAS_FLAGS_ARG], [
-tmp_flags="$EXTRA_KCFLAGS"
-EXTRA_KCFLAGS="-Werror"
-LB_CHECK_COMPILE([if ldiskfs_iget takes a flags argument],
-ext4_iget_3args, [
- #include <linux/fs.h>
- #include "$EXT4_SRC_DIR/ext4.h"
-],[
- int f = EXT4_IGET_SPECIAL;
- (void)f;
-],[
- AC_DEFINE(HAVE_LDISKFS_IGET_WITH_FLAGS, 1,
- [if ldiskfs_iget takes a flags argument])
+AC_DEFUN([LB_SRC_LDISKFS_IGET_HAS_FLAGS_ARG], [
+ LB2_LINUX_TEST_SRC([ext4_iget_3args], [
+ #include <linux/fs.h>
+ #include "$EXT4_SRC_DIR/ext4.h"
+ ],[
+ int f = EXT4_IGET_SPECIAL;
+ (void)f;
+ ],[-Werror])
])
-EXTRA_KCFLAGS="$tmp_flags"
+AC_DEFUN([LB_LDISKFS_IGET_HAS_FLAGS_ARG], [
+ LB2_MSG_LINUX_TEST_RESULT([if ldiskfs_iget takes a flags argument],
+ [ext4_iget_3args], [
+ AC_DEFINE(HAVE_LDISKFS_IGET_WITH_FLAGS, 1,
+ [if ldiskfs_iget takes a flags argument])
+ ])
]) # LB_LDISKFS_IGET_HAS_FLAGS_ARG
#
#
AC_DEFUN([LDISKFS_AC_PATCH_PROGRAM], [
AC_ARG_ENABLE([quilt],
- [AC_HELP_STRING([--disable-quilt],
+ [AS_HELP_STRING([--disable-quilt],
[disable use of quilt for ldiskfs])],
[AS_IF([test "x$enableval" = xno],
[use_quilt=no],
# When the following check succeeds __ext4_find_entry helper is not
# used.
#
-AC_DEFUN([LB_LDISKFS_FIND_ENTRY_LOCKED_EXISTS], [
-tmp_flags="$EXTRA_KCFLAGS"
-EXTRA_KCFLAGS="-Werror"
-LB_CHECK_COMPILE([if __ldiskfs_find_entry is available],
-ldiskfs_find_entry_locked, [
- #include <linux/fs.h>
- #include "$EXT4_SRC_DIR/ext4.h"
- #include "$EXT4_SRC_DIR/namei.c"
-
- static int __ext4_find_entry(void) { return 0; }
-],[
- int x = __ext4_find_entry();
- (void)x;
-],[
- AC_DEFINE(HAVE___LDISKFS_FIND_ENTRY, 1,
- [if __ldiskfs_find_entry is available])
+AC_DEFUN([LB_SRC_LDISKFS_FIND_ENTRY_LOCKED_EXISTS], [
+ LB2_LINUX_TEST_SRC([ldiskfs_find_entry_locked], [
+ #include <linux/fs.h>
+ #include "$EXT4_SRC_DIR/ext4.h"
+ #include "$EXT4_SRC_DIR/namei.c"
+
+ static int __ext4_find_entry(void) { return 0; }
+ ],[
+ int x = __ext4_find_entry();
+ (void)x;
+ ],[-Werror])
])
-EXTRA_KCFLAGS="$tmp_flags"
+AC_DEFUN([LB_LDISKFS_FIND_ENTRY_LOCKED_EXISTS], [
+ LB2_MSG_LINUX_TEST_RESULT([if __ldiskfs_find_entry is available],
+ [ldiskfs_find_entry_locked], [
+ AC_DEFINE(HAVE___LDISKFS_FIND_ENTRY, 1,
+ [if __ldiskfs_find_entry is available])
+ ])
]) # LB_LDISKFS_FIND_ENTRY_LOCKED_EXISTS
#
# kernel 5.2 commit 8a363970d1dc38c4ec4ad575c862f776f468d057
# ext4fs_dirhash UNICODE support
#
+AC_DEFUN([LB_SRC_LDISKFSFS_DIRHASH_WANTS_DIR], [
+ LB2_LINUX_TEST_SRC([ext4fs_dirhash], [
+ #include <linux/fs.h>
+ #include "$EXT4_SRC_DIR/ext4.h"
+ ],[
+ int f = ext4fs_dirhash(NULL, NULL, 0, NULL);
+ (void)f;
+ ],[-Werror],[],[ext4fs_dirhash])
+])
AC_DEFUN([LB_LDISKFSFS_DIRHASH_WANTS_DIR], [
+ LB2_MSG_LINUX_TEST_RESULT([if ldiskfsfs_dirhash takes an inode argument],
+ [ext4fs_dirhash], [
+ AC_DEFINE(HAVE_LDISKFSFS_DIRHASH_WITH_DIR, 1,
+ [if ldiskfsfs_dirhash takes an inode argument])
+ ])
+]) # 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_SRC_JBD2_H_TOTAL_CREDITS], [
+ LB2_LINUX_TEST_SRC([handle_t_h_revoke_credits], [
+ #include <linux/jbd2.h>
+ ],[
+ int x = offsetof(struct jbd2_journal_handle, h_total_credits);
+ (void)x;
+ ],[-Werror])
+])
+AC_DEFUN([LB_JBD2_H_TOTAL_CREDITS], [
+ LB2_MSG_LINUX_TEST_RESULT([if struct jbd2_journal_handle has h_total_credits member],
+ [handle_t_h_revoke_credits], [
+ AC_DEFINE(HAVE_JOURNAL_TOTAL_CREDITS, 1,
+ [struct jbd2_journal_handle has h_total_credits member])
+ ])
+]) # LB_JBD2_H_TOTAL_CREDITS
+
+#
+# LB_EXT4_INC_DEC_COUNT_2ARGS
+#
+# Linux v5.9-rc7-8-g15ed2851b0f4
+# ext4: remove unused argument from ext4_(inc|dec)_count
+#
+AC_DEFUN([LB_EXT4_INC_DEC_COUNT_2ARGS], [
+ AC_MSG_CHECKING([if ext4_(inc|dec)_count() have 2 arguments])
+ AS_IF([grep -q -E 'void ext4_inc_count.handle_t \*handle' $EXT4_SRC_DIR/namei.c],[
+ AC_DEFINE(HAVE_EXT4_INC_DEC_COUNT_2ARGS, 1,
+ [ext4_(inc|dec)_count() has 2 arguments])
+ AC_MSG_RESULT(yes)
+ ],[
+ AC_MSG_RESULT(no)
+ ])
+]) # LB_EXT4_INC_DEC_COUNT_2ARGS
+
+#
+# LB_JBD2_JOURNAL_GET_MAX_TXN_BUFS
+# Linux commit v5.10-rc2-9-gede7dc7fa0af
+# jbd2: rename j_maxlen to j_total_len and add jbd2_journal_max_txn_bufs
+#
+AC_DEFUN([LB_SRC_JBD2_JOURNAL_GET_MAX_TXN_BUFS], [
+ LB2_LINUX_TEST_SRC([jbd2_journal_get_max_txn_bufs], [
+ #include <linux/jbd2.h>
+ ],[
+ journal_t *journal = NULL;
+ int x = jbd2_journal_get_max_txn_bufs(journal);
+ (void)x;
+ ],[-Werror],[],[])
+])
+AC_DEFUN([LB_JBD2_JOURNAL_GET_MAX_TXN_BUFS], [
+ LB2_MSG_LINUX_TEST_RESULT([if jbd2_journal_get_max_txn_bufs is available],
+ [jbd2_journal_get_max_txn_bufs], [
+ AC_DEFINE(HAVE_JBD2_JOURNAL_GET_MAX_TXN_BUFS, 1,
+ [if jbd2_journal_get_max_txn_bufs is available])
+ ])
+]) # LB_JBD2_JOURNAL_GET_MAX_TXN_BUFS
+
+#
+# LB_EXT4_JOURNAL_GET_WRITE_ACCESS_4A
+#
+# Linux v5.14-rc2-19-g188c299e2a26
+# ext4: Support for checksumming from journal triggers
+#
+AC_DEFUN([LB_EXT4_JOURNAL_GET_WRITE_ACCESS_4A], [
tmp_flags="$EXTRA_KCFLAGS"
EXTRA_KCFLAGS="-Werror"
-LB_CHECK_COMPILE([if ldiskfsfs_dirhash takes an inode argument],
-ext4fs_dirhash, [
+LB_CHECK_COMPILE([if jbd2_journal_get_max_txn_bufs is available],
+ext4_journal_get_write_access, [
#include <linux/fs.h>
#include "$EXT4_SRC_DIR/ext4.h"
+ #include "$EXT4_SRC_DIR/ext4_jbd2.h"
- int ext4fs_dirhash(const struct inode *dir, const char *name, int len,
- struct dx_hash_info *hinfo)
+ int __ext4_journal_get_write_access(const char *where, unsigned int line,
+ handle_t *handle,
+ struct super_block *sb,
+ struct buffer_head *bh,
+ enum ext4_journal_trigger_type trigger_type)
{
- (void)dir;
- (void)name;
- (void)len;
- (void)hinfo;
return 0;
}
],[
- int f = ext4fs_dirhash(NULL, NULL, 0, NULL);
- (void)f;
+ handle_t *handle = NULL;
+ struct super_block *sb = NULL;
+ struct buffer_head *bh = NULL;
+ enum ext4_journal_trigger_type trigger_type = EXT4_JTR_NONE;
+ int err = ext4_journal_get_write_access(handle, sb, bh, trigger_type);
+
+ (void)err;
],[
- AC_DEFINE(HAVE_LDISKFSFS_GETHASH_INODE_ARG, 1,
- [ldiskfsfs_dirhash takes an inode argument])
+ AC_DEFINE(HAVE_EXT4_JOURNAL_GET_WRITE_ACCESS_4ARGS, 1,
+ [ext4_journal_get_write_access() has 4 arguments])
])
EXTRA_KCFLAGS="$tmp_flags"
-]) # LB_LDISKFSFS_DIRHASH_WANTS_DIR
+]) # LB_EXT4_JOURNAL_GET_WRITE_ACCESS_4A
#
-# LB_JBD2_H_TOTAL_CREDITS
-#
-# kernel 5.5 commit 933f1c1e0b75bbc29730eef07c9e196c6dfd37e5
-# jbd2: Reserve space for revoke descriptor blocks
+# LB_HAVE_INODE_LOCK_SHARED
#
-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>
+AC_DEFUN([LB_HAVE_INODE_LOCK_SHARED], [
+LB_CHECK_COMPILE([if inode_lock_shared() defined],
+inode_lock_shared, [
+ #include <linux/fs.h>
],[
- int x = offsetof(struct jbd2_journal_handle, h_total_credits);
- (void)x;
+ struct inode i;
+
+ inode_lock_shared(&i);
],[
- AC_DEFINE(HAVE_JOURNAL_TOTAL_CREDITS, 1,
- [struct jbd2_journal_handle has h_total_credits member])
+ AC_DEFINE(HAVE_INODE_LOCK_SHARED, 1,
+ [inode_lock_shared() defined])
])
-EXTRA_KCFLAGS="$tmp_flags"
-]) # LB_JBD2_H_TOTAL_CREDITS
+]) # LB_HAVE_INODE_LOCK_SHARED
#
-# LB_EXT4_GET_BLOCKS_KEEP_SIZE
-#
-# kernel 5.6-rc4 commit 9e52484c713321e84e8834803a44ca0a001376d2
-# ext4: remove EXT4_GET_BLOCKS_KEEP_SIZE flag
+# LB_HAVE_INODE_IVERSION
#
-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"
+AC_DEFUN([LB_HAVE_INODE_IVERSION], [
+LB_CHECK_COMPILE([if iversion primitives defined],
+inode_set_iversion, [
+ #include <linux/iversion.h>
],[
- int f = EXT4_IGET_SPECIAL;
- (void)f;
+ struct inode i;
+
+ inode_set_iversion(&i, 0);
],[
- AC_DEFINE(HAVE_LDISKFS_GET_BLOCKS_KEEP_SIZE, 1,
- [EXT4_GET_BLOCKS_KEEP_SIZE hasn't been removed])
+ AC_DEFINE(HAVE_INODE_IVERSION, 1,
+ [iversion primitives defined])
])
-EXTRA_KCFLAGS="$tmp_flags"
-]) # LB_EXT4_GET_BLOCKS_KEEP_SIZE
+]) # LB_HAVE_INODE_IVERSION
#
# LB_CONFIG_LDISKFS
LDISKFS_LINUX_SERIES
LDISKFS_AC_PATCH_PROGRAM
- LB_EXT_FREE_BLOCKS_WITH_BUFFER_HEAD
- LB_EXT4_JOURNAL_START_3ARGS
- 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
+ LB_EXT4_INC_DEC_COUNT_2ARGS
+ LB_EXT4_JOURNAL_GET_WRITE_ACCESS_4A
+ LB_HAVE_INODE_LOCK_SHARED
+ LB_HAVE_INODE_IVERSION
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])
AM_CONDITIONAL([LDISKFS_ENABLED], [test x$enable_ldiskfs = xyes])
]) # LB_CONFIG_LDISKFS
-
-AC_DEFUN([LB_EXT4_SRC_DIR_SRC], [])
-AC_DEFUN([LB_EXT4_SRC_DIR_RESULTS], [])
+AS_IF([test x$enable_ldiskfs != xno],[
+ AC_DEFUN([LB_EXT4_SRC_DIR_SRC],[
+ LB_SRC_EXT4_BREAD_4ARGS
+ LB_SRC_EXT4_HAVE_INFO_DQUOT
+ LB_SRC_EXT4_HAVE_I_CRYPT_INFO
+ LB_SRC_LDISKFS_JOURNAL_ENSURE_CREDITS
+ LB_SRC_LDISKFS_IGET_HAS_FLAGS_ARG
+ LB_SRC_LDISKFS_FIND_ENTRY_LOCKED_EXISTS
+ LB_SRC_LDISKFSFS_DIRHASH_WANTS_DIR
+ LB_SRC_JBD2_H_TOTAL_CREDITS
+ LB_SRC_JBD2_JOURNAL_GET_MAX_TXN_BUFS
+ LB2_SRC_CHECK_CONFIG_IM([FS_ENCRYPTION])
+ ])
+ AC_DEFUN([LB_EXT4_SRC_DIR_RESULTS], [
+ 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_JBD2_JOURNAL_GET_MAX_TXN_BUFS
+ LB2_TEST_CHECK_CONFIG_IM([FS_ENCRYPTION], [
+ EXT4_CRYPTO=],[
+ EXT4_CRYPTO='%/crypto.c'])
+ ])
+ AC_SUBST(EXT4_CRYPTO)
+])
#
# LB_VALIDATE_EXT4_SRC_DIR
AC_DEFUN([LB_DEFINE_E2FSPROGS_NAMES], [
AC_MSG_CHECKING([whether to use alternate names for e2fsprogs])
AC_ARG_WITH([ldiskfsprogs],
- AC_HELP_STRING([--with-ldiskfsprogs],
+ AS_HELP_STRING([--with-ldiskfsprogs],
[use alternate names for ldiskfs-enabled e2fsprogs]),
[], [withval="no"])
git://git.whamcloud.com / fs / lustre-release.git / blobdiff