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" ;;
+ 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],[
- 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"
+ 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)
+ 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
+ # This file was added shortly after -150.22 so
+ # this must be 150.22 or earlier
+ LDISKFS_SERIES="4.12-sles15-22.series"
+ fi
+ ;; # (
+ 15sp1 ) LDISKFS_SERIES="4.12-sles15sp1.series"
+ if test ! -f $LINUX/arch/x86/kernel/cpu/umwait.c ; then
+ # This file was added after -197.7 so
+ # this must be -197.7 or earlier
+ LDISKFS_SERIES="4.12-sles15sp1-7.series"
+ fi
;;
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"]
- )], [LDISKFS_SERIES="4.12-sles15.series"],
- [LDISKFS_SERIES="4.12-sles15.series"]
- )], [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], [],
[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"])
])
])
[
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
)])
],
[])
]) # LDISKFS_AC_PATCH_PROGRAM
#
-# LB_HAVE_BVEC_ITER_ALL
-#
-# kernel 5.1 commit 6dc4f100c175dd0511ae8674786e7c9006cdfbfa
-# block: allow bio_for_each_segment_all() to iterate over multi-page bvec
-#
-AC_DEFUN([LB_HAVE_BVEC_ITER_ALL], [
-tmp_flags="$EXTRA_KCFLAGS"
-EXTRA_KCFLAGS="-Werror"
-LB_CHECK_COMPILE([if bvec_iter_all exists for multi-page bvec iternation],
-ext4fs_dirhash, [
- #include <linux/bvec.h>
-],[
- struct bvec_iter_all iter;
- (void)iter;
-],[
- AC_DEFINE(HAVE_BVEC_ITER_ALL, 1,
- [if bvec_iter_all exists for multi-page bvec iternation])
-])
-EXTRA_KCFLAGS="$tmp_flags"
-]) # LB_HAVE_BVEC_ITER_ALL
-
-#
# LB_LDISKFS_FIND_ENTRY_LOCKED_EXISTS
#
# kernel 5.2 commit 8a363970d1dc38c4ec4ad575c862f776f468d057
(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], [
LB_EXT4_HAVE_INFO_DQUOT
LB_EXT4_HAVE_I_CRYPT_INFO
LB_LDISKFS_IGET_HAS_FLAGS_ARG
- LB_HAVE_BVEC_ITER_ALL
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])
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], [])
+
#
# LB_VALIDATE_EXT4_SRC_DIR
#
git://git.whamcloud.com / fs / lustre-release.git / blobdiff