AC_ARG_ENABLE([gss_keyring],
[AC_HELP_STRING([--disable-gss-keyring],
[disable gss keyring backend])],
- [], [enable_gss_keyring="auto"])
+ [], [AS_IF([test "x$enable_gss" != xno], [
+ enable_gss_keyring="yes"], [
+ enable_gss_keyring="auto"])])
AC_MSG_RESULT([$enable_gss_keyring])
AS_IF([test "x$enable_gss_keyring" != xno], [
LB_CHECK_CONFIG_IM([KEYS], [], [
AS_IF([test "x$enable_gss_keyring" = xyes], [
AC_MSG_ERROR([Cannot enable gss_keyring. See above for details.])
])
+ enable_ssk="no"
])
+], [
+ enable_ssk="no"
])
]) # LC_CONFIG_GSS_KEYRING
enable_gss="no"
])
- enable_ssk=$enable_gss
+ AS_IF([test "x$enable_ssk" != xno], [
+ enable_ssk=$enable_gss
+ ])
], [
enable_gss_keyring="no"
])
])
]) # LC_HAVE_PROJECT_QUOTA
+AC_DEFUN([LC_HAVE_GET_INODE_USAGE], [
+LB_CHECK_COMPILE([if get_inode_usage exists],
+get_inode_usage, [
+ struct inode;
+ #include <linux/quota.h>
+],[
+ struct dquot_operations ops = { };
+
+ ops.get_inode_usage(NULL, NULL);
+],[
+ AC_DEFINE(HAVE_GET_INODE_USAGE, 1,
+ [get_inode_usage function exists])
+])
+]) # LC_HAVE_GET_INODE_USAGE
+
#
# LC_INVALIDATE_RANGE
#
])
]) # LC_BIO_INTEGRITY_PREP_FN
+# LC_BIO_INTEGRITY_PREP_FN_RETURNS_BOOL
+#
+# 13 kernel integrity API has changed and in 4.13+
+# (as well as in rhel 8.4) bio_integrity_prep() returns boolean true
+# on success.
+#
+AC_DEFUN([LC_BIO_INTEGRITY_PREP_FN_RETURNS_BOOL], [
+LB_CHECK_COMPILE([if 'bio_integrity_prep_fn' returns bool],
+bio_integrity_prep, [
+ #include <linux/bio.h>
+ #include <linux/typecheck.h>
+],[
+ #pragma GCC diagnostic warning "-Werror"
+ typedef bool (*bio_integrity_prep_type)(struct bio *bio) ;
+
+ typecheck_fn(bio_integrity_prep_type, bio_integrity_prep);
+],[
+ AC_DEFINE(HAVE_BIO_INTEGRITY_PREP_FN_RETURNS_BOOL, 1,
+ [bio_integrity_prep_fn returns bool])
+])
+]) # LC_BIO_INTEGRITY_PREP_FN_RETURNS_BOOL
+
#
# LC_HAVE_BI_OPF
#
]) # LC_LOCK_PAGE_MEMCG
#
+# LC_D_INIT
+#
+# Kernel version 4.7-rc5 commit 285b102d3b745f3c2c110c9c327741d87e64aacc
+# add new d_init to initialize dentry at allocation time
+#
+AC_DEFUN([LC_D_INIT], [
+LB_CHECK_COMPILE([if dentry operations supports 'd_init'],
+d_init, [
+ #include <linux/dcache.h>
+],[
+ struct dentry_operations ops = { };
+ int rc;
+
+ rc = ops.d_init(NULL);
+],[
+ AC_DEFINE(HAVE_D_INIT, 1, ['d_init' exists])
+])
+]) # LC_D_INIT
+
+#
# LC_DIRECTIO_2ARGS
#
# Kernel version 4.7 commit c8b8e32d700fe943a935e435ae251364d016c497
vm_fault_address, [
#include <linux/mm.h>
],[
- struct vm_fault vmf;
- vmf.address = NULL;
+ unsigned long vaddr = ((struct vm_fault *)0)->address;
+ (void)vaddr;
],[
AC_DEFINE(HAVE_VM_FAULT_ADDRESS, 1,
[virtual_address has been replaced by address field])
]) # LC_VM_FAULT_RETRY
#
+# LC_ALLOC_FILE_PSEUDO
+#
+# kernel 4.18-rc1 commit d93aa9d82aea80b80f225dbf9c7986df444d8106
+# new wrapper: alloc_file_pseudo()
+#
+AC_DEFUN([LC_ALLOC_FILE_PSEUDO], [
+LB_CHECK_COMPILE([if 'alloc_file_pseudo' is defined],
+alloc_file_pseudo, [
+ #include <linux/file.h>
+],[
+ struct file *file;
+ file = alloc_file_pseudo(NULL, NULL, "[test]",
+ 00000002, NULL);
+],[
+ AC_DEFINE(HAVE_ALLOC_FILE_PSEUDO, 1,
+ ['alloc_file_pseudo' exist])
+])
+]) # LC_ALLOC_FILE_PSEUDO
+
+#
# LC_INODE_TIMESPEC64
#
# kernel 4.17-rc7 commit 8efd6894ff089adeeac7cb9f32125b85d963d1bc
]) # LC_INODE_TIMESPEC64
#
-# LC___XA_SET_MARK
+# LC_RADIX_TREE_TAG_SET
#
# kernel 4.20 commit v4.19-rc5-248-g9b89a0355144
# xarray: Add XArray marks - replaced radix_tree_tag_set
#
-AC_DEFUN([LC___XA_SET_MARK], [
+AC_DEFUN([LC_RADIX_TREE_TAG_SET], [
tmp_flags="$EXTRA_KCFLAGS"
EXTRA_KCFLAGS="-Werror"
-LB_CHECK_COMPILE([if '__xa_set_mark' exists],
-__xa_set_mark, [
+LB_CHECK_COMPILE([if 'radix_tree_tag_set' exists],
+radix_tree_tag_set, [
#include <linux/fs.h>
#include <linux/radix-tree.h>
],[
radix_tree_tag_set(NULL, 0, PAGECACHE_TAG_DIRTY);
],[
AC_DEFINE(HAVE_RADIX_TREE_TAG_SET, 1,
- [__xa_set_mark exists])
+ [radix_tree_tag_set exists])
])
EXTRA_KCFLAGS="$tmp_flags"
-]) # LC___XA_SET_MARK
+]) # LC_RADIX_TREE_TAG_SET
#
# LC_UAPI_LINUX_MOUNT_H
EXTRA_KCFLAGS="$tmp_flags"
]) # LC_LM_COMPARE_OWNER_EXISTS
-AC_DEFUN([LC_PROG_LINUX_SRC], [])
-AC_DEFUN([LC_PROG_LINUX_RESULTS], [])
-
#
# LC_FSCRYPT_SUPPORT
#
],[
fscrypt_ioctl_get_policy_ex(NULL, NULL);
],[
- dnl When Lustre supports file name encryption, restore "yes" value
- dnl for has_fscrypt_support and remove warning message.
- has_fscrypt_support="no"
- AC_MSG_WARN([
-This version of Lustre lacks file name encryption support,
-so it cannot make use of in-kernel fscrypt.
-Will use embedded llcrypt if possible.])
+ has_fscrypt_support="yes"
])
]) # LC_FSCRYPT_SUPPORT
#
+# LC_HAVE_USER_NAMESPACE_ARG
+#
+# kernel 5.12 commit 549c7297717c32ee53f156cd949e055e601f67bb
+# fs: make helpers idmap mount aware
+# Extend some inode methods with an additional user namespace argument.
+#
+AC_DEFUN([LC_HAVE_USER_NAMESPACE_ARG], [
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_CHECK_COMPILE([if 'inode_operations' members have user namespace argument],
+user_namespace_argument, [
+ #include <linux/fs.h>
+],[
+ ((struct inode_operations *)1)->getattr((struct user_namespace *)NULL,
+ NULL, NULL, 0, 0);
+],[
+ AC_DEFINE(HAVE_USER_NAMESPACE_ARG, 1,
+ ['inode_operations' members have user namespace argument])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+]) # LC_HAVE_USER_NAMESPACE_ARG
+
+AC_DEFUN([LC_PROG_LINUX_SRC], [])
+AC_DEFUN([LC_PROG_LINUX_RESULTS], [])
+
+#
# LC_PROG_LINUX
#
# Lustre linux kernel checks
# 4.7
LC_D_IN_LOOKUP
+ LC_D_INIT
LC_DIRECTIO_2ARGS
LC_GENERIC_WRITE_SYNC_2ARGS
LC_FOP_ITERATE_SHARED
# 4.13
LC_BIO_INTEGRITY_ENABLED
+ LC_BIO_INTEGRITY_PREP_FN_RETURNS_BOOL
+ LC_HAVE_GET_INODE_USAGE
# 4.14
LC_PAGEVEC_INIT_ONE_PARAM
LC_I_PAGES
# 4.18
+ LC_ALLOC_FILE_PSEUDO
LC_INODE_TIMESPEC64
# 4.20
- LC___XA_SET_MARK
+ LC_RADIX_TREE_TAG_SET
LC_UAPI_LINUX_MOUNT_H
LC_HAVE_SUNRPC_CACHE_HASH_LOCK_IS_A_SPINLOCK
LC_BIO_BI_PHYS_SEGMENTS
LC_LM_COMPARE_OWNER_EXISTS
+ # 5.12
+ LC_HAVE_USER_NAMESPACE_ARG
+
# kernel patch to extend integrity interface
LC_BIO_INTEGRITY_PREP_FN
AC_DEFUN([LC_CONFIG_CRYPTO], [
AC_MSG_CHECKING([whether to enable Lustre client crypto])
AC_ARG_ENABLE([crypto],
- AC_HELP_STRING([--enable-crypto],
- [enable Lustre client crypto]),
+ AC_HELP_STRING([--enable-crypto=yes|no|in-kernel],
+ [enable Lustre client crypto (default is yes), use 'in-kernel' to force use of in-kernel fscrypt instead of embedded llcrypt]),
[], [enable_crypto="auto"])
AS_IF([test "x$enable_crypto" != xno -a "x$enable_dist" = xno], [
AC_MSG_RESULT(
)
LC_IS_ENCRYPTED
LC_FSCRYPT_SUPPORT])
-AS_IF([test "x$has_fscrypt_support" = xyes], [
- AC_DEFINE(HAVE_LUSTRE_CRYPTO, 1, [Enable Lustre client crypto via in-kernel fscrypt])
- enable_crypto=yes],
+AS_IF([test "x$enable_crypto" = xin-kernel], [
+ AS_IF([test "x$has_fscrypt_support" = xyes], [
+ AC_DEFINE(HAVE_LUSTRE_CRYPTO, 1, [Enable Lustre client crypto via in-kernel fscrypt])], [
+ AC_MSG_ERROR([Lustre client crypto cannot be enabled via in-kernel fscrypt.])
+ enable_crypto=no])],
[AS_IF([test "x$has_is_encrypted" = xyes], [
AC_DEFINE(HAVE_LUSTRE_CRYPTO, 1, [Enable Lustre client crypto via embedded llcrypt])
AC_DEFINE(CONFIG_LL_ENCRYPTION, 1, [embedded llcrypt])
- enable_crypto=yes
+ enable_crypto="embedded llcrypt"
enable_llcrypt=yes], [
AS_IF([test "x$enable_crypto" = xyes],
[AC_MSG_ERROR([Lustre client crypto cannot be enabled because of lack of encryption support in your kernel.])])
[], [enable_lu_ref="no"])
AC_MSG_RESULT([$enable_lu_ref])
AS_IF([test "x$enable_lu_ref" = xyes],
- [AC_DEFINE([USE_LU_REF], 1,
+ [AC_DEFINE([CONFIG_LUSTRE_DEBUG_LU_REF], 1,
[enable lu_ref reference tracking code])])
AC_MSG_CHECKING([whether to enable page state tracking])
lustre/include/Makefile
lustre/include/lustre/Makefile
lustre/include/uapi/linux/lustre/Makefile
+lustre/kernel_patches/targets/4.18-rhel8.5.target
lustre/kernel_patches/targets/4.18-rhel8.4.target
lustre/kernel_patches/targets/4.18-rhel8.3.target
lustre/kernel_patches/targets/4.18-rhel8.2.target
lustre/kernel_patches/targets/4.12-sles12sp4.target
lustre/kernel_patches/targets/4.12-sles12sp5.target
lustre/kernel_patches/targets/4.12-sles15sp1.target
-lustre/kernel_patches/targets/4.12-sles15sp2.target
+lustre/kernel_patches/targets/5.3-sles15sp2.target
+lustre/kernel_patches/targets/5.3-sles15sp3.target
lustre/kernel_patches/targets/3.x-fc18.target
lustre/ldlm/Makefile
lustre/fid/Makefile
git://git.whamcloud.com / fs / lustre-release.git / blobdiff