X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fautoconf%2Flustre-core.m4;h=0c6643bc537b8a711b258cf1ae58a71e4f465cc1;hp=0af9f26808367f50e99e95d9c5cb96b3c55a86e3;hb=b59835f8b6c81befee23c5c3c0fafb63e98fbc0c;hpb=fac41e11d3e28ce239cb98298ce9fc5cd0e88e90 diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 0af9f26..0c6643b 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -5,7 +5,6 @@ # AC_DEFUN([LC_CONFIG_SRCDIR], [ AC_CONFIG_SRCDIR([lustre/obdclass/obdo.c]) -libcfs_is_module="yes" ldiskfs_is_ext4="yes" ]) @@ -57,6 +56,55 @@ AC_CHECK_FUNCS([name_to_handle_at], ]) # LC_GLIBC_SUPPORT_FHANDLES # +# LC_GLIBC_SUPPORT_COPY_FILE_RANGE +# +AC_DEFUN([LC_GLIBC_SUPPORT_COPY_FILE_RANGE], [ +AC_CHECK_FUNCS([copy_file_range], + [AC_DEFINE(HAVE_COPY_FILE_RANGE, 1, + [copy_file_range() is supported])], + [AC_MSG_WARN([copy_file_range() is not supported])]) +]) # LC_GLIBC_SUPPORT_COPY_FILE_RANGE + +# +# LC_FID2PATH_UNION +# +AC_DEFUN([LC_FID2PATH_ANON_UNION], [ +AC_MSG_CHECKING([if 'struct getinfo_fid2path' has anony•mous union]) +AC_COMPILE_IFELSE([AC_LANG_SOURCE([ + #include + + int main(void) { + struct getinfo_fid2path gf; + struct lu_fid root_fid; + + *gf.gf_root_fid = root_fid; + return 0; + } +])],[ + AC_DEFINE(HAVE_FID2PATH_ANON_UNIONS, 1, [union is unnamed]) + AC_MSG_RESULT("yes") +]) +]) # LC_FID2PATH_ANON_UNION + +# +# LC_IOC_REMOVE_ENTRY +# +AC_DEFUN([LC_IOC_REMOVE_ENTRY], [ +AC_MSG_CHECKING([if ioctl IOC_REMOVE_ENTRY' is supported]) +AC_COMPILE_IFELSE([AC_LANG_SOURCE([ + #include + #include + + int main(void) { + return ioctl(0, LL_IOC_REMOVE_ENTRY, NULL); + } +])],[ + AC_DEFINE(HAVE_IOC_REMOVE_ENTRY, 1, + [IOC_REMOVE_ENTRY ioctl exists]) +]) +]) # LC_IOC_REMOVE_ENTRY + +# # LC_STACK_SIZE # # Ensure the stack size is at least 8k in Lustre server (all kernels) @@ -103,7 +151,7 @@ AC_ARG_ENABLE([pinger], [], [enable_pinger="yes"]) AC_MSG_RESULT([$enable_pinger]) AS_IF([test "x$enable_pinger" != xno], - [AC_DEFINE(ENABLE_PINGER, 1,[Use the Pinger])]) + [AC_DEFINE(CONFIG_LUSTRE_FS_PINGER, 1,[Use the Pinger])]) ]) # LC_CONFIG_PINGER # @@ -181,8 +229,20 @@ Lustre quota requires that CONFIG_QUOTA is enabled in your kernel. ])]) ]) # LC_QUOTA_CONFIG +# +# LC_CONFIG_FHANDLE +# +# fhandle kernel support for open_by_handle_at() and name_to_handle_at() +# system calls. The kernel must support CONFIG_FHANDLE. +# +AC_DEFUN([LC_CONFIG_FHANDLE], [ +LB_CHECK_CONFIG_IM([FHANDLE], [], + [AC_MSG_ERROR([ + +Lustre fid handling requires that CONFIG_FHANDLE is enabled in your kernel. +])]) +]) # LC_CONFIG_FHANDLE -#[AC_DEFINE(CONFIG_LUSTRE_FS_POSIX_ACL, 1, [Enable POSIX acl])]) # # LC_POSIX_ACL_CONFIG # @@ -232,23 +292,6 @@ AS_IF([test "x$enable_gss_keyring" != xno], [ ]) # LC_CONFIG_GSS_KEYRING # -# LC_HAVE_CRED_TGCRED -# -# rhel7 struct cred has no member tgcred -# -AC_DEFUN([LC_HAVE_CRED_TGCRED], [ -LB_CHECK_COMPILE([if 'struct cred' has member 'tgcred'], -cred_tgcred, [ - #include -],[ - ((struct cred *)0)->tgcred = NULL; -],[ - AC_DEFINE(HAVE_CRED_TGCRED, 1, - [struct cred has member tgcred]) -]) -]) # LC_HAVE_CRED_TGCRED - -# # LC_KEY_TYPE_INSTANTIATE_2ARGS # # rhel7 key_type->instantiate takes 2 args (struct key, struct key_preparsed_payload) @@ -291,9 +334,20 @@ AC_ARG_ENABLE([gss], [], [enable_gss="auto"]) AC_MSG_RESULT([$enable_gss]) +AC_ARG_VAR([TEST_JOBS], + [simultaneous jobs during configure (defaults to $(nproc))]) +if test "x$ac_cv_env_TEST_JOBS_set" != "xset"; then + TEST_JOBS=${TEST_JOBS:-$(nproc)} +fi +AC_SUBST(TEST_JOBS) + +AC_ARG_VAR([TEST_DIR], + [location of temporary parallel configure tests (defaults to $PWD/lb2)]) + TEST_DIR=${TEST_DIR:-$PWD/_lpb} +AC_SUBST(TEST_DIR) + AS_IF([test "x$enable_gss" != xno], [ LC_CONFIG_GSS_KEYRING - LC_HAVE_CRED_TGCRED LC_KEY_TYPE_INSTANTIATE_2ARGS sunrpc_required=$enable_gss LC_CONFIG_SUNRPC @@ -364,751 +418,26 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([ int main(void) { EVP_MD_CTX *mdctx = EVP_MD_CTX_create(); } -])],[ - AC_DEFINE(HAVE_OPENSSL_GETSEPOL, 1, [openssl-devel is present]) - enable_getsepol="yes" - -],[ - enable_getsepol="no" - AC_MSG_WARN([ - -No openssk-devel headers found, unable to build l_getsepol and SELinux status checking -]) -]) -AC_MSG_RESULT([$enable_getsepol]) -]) # LC_OPENSSL_GETSEPOL - -# LC_INODE_PERMISION_2ARGS -# -# up to v2.6.27 had a 3 arg version (inode, mask, nameidata) -# v2.6.27->v2.6.37 had a 2 arg version (inode, mask) -# v2.6.37->v3.0 had a 3 arg version (inode, mask, nameidata) -# v3.1 onward have a 2 arg version (inode, mask) -# -AC_DEFUN([LC_INODE_PERMISION_2ARGS], [ -LB_CHECK_COMPILE([if 'inode_operations->permission' has two args], -inode_ops_permission_2args, [ - #include -],[ - struct inode *inode __attribute__ ((unused)); - - inode = NULL; - inode->i_op->permission(NULL, 0); -],[ - AC_DEFINE(HAVE_INODE_PERMISION_2ARGS, 1, - [inode_operations->permission has two args]) -]) -]) # LC_INODE_PERMISION_2ARGS - -# -# LC_HAVE_FSTYPE_MOUNT -# -# 2.6.39 replace get_sb with mount in struct file_system_type -# -AC_DEFUN([LC_HAVE_FSTYPE_MOUNT], [ -LB_CHECK_COMPILE([if 'file_system_type' has 'mount' field], -file_system_type_mount, [ - #include -],[ - struct file_system_type fst = { }; - void *mount; - - mount = (void *)fst.mount; -],[ - AC_DEFINE(HAVE_FSTYPE_MOUNT, 1, - [struct file_system_type has mount field]) -]) -]) # LC_HAVE_FSTYPE_MOUNT - -# -# LC_HAVE_FHANDLE_SYSCALLS -# -# 2.6.39 The open_by_handle_at() and name_to_handle_at() system calls were -# added to Linux kernel 2.6.39. -# Check if client supports these functions -# -AC_DEFUN([LC_HAVE_FHANDLE_SYSCALLS], [ -LB_CHECK_CONFIG_IM([FHANDLE],[ - AC_DEFINE(HAVE_FHANDLE_SYSCALLS, 1, - [kernel supports fhandles and related syscalls]) - ]) -]) # LC_HAVE_FHANDLE_SYSCALLS - -# -# LC_HAVE_INODE_OWNER_OR_CAPABLE -# -# 2.6.39 renames is_owner_or_cap to inode_owner_or_capable -# -AC_DEFUN([LC_HAVE_INODE_OWNER_OR_CAPABLE], [ -LB_CHECK_COMPILE([if 'inode_owner_or_capable' exist], -inode_owner_or_capable, [ - #include -],[ - inode_owner_or_capable(NULL); -],[ - AC_DEFINE(HAVE_INODE_OWNER_OR_CAPABLE, 1, - [inode_owner_or_capable exist]) -]) -]) # LC_HAVE_INODE_OWNER_OR_CAPABLE - -# -# LC_DIRTY_INODE_WITH_FLAG -# -# 3.0 dirty_inode() has a flag parameter -# see kernel commit aa38572954ade525817fe88c54faebf85e5a61c0 -# -AC_DEFUN([LC_DIRTY_INODE_WITH_FLAG], [ -LB_CHECK_COMPILE([if 'dirty_inode' super_operation takes flag], -dirty_inode_super_operation_flag, [ - #include -],[ - struct inode *inode = NULL; - inode->i_sb->s_op->dirty_inode(NULL, 0); -],[ - AC_DEFINE(HAVE_DIRTY_INODE_HAS_FLAG, 1, - [dirty_inode super_operation takes flag]) -]) -]) # LC_DIRTY_INODE_WITH_FLAG - -# -# LC_SETNS -# -# 3.0 introduced setns -# -AC_DEFUN([LC_SETNS], [ -AC_CHECK_HEADERS([sched.h], [], [], - [#define _GNU_SOURCE - ]) -AC_CHECK_FUNCS([setns]) -]) # LC_SETNS - -# -# LC_LM_XXX_LOCK_MANAGER_OPS -# -# 3.1 renames lock-manager ops(lock_manager_operations) from fl_xxx to lm_xxx -# see kernel commit 8fb47a4fbf858a164e973b8ea8ef5e83e61f2e50 -# -AC_DEFUN([LC_LM_XXX_LOCK_MANAGER_OPS], [ -LB_CHECK_COMPILE([if 'lock-manager' ops renamed to 'lm_xxx'], -lock_manager_ops_lm_xxx, [ - #include -],[ - struct lock_manager_operations lm_ops; - lm_ops.lm_notify = NULL; -],[ - AC_DEFINE(HAVE_LM_XXX_LOCK_MANAGER_OPS, 1, - [lock-manager ops renamed to lm_xxx]) -]) -]) # LC_LM_XXX_LOCK_MANAGER_OPS - -# -# LC_INODE_DIO_WAIT -# -# 3.1 kills inode->i_alloc_sem, use i_dio_count and inode_dio_wait -# instead. -# see kernel commit bd5fe6c5eb9c548d7f07fe8f89a150bb6705e8e3 -# -AC_DEFUN([LC_INODE_DIO_WAIT], [ -LB_CHECK_COMPILE([if 'inode->i_alloc_sem' is killed and use inode_dio_wait], -inode_dio_wait, [ - #include -],[ - inode_dio_wait((struct inode *)0); -],[ - AC_DEFINE(HAVE_INODE_DIO_WAIT, 1, - [inode->i_alloc_sem is killed and use inode_dio_wait]) -]) -]) # LC_INODE_DIO_WAIT - -# -# LC_IOP_GET_ACL -# -# 3.1 adds get_acl method to inode_operations to read ACL from disk. -# see kernel commit 4e34e719e457f2e031297175410fc0bd4016a085 -# -AC_DEFUN([LC_IOP_GET_ACL], [ -LB_CHECK_COMPILE([if 'inode_operations' has '.get_acl' member function], -inode_ops_get_acl, [ - #include -],[ - struct inode_operations iop; - iop.get_acl = NULL; -],[ - AC_DEFINE(HAVE_IOP_GET_ACL, 1, - [inode_operations has .get_acl member function]) -]) -]) # LC_IOP_GET_ACL - -# -# LC_FILE_LLSEEK_SIZE -# -# 3.1 introduced generic_file_llseek_size() -# -AC_DEFUN([LC_FILE_LLSEEK_SIZE], [ -LB_CHECK_EXPORT([generic_file_llseek_size], [fs/read_write.c], - [AC_DEFINE(HAVE_FILE_LLSEEK_SIZE, 1, - [generic_file_llseek_size is exported by the kernel])]) -]) # LC_FILE_LLSEEK_SIZE - -# -# LC_RADIX_EXCEPTION_ENTRY -# 3.1 adds radix_tree_exception_entry. -# -AC_DEFUN([LC_RADIX_EXCEPTION_ENTRY], [ -LB_CHECK_COMPILE([radix_tree_exceptional_entry exist], -radix_tree_exceptional_entry, [ - #include -],[ - radix_tree_exceptional_entry(NULL); -],[ - AC_DEFINE(HAVE_RADIX_EXCEPTION_ENTRY, 1, - [radix_tree_exceptional_entry exist]) -]) -]) # LC_RADIX_EXCEPTION_ENTRY - -# -# LC_HAVE_PROTECT_I_NLINK -# -# 3.2 protects inode->i_nlink from direct modification -# see kernel commit a78ef704a8dd430225955f0709b22d4a6ba21deb -# at the same time adds set_nlink(), so checks set_nlink() for it. -# -AC_DEFUN([LC_HAVE_PROTECT_I_NLINK], [ -LB_CHECK_COMPILE([if 'inode->i_nlink' is protected from direct modification], -inode_i_nlink_protected, [ - #include -],[ - struct inode i; - set_nlink(&i, 1); -],[ - AC_DEFINE(HAVE_PROTECT_I_NLINK, 1, - [inode->i_nlink is protected from direct modification]) -]) -]) # LC_HAVE_PROTECT_I_NLINK - -# -# 2.6.39 security_inode_init_security takes a 'struct qstr' parameter -# -# 3.2 security_inode_init_security takes a callback to set xattrs -# -AC_DEFUN([LC_HAVE_SECURITY_IINITSEC], [ -LB_CHECK_COMPILE([if security_inode_init_security takes a callback], -security_inode_init_security_callback, [ - #include -],[ - security_inode_init_security(NULL, NULL, NULL, (const initxattrs)NULL, NULL); -],[ - AC_DEFINE(HAVE_SECURITY_IINITSEC_CALLBACK, 1, - [security_inode_init_security takes a callback to set xattrs]) -],[ - LB_CHECK_COMPILE([if security_inode_init_security takes a 'struct qstr' parameter], - security_inode_init_security_qstr, [ - #include - ],[ - security_inode_init_security(NULL, NULL, (struct qstr *)NULL, NULL, NULL, NULL); - ],[ - AC_DEFINE(HAVE_SECURITY_IINITSEC_QSTR, 1, - [security_inode_init_security takes a 'struct qstr' parameter]) - ]) -]) -]) # LC_HAVE_SECURITY_IINITSEC - -# -# 2.6.39 vfs_create takes a 'struct nameidata' parameter -# -AC_DEFUN([LC_VFS_CREATE_USE_NAMEIDATA], [ -LB_CHECK_COMPILE([if vfs_create takes a struct nameidata parameter], -vfs_create, [ - #include - #include -],[ - struct nameidata *nd; - vfs_create(NULL, NULL, 0, nd); -],[ - AC_DEFINE(HAVE_VFS_CREATE_USE_NAMEIDATA, 1, - [vfs_create use nameidata as parameter]) -]) -]) # LC_VFS_CREATE_USE_NAMEIDATA - -# -# LC_HAVE_MIGRATE_HEADER -# -# 3.3 introduces migrate_mode.h and migratepage has 4 args -# -AC_DEFUN([LC_HAVE_MIGRATE_HEADER], [ -LB_CHECK_FILE([$LINUX/include/linux/migrate.h], [ - AC_DEFINE(HAVE_MIGRATE_H, 1, - [kernel has include/linux/migrate.h]) -],[ - LB_CHECK_FILE([$LINUX/include/linux/migrate_mode.h], [ - AC_DEFINE(HAVE_MIGRATE_MODE_H, 1, - [kernel has include/linux/migrate_mode.h]) - ]) -]) -]) # LC_HAVE_MIGRATE_HEADER - -# -# LC_MIGRATEPAGE_4ARGS -# -AC_DEFUN([LC_MIGRATEPAGE_4ARGS], [ -LB_CHECK_COMPILE([if 'address_space_operations.migratepage' has 4 args], -address_space_ops_migratepage_4args, [ - #include -#ifdef HAVE_MIGRATE_H - #include -#elif defined(HAVE_MIGRATE_MODE_H) - #include -#endif -],[ - struct address_space_operations aops = { }; - aops.migratepage(NULL, NULL, NULL, MIGRATE_ASYNC); -],[ - AC_DEFINE(HAVE_MIGRATEPAGE_4ARGS, 1, - [address_space_operations.migratepage has 4 args]) -]) -]) # LC_MIGRATEPAGE_4ARGS - -# -# LC_SUPEROPS_USE_DENTRY -# -# 3.3 switchs super_operations to use dentry as parameter (but not vfsmount) -# see kernel commit 34c80b1d93e6e20ca9dea0baf583a5b5510d92d4 -# -AC_DEFUN([LC_SUPEROPS_USE_DENTRY], [ -tmp_flags="$EXTRA_KCFLAGS" -EXTRA_KCFLAGS="-Werror" -LB_CHECK_COMPILE([if 'super_operations' use 'dentry' as parameter], -super_ops_dentry, [ - #include - int show_options(struct seq_file *seq, struct dentry *root) { - return 0; - } -],[ - struct super_operations ops; - ops.show_options = show_options; -],[ - AC_DEFINE(HAVE_SUPEROPS_USE_DENTRY, 1, - [super_operations use dentry as parameter]) -]) -EXTRA_KCFLAGS="$tmp_flags" -]) # LC_SUPEROPS_USE_DENTRY - -# -# LC_INODEOPS_USE_UMODE_T -# -# 3.3 switchs inode_operations to use umode_t as parameter (but not int) -# see kernel commit 1a67aafb5f72a436ca044293309fa7e6351d6a35 -# -AC_DEFUN([LC_INODEOPS_USE_UMODE_T], [ -tmp_flags="$EXTRA_KCFLAGS" -EXTRA_KCFLAGS="-Werror" -LB_CHECK_COMPILE([if 'inode_operations' use 'umode_t' as parameter], -inode_ops_umode_t, [ - #include - #include - int my_mknod(struct inode *dir, struct dentry *dchild, - umode_t mode, dev_t dev) - { - return 0; - } -],[ - struct inode_operations ops; - ops.mknod = my_mknod; -],[ - AC_DEFINE(HAVE_INODEOPS_USE_UMODE_T, 1, - [inode_operations use umode_t as parameter]) -]) -EXTRA_KCFLAGS="$tmp_flags" -]) # LC_INODEOPS_USE_UMODE_T - -# -# LC_KMAP_ATOMIC_HAS_1ARG -# -# 3.4 kmap_atomic removes second argument -# see kernel commit 1ec9c5ddc17aa398f05646abfcbaf315b544e62f -# -AC_DEFUN([LC_KMAP_ATOMIC_HAS_1ARG], [ -LB_CHECK_COMPILE([if 'kmap_atomic' has only 1 argument], -kmap_atomic_1arg, [ - #include -],[ - kmap_atomic(NULL); -],[ - AC_DEFINE(HAVE_KMAP_ATOMIC_HAS_1ARG, 1, - [have kmap_atomic has only 1 argument]) -]) -]) # LC_KMAP_ATOMIC_HAS_1ARG - -# -# LC_HAVE_D_MAKE_ROOT -# -# 3.4 converts d_alloc_root to d_make_root -# see kernel commit 32991ab305ace7017c62f8eecbe5eb36dc32e13b -# -AC_DEFUN([LC_HAVE_D_MAKE_ROOT], [ -LB_CHECK_COMPILE([if have 'd_make_root'], -d_make_root, [ - #include -],[ - d_make_root((struct inode *)NULL); -],[ - AC_DEFINE(HAVE_D_MAKE_ROOT, 1, - [have d_make_root]) -]) -]) # LC_HAVE_D_MAKE_ROOT - -# -# LC_HAVE_CACHE_REGISTER -# -# 3.4 cache_register/cache_unregister are removed -# see kernel commit 2c5f846747526e2b83c5f1b8e69016be0e2e87c0 -# Note, since 2.6.37 cache_register_net/cache_unregister_net -# are defined, but not exported. -# 3.3 cache_register_net/cache_unregister_net are -# exported and replacing cache_register/cache_unregister in 3.4 -# -AC_DEFUN([LC_HAVE_CACHE_REGISTER], [ -LB_CHECK_COMPILE([if have 'cache_register'], -cache_register, [ - #include -],[ - cache_register(NULL); -],[ - AC_DEFINE(HAVE_CACHE_REGISTER, 1, - [have cache_register]) -]) -]) # LC_HAVE_CACHE_REGISTER - -# -# LC_HAVE_CLEAR_INODE -# -# 3.5 renames end_writeback() back to clear_inode()... -# see kernel commit dbd5768f87ff6fb0a4fe09c4d7b6c4a24de99430 -# -AC_DEFUN([LC_HAVE_CLEAR_INODE], [ -LB_CHECK_COMPILE([if have 'clear_inode'], -clear_inode, [ - #include -],[ - clear_inode((struct inode *)NULL); -],[ - AC_DEFINE(HAVE_CLEAR_INODE, 1, - [have clear_inode]) -]) -]) # LC_HAVE_CLEAR_INODE - -# -# LC_HAVE_ENCODE_FH_PARENT -# -# 3.5 encode_fh has parent inode passed in directly -# see kernel commit b0b0382b -# -AC_DEFUN([LC_HAVE_ENCODE_FH_PARENT], [ -tmp_flags="$EXTRA_KCFLAGS" -EXTRA_KCFLAGS="-Werror" -LB_CHECK_COMPILE([if 'encode_fh' have parent inode as parameter], -encode_fh_parent_inode, [ - #include - #include - #include - int ll_encode_fh(struct inode *i, __u32 *a, int *b, struct inode *p) - { - return 0; - } -],[ - struct export_operations exp_op; - exp_op.encode_fh = ll_encode_fh; -],[ - AC_DEFINE(HAVE_ENCODE_FH_PARENT, 1, - [have parent inode as parameter]) -]) -EXTRA_KCFLAGS="$tmp_flags" -]) # LC_HAVE_ENCODE_FH_PARENT - -# -# LC_FILE_LLSEEK_SIZE_5ARG -# -# 3.5 has generic_file_llseek_size with 5 args -# -AC_DEFUN([LC_FILE_LLSEEK_SIZE_5ARG], [ -LB_CHECK_COMPILE([if Linux kernel has 'generic_file_llseek_size' with 5 args], -generic_file_llseek_size_5args, [ - #include -],[ - generic_file_llseek_size(NULL, 0, 0, 0, 0); -], [ - AC_DEFINE(HAVE_FILE_LLSEEK_SIZE_5ARGS, 1, - [kernel has generic_file_llseek_size with 5 args]) -]) -]) # LC_FILE_LLSEEK_SIZE_5ARG - -# -# LC_LLITE_DATA_IS_LIST -# -# 3.6 switch i_dentry/d_alias from list to hlist -# -# In the upstream kernels d_alias first changes -# to a hlist and then in later version, 3.11, gets -# moved to the union d_u. Due to some distros having -# d_alias in the d_u union as a struct list, which -# has never existed upstream stream, we can't test -# if d_alias is a list or hlist directly. If ever -# i_dentry and d_alias even up different combos then -# the build will fail. In that case then we will need -# to separate out the i_dentry and d_alias test below. -# -AC_DEFUN([LC_DATA_FOR_LLITE_IS_LIST], [ -tmp_flags="$EXTRA_KCFLAGS" -EXTRA_KCFLAGS="-Werror" -LB_CHECK_COMPILE([if 'i_dentry/d_alias' uses 'list'], -i_dentry_d_alias_list, [ - #include -],[ - struct inode inode; - INIT_LIST_HEAD(&inode.i_dentry); -],[ - AC_DEFINE(DATA_FOR_LLITE_IS_LIST, 1, - [both i_dentry/d_alias uses list]) -]) -EXTRA_KCFLAGS="$tmp_flags" -]) # LC_DATA_FOR_LLITE_IS_LIST - -# -# LC_DENTRY_OPEN_USE_PATH -# -# 3.6 dentry_open uses struct path as first argument -# see kernel commit 765927b2 -# -AC_DEFUN([LC_DENTRY_OPEN_USE_PATH], [ -tmp_flags="$EXTRA_KCFLAGS" -EXTRA_KCFLAGS="-Werror" -LB_CHECK_COMPILE([if 'dentry_open' uses 'struct path' as first argument], -dentry_open_path, [ - #include - #include -],[ - struct path path; - dentry_open(&path, 0, NULL); -],[ - AC_DEFINE(HAVE_DENTRY_OPEN_USE_PATH, 1, - [dentry_open uses struct path as first argument]) -]) -EXTRA_KCFLAGS="$tmp_flags" -]) # LC_DENTRY_OPEN_USE_PATH - -# -# LC_HAVE_IOP_ATOMIC_OPEN -# -# 3.6 vfs adds iop->atomic_open -# -AC_DEFUN([LC_HAVE_IOP_ATOMIC_OPEN], [ -LB_CHECK_COMPILE([if 'iop' has 'atomic_open'], -inode_ops_atomic_open, [ - #include -],[ - struct inode_operations iop; - iop.atomic_open = NULL; -],[ - AC_DEFINE(HAVE_IOP_ATOMIC_OPEN, 1, - [have iop atomic_open]) -]) -]) # LC_HAVE_IOP_ATOMIC_OPEN - -# -# LC_HAVE_SB_START_WRITE -# -# RHEL6 2.6.32, 3.6 or newer support wrapped FS freeze functions -# -AC_DEFUN([LC_HAVE_SB_START_WRITE], [ -LB_CHECK_COMPILE([if kernel supports wrapped FS freeze functions], -sb_start_write, [ - #include -],[ - sb_start_write(NULL); -],[ - AC_DEFINE(HAVE_SB_START_WRITE, 1, - [kernel supports wrapped FS freeze functions]) -]) -]) # LC_HAVE_SB_START_WRITE - -# -# LC_HAVE_POSIXACL_USER_NS -# -# 3.7 posix_acl_{to,from}_xattr take struct user_namespace -# -AC_DEFUN([LC_HAVE_POSIXACL_USER_NS], [ -LB_CHECK_COMPILE([if 'posix_acl_to_xattr' takes 'struct user_namespace'], -posix_acl_to_xattr_user_namespace, [ - #include - #include -],[ - posix_acl_to_xattr((struct user_namespace *)NULL, NULL, NULL, 0); -],[ - AC_DEFINE(HAVE_POSIXACL_USER_NS, 1, - [posix_acl_to_xattr takes struct user_namespace]) -]) -]) # LC_HAVE_POSIXACL_USER_NS - -# -# LC_HAVE_FILE_F_INODE -# -# 3.8 struct file has new member f_inode -# -AC_DEFUN([LC_HAVE_FILE_F_INODE], [ -LB_CHECK_COMPILE([if 'struct file' has member 'f_inode'], -file_f_inode, [ - #include -],[ - ((struct file *)0)->f_inode = NULL; -],[ - AC_DEFINE(HAVE_FILE_F_INODE, 1, - [struct file has member f_inode]) -]) -]) # LC_HAVE_FILE_F_INODE - -# -# LC_HAVE_FILE_INODE -# -# 3.8 has introduced inline function file_inode -# -AC_DEFUN([LC_HAVE_FILE_INODE], [ -LB_CHECK_COMPILE([if file_inode() exists], -file_inode, [ - #include -],[ - file_inode(NULL); -],[ - AC_DEFINE(HAVE_FILE_INODE, 1, - [file_inode() has been defined]) -]) -]) # LC_HAVE_FILE_INODE - -# -# LC_HAVE_SUNRPC_UPCALL_HAS_3ARGS -# -AC_DEFUN([LC_HAVE_SUNRPC_UPCALL_HAS_3ARGS], [ -LB_CHECK_COMPILE([if 'sunrpc_cache_pipe_upcall' takes 3 args], -sunrpc_cache_pipe_upcall_3args, [ - #include -],[ - sunrpc_cache_pipe_upcall(NULL, NULL, NULL); -],[ - AC_DEFINE(HAVE_SUNRPC_UPCALL_HAS_3ARGS, 1, - [sunrpc_cache_pipe_upcall takes 3 args]) -]) -]) # LC_HAVE_SUNRPC_UPCALL_HAS_3ARGS - -# -# LC_HAVE_HLIST_FOR_EACH_3ARG -# -# 3.9 uses hlist_for_each_entry with 3 args -# b67bfe0d42cac56c512dd5da4b1b347a23f4b70a -# -AC_DEFUN([LC_HAVE_HLIST_FOR_EACH_3ARG], [ -LB_CHECK_COMPILE([if 'hlist_for_each_entry' has 3 args], -hlist_for_each_entry_3args, [ - #include - #include -],[ - struct hlist_head *head = NULL; - struct inode *inode; - - hlist_for_each_entry(inode, head, i_hash) { - continue; - } -],[ - AC_DEFINE(HAVE_HLIST_FOR_EACH_3ARG, 1, - [hlist_for_each_entry has 3 args]) -]) -]) # LC_HAVE_HLIST_FOR_EACH_3ARG - -# -# LC_HAVE_BIO_END_SECTOR -# -# 3.9 introduces bio_end_sector macro -# f73a1c7d117d07a96d89475066188a2b79e53c48 -# -AC_DEFUN([LC_HAVE_BIO_END_SECTOR], [ -LB_CHECK_COMPILE([if 'bio_end_sector' is defined], -bio_end_sector, [ - #include -],[ - struct bio bio = { }; - unsigned long long end; - - end = bio_end_sector(&bio); -],[ - AC_DEFINE(HAVE_BIO_END_SECTOR, 1, - [bio_end_sector is defined]) -]) -]) # LC_HAVE_BIO_END_SECTOR - -# -# 3.9 created is_sxid -# -AC_DEFUN([LC_HAVE_IS_SXID], [ -LB_CHECK_COMPILE([if 'is_sxid' is defined], -is_sxid, [ - #include -],[ - struct inode inode = { }; - - is_sxid(inode.i_mode); -],[ - AC_DEFINE(HAVE_IS_SXID, 1, [is_sxid is defined]) -]) -]) # LC_HAVE_IS_SXID +])],[ + AC_DEFINE(HAVE_OPENSSL_GETSEPOL, 1, [openssl-devel is present]) + enable_getsepol="yes" -# -# LC_HAVE_VFS_GETATTR_2ARGS -# -AC_DEFUN([LC_HAVE_VFS_GETATTR_2ARGS], [ -LB_CHECK_COMPILE([if vfs_getattr takes 2 args], -vfs_getattr, [ - #include ],[ - struct path path; + enable_getsepol="no" + AC_MSG_WARN([ - vfs_getattr(&path, NULL); -],[ - AC_DEFINE(HAVE_VFS_GETATTR_2ARGS, 1, - [vfs_getattr takes 2 args]) +No openssl-devel headers found, unable to build l_getsepol and SELinux status checking ]) -]) # LC_HAVE_VFS_GETATTR_2ARGS - -# -# LC_HAVE_REMOVE_PROC_SUBTREE -# -# 3.10 introduced remove_proc_subtree -# -AC_DEFUN([LC_HAVE_REMOVE_PROC_SUBTREE], [ -LB_CHECK_COMPILE([if 'remove_proc_subtree' is defined], -remove_proc_subtree, [ - #include -],[ - remove_proc_subtree(NULL, NULL); -], [ - AC_DEFINE(HAVE_REMOVE_PROC_SUBTREE, 1, - [remove_proc_subtree is defined]) ]) -]) # LC_HAVE_REMOVE_PROC_SUBTREE +AC_MSG_RESULT([$enable_getsepol]) +]) # LC_OPENSSL_GETSEPOL -# -# LC_HAVE_PROC_REMOVE -# -# 3.10 introduced proc_remove -# -AC_DEFUN([LC_HAVE_PROC_REMOVE], [ -LB_CHECK_COMPILE([if 'proc_remove' is defined], -proc_remove, [ - #include -],[ - proc_remove(NULL); -], [ - AC_DEFINE(HAVE_PROC_REMOVE, 1, - [proc_remove is defined]) -]) -]) # LC_HAVE_PROC_REMOVE +# LC_HAVE_LIBAIO +AC_DEFUN([LC_HAVE_LIBAIO], [ + AC_CHECK_HEADER([libaio.h], + enable_libaio="yes", + AC_MSG_WARN([libaio is not installed in the system])) +]) # LC_HAVE_LIBAIO AC_DEFUN([LC_HAVE_PROJECT_QUOTA], [ LB_CHECK_COMPILE([if get_projid exists], @@ -1125,39 +454,6 @@ get_projid, [ ]) ]) # LC_HAVE_PROJECT_QUOTA - -# -# LC_HAVE_SECURITY_DENTRY_INIT_SECURITY -# -# 3.10 introduced security_dentry_init_security() -# -AC_DEFUN([LC_HAVE_SECURITY_DENTRY_INIT_SECURITY], [ -LB_CHECK_COMPILE([if 'security_dentry_init_security' is defined], -security_dentry_init_security, [ - #include -],[ - security_dentry_init_security(NULL, 0, NULL, NULL, NULL); -],[ - AC_DEFINE(HAVE_SECURITY_DENTRY_INIT_SECURITY, 1, - [security_dentry_init_security' is defined]) -]) -]) # LC_HAVE_SECURITY_DENTRY_INIT_SECURITY - -# -# 3.10 exports security_inode_listsecurity -# -AC_DEFUN([LC_HAVE_SECURITY_INODE_LISTSECURITY], [ -LB_CHECK_COMPILE([if security_inode_listsecurity() is available/exported], -security_inode_listsecurity, [ - #include -],[ - security_inode_listsecurity(NULL, NULL, 0); -],[ - AC_DEFINE(HAVE_SECURITY_INODE_LISTSECURITY, 1, - [security_inode_listsecurity() is available/exported]) -]) -]) # LC_HAVE_SECURITY_INODE_LISTSECURITY - # # LC_INVALIDATE_RANGE # @@ -1362,25 +658,22 @@ kiocb_ki_left, [ ]) # LC_KIOCB_KI_LEFT # -# LC_INIT_LIST_HEAD_RCU +# LC_REGISTER_SHRINKER_RET # -# 3.12 added INIT_LIST_HEAD_RCU in commit 2a855b644c310d5db5 -# which is unfortunately an inline function and not a macro -# that can be tested directly, so it needs a configure check. +# v3.11-8748-g1d3d4437eae1 register_shrinker returns a status # -AC_DEFUN([LC_INIT_LIST_HEAD_RCU], [ -LB_CHECK_COMPILE([if 'INIT_LIST_HEAD_RCU' exists], -init_list_head_rcu, [ - #include - #include +AC_DEFUN([LC_REGISTER_SHRINKER_RET], [ +LB_CHECK_COMPILE([if register_shrinker() returns status], +register_shrinker_ret, [ + #include ],[ - struct list_head list; - INIT_LIST_HEAD_RCU(&list); + if (register_shrinker(NULL)) + unregister_shrinker(NULL); ],[ - AC_DEFINE(HAVE_INIT_LIST_HEAD_RCU, 1, - [INIT_LIST_HEAD_RCU exists]) + AC_DEFINE(HAVE_REGISTER_SHRINKER_RET, 1, + [register_shrinker() returns status]) ]) -]) # LC_INIT_LIST_HEAD_RCU +]) # LC_REGISTER_SHRINKER_RET # # LC_VFS_RENAME_5ARGS @@ -1744,6 +1037,39 @@ EXTRA_KCFLAGS="$tmp_flags" ]) # LC_HAVE_DQUOT_QC_DQBLK # +# LC_HAVE_AIO_COMPLETE +# +# 3.19 kernel makes aio_complete() static +# +AC_DEFUN([LC_HAVE_AIO_COMPLETE], [ +LB_CHECK_COMPILE([if kernel has exported aio_complete() ], +aio_complete, [ + #include +],[ + aio_complete(NULL, 0, 0); +],[ + AC_DEFINE(HAVE_AIO_COMPLETE, 1, [aio_complete defined]) +]) +]) # LC_HAVE_AIO_COMPLETE + +# +# LC_HAVE_IS_ROOT_INODE +# +# 3.19 kernel adds is_root_inode() +# Commit a7400222e3eb ("new helper: is_root_inode()") +# +AC_DEFUN([LC_HAVE_IS_ROOT_INODE], [ +LB_CHECK_COMPILE([if kernel has is_root_inode() ], +is_root_inode, [ + #include +],[ + is_root_inode(NULL); +],[ + AC_DEFINE(HAVE_IS_ROOT_INODE, 1, [is_root_inode defined]) +]) +]) # LC_HAVE_IS_ROOT_INODE + +# # LC_BACKING_DEV_INFO_REMOVAL # # 3.20 kernel removed backing_dev_info from address_space @@ -1876,7 +1202,7 @@ bio_endio, [ # # LC_ACCOUNT_PAGE_DIRTIED_3ARGS # -# 4.2 kernel page dirtied takes 3 arguments +# 4.2 [to 4.5] kernel page dirtied takes 3 arguments # AC_DEFUN([LC_ACCOUNT_PAGE_DIRTIED_3ARGS], [ LB_CHECK_COMPILE([if 'account_page_dirtied' with 3 args exists], @@ -1891,6 +1217,24 @@ account_page_dirtied, [ ]) # LC_ACCOUNT_PAGE_DIRTIED_3ARGS # +# LC_HAVE_CRYPTO_ALLOC_SKCIPHER +# +# Kernel version 4.12 commit 7a7ffe65c8c5 +# introduced crypto_alloc_skcipher(). +# +AC_DEFUN([LC_HAVE_CRYPTO_ALLOC_SKCIPHER], [ +LB_CHECK_COMPILE([if crypto_alloc_skcipher is defined], +crypto_alloc_skcipher, [ + #include +],[ + crypto_alloc_skcipher(NULL, 0, 0); +],[ + AC_DEFINE(HAVE_CRYPTO_ALLOC_SKCIPHER, 1, + [crypto_alloc_skcipher is defined]) +]) +]) # LC_HAVE_CRYPTO_ALLOC_SKCIPHER + +# # LC_HAVE_INTERVAL_EXP_BLK_INTEGRITY # # 4.3 replace interval with interval_exp in 'struct blk_integrity' @@ -1910,32 +1254,6 @@ blk_integrity_interval_exp, [ ]) # LC_HAVE_INTERVAL_EXP_BLK_INTEGRITY # -# LC_HAVE_LOOP_CTL_GET_FREE -# -# 4.x kernel have moved userspace APIs to -# the separate directory and all of them -# support LOOP_CTL_GET_FREE -# -AC_DEFUN([LC_HAVE_LOOP_CTL_GET_FREE], [ -LB_CHECK_FILE([$LINUX/include/linux/loop.h], [ - LB_CHECK_COMPILE([if have 'HAVE_LOOP_CTL_GET_FREE'], - LOOP_CTL_GET_FREE, [ - #include - ],[ - int i; - - i = LOOP_CTL_GET_FREE; - ],[ - AC_DEFINE(HAVE_LOOP_CTL_GET_FREE, 1, - [LOOP_CTL_GET_FREE exist]) - ]) -],[ - AC_DEFINE(HAVE_LOOP_CTL_GET_FREE, 1, - [kernel has LOOP_CTL_GET_FREE]) -]) -]) # LC_HAVE_LOOP_CTL_GET_FREE - -# # LC_HAVE_CACHE_HEAD_HLIST # # 4.3 kernel swiched to hlist for cache_head @@ -2061,8 +1379,7 @@ LB_CHECK_COMPILE([if kernel has clean_bdev_aliases], have_clean_bdev_aliases, [ #include ],[ - struct block_device bdev; - clean_bdev_aliases(&bdev,1,1); + clean_bdev_aliases(NULL,1,1); ], [ AC_DEFINE(HAVE_CLEAN_BDEV_ALIASES, 1, [kernel has clean_bdev_aliases]) @@ -2305,7 +1622,7 @@ generic_write_sync_2args, [ # # LC_FOP_ITERATE_SHARED # -# Kernel version 4.7 adds iterate_shared method to file_operations +# Kernel v4.6-rc3-29-g6192269 adds iterate_shared method to file_operations # AC_DEFUN([LC_FOP_ITERATE_SHARED], [ LB_CHECK_COMPILE([if 'file_operations' has 'iterate_shared'], @@ -2321,27 +1638,17 @@ fop_iterate_shared, [ ]) # LC_FOP_ITERATE_SHARED # -# LC_FOPS_ITERATE_SHARED +# LC_EXPORT_DEFAULT_FILE_SPLICE_READ # -# 4.7 commit ae05327a00fd47c34dfe25294b359a3f3fef96e8 -# ext4: switch to ->iterate_shared() -# this replaces ext4_dir_operations iterate with iterate_shared. -# dir_relaxed_shared() was also added in this commit, so we can -# use that function to verify that the ext4_dir_operations is using -# iterate_shared. +# 4.8-rc8 commit 82c156f853840645604acd7c2cebcb75ed1b6652 switched +# generic_file_splice_read() to using ->read_iter. We can test this +# change since default_file_splice_read() is no longer exported. # -AC_DEFUN([LC_FOPS_ITERATE_SHARED], [ -LB_CHECK_COMPILE([if ext4_dir_operations uses iterate_shared], -iterate_shared, [ - #include -],[ - ((struct file_operations *)0)->iterate_shared(NULL, NULL); - dir_relax_shared(NULL); -],[ - AC_DEFINE(HAVE_ITERATE_SHARED, 1, - ['iterate_shared' is available]) -]) -]) # LC_FOPS_ITERATE_SHARED +AC_DEFUN([LC_EXPORT_DEFAULT_FILE_SPLICE_READ], [ +LB_CHECK_EXPORT([default_file_splice_read], [fs/splice.c], + [AC_DEFINE(HAVE_DEFAULT_FILE_SPLICE_READ_EXPORT, 1, + [default_file_splice_read is exported])]) +]) # LC_EXPORT_DEFAULT_FILE_SPLCE_READ # # LC_HAVE_POSIX_ACL_VALID_USER_NS @@ -2688,53 +1995,6 @@ bi_status, [ ]) # LC_BI_STATUS # -# LC_UAPI_LINUX_MOUNT_H -# -# kernel 4.20 commit e262e32d6bde0f77fb0c95d977482fc872c51996 -# vfs: Suppress MS_* flag defs within the kernel ... -# -AC_DEFUN([LC_UAPI_LINUX_MOUNT_H], [ -tmp_flags="$EXTRA_KCFLAGS" -EXTRA_KCFLAGS="-Werror" -LB_CHECK_COMPILE([if MS_RDONLY was moved to uapi/linux/mount.h], -uapi_linux_mount, [ - #include -],[ - int x = MS_RDONLY; - (void)x; -],[ - AC_DEFINE(HAVE_UAPI_LINUX_MOUNT_H, 1, - [if MS_RDONLY was moved to uapi/linux/mount.h]) -]) -EXTRA_KCFLAGS="$tmp_flags" -]) # LC_UAPI_LINUX_MOUNT_H - -# -# LC_HAVE_SUNRPC_CACHE_HASH_LOCK_IS_A_SPINLOCK -# -# kernel 4.20 commit 1863d77f15da0addcd293a1719fa5d3ef8cde3ca -# SUNRPC: Replace the cache_detail->hash_lock with a regular spinlock -# -# Now that the reader functions are all RCU protected, use a regular -# spinlock rather than a reader/writer lock. -# -AC_DEFUN([LC_HAVE_SUNRPC_CACHE_HASH_LOCK_IS_A_SPINLOCK], [ -tmp_flags="$EXTRA_KCFLAGS" -EXTRA_KCFLAGS="-Werror" -LB_CHECK_COMPILE([if cache_detail->hash_lock is a spinlock], -hash_lock_isa_spinlock_t, [ - #include -],[ - spinlock_t *lock = &(((struct cache_detail *)0)->hash_lock); - spin_lock(lock); -],[ - AC_DEFINE(HAVE_CACHE_HASH_SPINLOCK, 1, - [if cache_detail->hash_lock is a spinlock]) -]) -EXTRA_KCFLAGS="$tmp_flags" -]) # LC_HAVE_SUNRPC_CACHE_HASH_LOCK_IS_A_SPINLOCK - -# # LC_BIO_INTEGRITY_ENABLED # # 4.13 removed bio_integrity_enabled @@ -2786,6 +2046,49 @@ bi_bdev, [ ]) # LC_BI_BDEV # +# LC_INTERVAL_TREE_CACHED +# +# 4.14 f808c13fd3738948e10196496959871130612b61 +# switched INTERVAL_TREE_DEFINE to use cached RB_Trees. +# +AC_DEFUN([LC_INTERVAL_TREE_CACHED], [ +tmp_flags="$EXTRA_KCFLAGS" +EXTRA_KCFLAGS="-Werror" +LB_CHECK_COMPILE([if interval_trees use rb_tree_cached], +itree_cached, [ + #include + struct foo { struct rb_node rb; int last; int a,b;}; + #define START(n) ((n)->a) + #define LAST(n) ((n)->b) + struct rb_root_cached tree; + INTERVAL_TREE_DEFINE(struct foo, rb, int, last, + START, LAST, , foo); +],[ + foo_insert(NULL, &tree); +],[ + AC_DEFINE(HAVE_INTERVAL_TREE_CACHED, 1, + [interval trees use rb_tree_cached]) +]) +EXTRA_KCFLAGS="$tmp_flags" +]) # LC_INTERVAL_TREE_CACHED + +# +# LC_IS_ENCRYPTED +# +# 4.14 introduced IS_ENCRYPTED and S_ENCRYPTED +# +AC_DEFUN([LC_IS_ENCRYPTED], [ +LB_CHECK_COMPILE([if IS_ENCRYPTED is defined], +is_encrypted, [ + #include +],[ + IS_ENCRYPTED((struct inode *)0); +],[ + has_is_encrypted="yes" +]) +]) # LC_IS_ENCRYPTED + +# # LC_I_PAGES # # kernel 4.17 commit b93b016313b3ba8003c3b8bb71f569af91f19fc7 @@ -2825,6 +2128,27 @@ vm_fault_t, [ ]) # LC_VM_FAULT_T # +# LC_VM_FAULT_RETRY +# +# kernel 4.17 commit 3d3539018d2cbd12e5af4a132636ee7fd8d43ef0 +# mm: VM_FAULT_RETRY is defined in enum vm_fault_reason +# +AC_DEFUN([LC_VM_FAULT_RETRY], [ +LB_CHECK_COMPILE([if VM_FAULT_RETRY is defined], +VM_FAULT_RETRY, [ + #include +],[ + #ifndef VM_FAULT_RETRY + vm_fault_t x; + x = VM_FAULT_RETRY; + #endif +],[ + AC_DEFINE(HAVE_VM_FAULT_RETRY, 1, + [if VM_FAULT_RETRY is defined]) +]) +]) # LC_VM_FAULT_RETRY + +# # LC_INODE_TIMESPEC64 # # kernel 4.17-rc7 commit 8efd6894ff089adeeac7cb9f32125b85d963d1bc @@ -2839,6 +2163,9 @@ vm_fault_t, [ # When inode times are timespec64 stop using the deprecated # time interfaces. # +# kernel v5.5-rc1-6-gba70609d5ec6 ba70609d5ec664a8f36ba1c857fcd97a478adf79 +# fs: Delete timespec64_trunc() +# AC_DEFUN([LC_INODE_TIMESPEC64], [ tmp_flags="$EXTRA_KCFLAGS" EXTRA_KCFLAGS="-Werror" @@ -2847,9 +2174,9 @@ inode_timespec64, [ #include ],[ struct inode *inode = NULL; - struct timespec64 ts = {}; + struct timespec64 ts = {0, 1}; - inode->i_atime = timespec64_trunc(ts, 1); + inode->i_atime = ts; (void)inode; ],[ AC_DEFINE(HAVE_INODE_TIMESPEC64, 1, @@ -2859,6 +2186,75 @@ EXTRA_KCFLAGS="$tmp_flags" ]) # LC_INODE_TIMESPEC64 # +# LC___XA_SET_MARK +# +# kernel 4.20 commit v4.19-rc5-248-g9b89a0355144 +# xarray: Add XArray marks - replaced radix_tree_tag_set +# +AC_DEFUN([LC___XA_SET_MARK], [ +tmp_flags="$EXTRA_KCFLAGS" +EXTRA_KCFLAGS="-Werror" +LB_CHECK_COMPILE([if '__xa_set_mark' exists], +__xa_set_mark, [ + #include + #include +],[ + radix_tree_tag_set(NULL, 0, PAGECACHE_TAG_DIRTY); +],[ + AC_DEFINE(HAVE_RADIX_TREE_TAG_SET, 1, + [__xa_set_mark exists]) +]) +EXTRA_KCFLAGS="$tmp_flags" +]) # LC___XA_SET_MARK + +# +# LC_UAPI_LINUX_MOUNT_H +# +# kernel 4.20 commit e262e32d6bde0f77fb0c95d977482fc872c51996 +# vfs: Suppress MS_* flag defs within the kernel ... +# +AC_DEFUN([LC_UAPI_LINUX_MOUNT_H], [ +tmp_flags="$EXTRA_KCFLAGS" +EXTRA_KCFLAGS="-Werror" +LB_CHECK_COMPILE([if MS_RDONLY was moved to uapi/linux/mount.h], +uapi_linux_mount, [ + #include +],[ + int x = MS_RDONLY; + (void)x; +],[ + AC_DEFINE(HAVE_UAPI_LINUX_MOUNT_H, 1, + [if MS_RDONLY was moved to uapi/linux/mount.h]) +]) +EXTRA_KCFLAGS="$tmp_flags" +]) # LC_UAPI_LINUX_MOUNT_H + +# +# LC_HAVE_SUNRPC_CACHE_HASH_LOCK_IS_A_SPINLOCK +# +# kernel 4.20 commit 1863d77f15da0addcd293a1719fa5d3ef8cde3ca +# SUNRPC: Replace the cache_detail->hash_lock with a regular spinlock +# +# Now that the reader functions are all RCU protected, use a regular +# spinlock rather than a reader/writer lock. +# +AC_DEFUN([LC_HAVE_SUNRPC_CACHE_HASH_LOCK_IS_A_SPINLOCK], [ +tmp_flags="$EXTRA_KCFLAGS" +EXTRA_KCFLAGS="-Werror" +LB_CHECK_COMPILE([if cache_detail->hash_lock is a spinlock], +hash_lock_isa_spinlock_t, [ + #include +],[ + spinlock_t *lock = &(((struct cache_detail *)0)->hash_lock); + spin_lock(lock); +],[ + AC_DEFINE(HAVE_CACHE_HASH_SPINLOCK, 1, + [if cache_detail->hash_lock is a spinlock]) +]) +EXTRA_KCFLAGS="$tmp_flags" +]) # LC_HAVE_SUNRPC_CACHE_HASH_LOCK_IS_A_SPINLOCK + +# # LC_HAS_LINUX_SELINUX_ENABLED # # kernel 5.1 commit 3d252529480c68bfd6a6774652df7c8968b28e41 @@ -2881,6 +2277,58 @@ EXTRA_KCFLAGS="$tmp_flags" ]) # LC_HAS_LINUX_SELINUX_ENABLED # +# 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 +],[ + 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 + +# +# LC_ACCOUNT_PAGE_DIRTIED +# +# After 5.2 kernel page dirtied is not exported +# +AC_DEFUN([LC_ACCOUNT_PAGE_DIRTIED], [ +LB_CHECK_EXPORT([account_page_dirtied], [mm/page-writeback.c], + [AC_DEFINE(HAVE_ACCOUNT_PAGE_DIRTIED_EXPORT, 1, + [account_page_dirtied is exported])]) +]) # LC_ACCOUNT_PAGE_DIRTIED + +# +# LC_KEYRING_SEARCH_4ARGS +# +# Kernel 5.2 commit dcf49dbc8077 +# keys: Add a 'recurse' flag for keyring searches +# +AC_DEFUN([LC_KEYRING_SEARCH_4ARGS], [ +LB_CHECK_COMPILE([if 'keyring_search' has 4 args], +keyring_search_4args, [ + #include +],[ + key_ref_t keyring; + keyring_search(keyring, NULL, NULL, false); +],[ + AC_DEFINE(HAVE_KEYRING_SEARCH_4ARGS, 1, + [keyring_search has 4 args]) +]) +]) # LC_KEYRING_SEARCH_4ARGS + +# # LC_BIO_BI_PHYS_SEGMENTS # # kernel 5.3-rc1 commit 14ccb66b3f585b2bc21e7256c96090abed5a512c @@ -2925,6 +2373,32 @@ lock_manager_ops_lm_compare_owner, [ EXTRA_KCFLAGS="$tmp_flags" ]) # LC_LM_COMPARE_OWNER_EXISTS +AC_DEFUN([LC_PROG_LINUX_SRC], []) +AC_DEFUN([LC_PROG_LINUX_RESULTS], []) + +# +# LC_FSCRYPT_SUPPORT +# +# 5.4 introduced fscrypt encryption policies v2 +# +AC_DEFUN([LC_FSCRYPT_SUPPORT], [ +LB_CHECK_COMPILE([for fscrypt in-kernel support], +fscrypt_support, [ + #define __FS_HAS_ENCRYPTION 0 + #include +],[ + 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.]) +]) +]) # LC_FSCRYPT_SUPPORT + # # LC_PROG_LINUX # @@ -2939,77 +2413,11 @@ AC_DEFUN([LC_PROG_LINUX], [ LC_CONFIG_FLOCK LC_CONFIG_HEALTH_CHECK_WRITE LC_CONFIG_LRU_RESIZE - - LC_GLIBC_SUPPORT_FHANDLES + LC_CONFIG_FHANDLE LC_CONFIG_GSS - LC_OPENSSL_SSK - LC_OPENSSL_GETSEPOL - - # 2.6.39 - LC_HAVE_FHANDLE_SYSCALLS - LC_HAVE_FSTYPE_MOUNT - LC_HAVE_INODE_OWNER_OR_CAPABLE - LC_HAVE_SECURITY_IINITSEC - LC_VFS_CREATE_USE_NAMEIDATA - - # 3.0 - LC_DIRTY_INODE_WITH_FLAG - LC_SETNS - - # 3.1 - LC_LM_XXX_LOCK_MANAGER_OPS - LC_INODE_DIO_WAIT - LC_IOP_GET_ACL - LC_FILE_LLSEEK_SIZE - LC_INODE_PERMISION_2ARGS - LC_RADIX_EXCEPTION_ENTRY - LC_HAVE_LOOP_CTL_GET_FREE - - # 3.2 - LC_HAVE_PROTECT_I_NLINK - - # 3.3 - LC_HAVE_MIGRATE_HEADER - LC_MIGRATEPAGE_4ARGS - LC_SUPEROPS_USE_DENTRY - LC_INODEOPS_USE_UMODE_T - LC_HAVE_CACHE_REGISTER - - # 3.4 - LC_HAVE_D_MAKE_ROOT - LC_KMAP_ATOMIC_HAS_1ARG - - # 3.5 - LC_HAVE_CLEAR_INODE - LC_HAVE_ENCODE_FH_PARENT - LC_FILE_LLSEEK_SIZE_5ARG - - # 3.6 - LC_DATA_FOR_LLITE_IS_LIST - LC_DENTRY_OPEN_USE_PATH - LC_HAVE_IOP_ATOMIC_OPEN - LC_HAVE_SB_START_WRITE - - # 3.7 - LC_HAVE_POSIXACL_USER_NS - - # 3.8 - LC_HAVE_FILE_F_INODE - LC_HAVE_FILE_INODE - LC_HAVE_SUNRPC_UPCALL_HAS_3ARGS - - # 3.9 - LC_HAVE_HLIST_FOR_EACH_3ARG - LC_HAVE_BIO_END_SECTOR - LC_HAVE_IS_SXID - LC_HAVE_VFS_GETATTR_2ARGS # 3.10 - LC_HAVE_REMOVE_PROC_SUBTREE - LC_HAVE_PROC_REMOVE LC_HAVE_PROJECT_QUOTA - LC_HAVE_SECURITY_DENTRY_INIT_SECURITY - LC_HAVE_SECURITY_INODE_LISTSECURITY # 3.11 LC_INVALIDATE_RANGE @@ -3024,7 +2432,7 @@ AC_DEFUN([LC_PROG_LINUX], [ LC_OLDSIZE_TRUNCATE_PAGECACHE LC_PTR_ERR_OR_ZERO_MISSING LC_KIOCB_KI_LEFT - LC_INIT_LIST_HEAD_RCU + LC_REGISTER_SHRINKER_RET # 3.13 LC_VFS_RENAME_5ARGS @@ -3057,6 +2465,8 @@ AC_DEFUN([LC_PROG_LINUX], [ # 3.19 LC_KIOCB_HAS_NBYTES LC_HAVE_DQUOT_QC_DQBLK + LC_HAVE_AIO_COMPLETE + LC_HAVE_IS_ROOT_INODE # 3.20 LC_BACKING_DEV_INFO_REMOVAL @@ -3071,6 +2481,7 @@ AC_DEFUN([LC_PROG_LINUX], [ LC_BIO_ENDIO_USES_ONE_ARG LC_SYMLINK_OPS_USE_NAMEIDATA LC_ACCOUNT_PAGE_DIRTIED_3ARGS + LC_HAVE_CRYPTO_ALLOC_SKCIPHER # 4.3 LC_HAVE_INTERVAL_EXP_BLK_INTEGRITY @@ -3102,9 +2513,10 @@ AC_DEFUN([LC_PROG_LINUX], [ LC_D_IN_LOOKUP LC_DIRECTIO_2ARGS LC_GENERIC_WRITE_SYNC_2ARGS - LC_FOPS_ITERATE_SHARED + LC_FOP_ITERATE_SHARED # 4.8 + LC_EXPORT_DEFAULT_FILE_SPLICE_READ LC_HAVE_POSIX_ACL_VALID_USER_NS LC_D_COMPARE_4ARGS LC_FULL_NAME_HASH_3ARGS @@ -3138,22 +2550,28 @@ AC_DEFUN([LC_PROG_LINUX], [ # 4.14 LC_PAGEVEC_INIT_ONE_PARAM LC_BI_BDEV + LC_INTERVAL_TREE_CACHED # 4.17 LC_VM_FAULT_T + LC_VM_FAULT_RETRY LC_I_PAGES # 4.18 LC_INODE_TIMESPEC64 # 4.20 - LC_HAVE_SUNRPC_CACHE_HASH_LOCK_IS_A_SPINLOCK - - # 5.0 + LC___XA_SET_MARK LC_UAPI_LINUX_MOUNT_H + LC_HAVE_SUNRPC_CACHE_HASH_LOCK_IS_A_SPINLOCK # 5.1 LC_HAS_LINUX_SELINUX_ENABLED + LB_HAVE_BVEC_ITER_ALL + + # 5.2 + LC_ACCOUNT_PAGE_DIRTIED + LC_KEYRING_SEARCH_4ARGS # 5.3 LC_BIO_BI_PHYS_SEGMENTS @@ -3306,6 +2724,41 @@ AC_SUBST(OSDADDON) ]) # LC_OSD_ADDON # +# LC_CONFIG_CRYPTO +# +# Check whether to enable Lustre client crypto +# +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]), + [], [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$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_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.])]) + AS_IF([test "x$enable_crypto" != xno -a "x$enable_dist" = xno], + [AC_MSG_WARN(Lustre client crypto cannot be enabled because of lack of encryption support in your kernel.)]) + enable_crypto=no])]) +AS_IF([test "x$enable_dist" != xno], [ + enable_crypto=yes + enable_llcrypt=yes]) +AC_MSG_RESULT([$enable_crypto]) +]) # LC_CONFIG_CRYPTO + +# # LC_CONFIGURE # # other configure checks @@ -3329,8 +2782,17 @@ LC_MDS_MAX_THREADS AC_CHECK_HEADERS([netdb.h endian.h]) AC_CHECK_FUNCS([gethostbyname]) -# lustre/utils/llverfs.c -AC_CHECK_HEADERS([ext2fs/ext2fs.h]) +# lustre/utils/llverfs.c lustre/utils/libmount_utils_ldiskfs.c +AC_CHECK_HEADERS([ext2fs/ext2fs.h], [], [ + AS_IF([test "x$enable_utils" = xyes -a "x$enable_ldiskfs" = xyes], [ + AC_MSG_ERROR([ +ext2fs.h not found. Please install e2fsprogs development package. + ]) + ]) +]) + +# lustre/tests/statx_test.c +AC_CHECK_FUNCS([statx]) # lustre/utils/lfs.c AS_IF([test "$enable_dist" = "no"], [ @@ -3362,6 +2824,8 @@ No selinux package found, unable to build selinux enabled tools ]) AC_SUBST(SELINUX) +AC_CHECK_LIB([keyutils], [add_key]) + # Super safe df AC_MSG_CHECKING([whether to report minimum OST free space]) AC_ARG_ENABLE([mindf], @@ -3438,7 +2902,7 @@ AC_ARG_WITH([bash-completion-dir], AS_IF([test "x$with_bash_completion_dir" = "xyes"], [ BASH_COMPLETION_DIR="`pkg-config --variable=completionsdir bash-completion`" AS_IF([test "x$BASH_COMPLETION_DIR" = "x"], [ - [BASH_COMPLETION_DIR="$datadir/bash-completion/completions"] + [BASH_COMPLETION_DIR="/usr/share/bash-completion/completions"] ]) ], [ BASH_COMPLETION_DIR="$with_bash_completion_dir" @@ -3468,6 +2932,8 @@ AM_CONDITIONAL(ENABLE_BASH_COMPLETION, test "x$with_bash_completion_dir" != "xno AM_CONDITIONAL(XATTR_HANDLER, test "x$lb_cv_compile_xattr_handler_flags" = xyes) AM_CONDITIONAL(SELINUX, test "$SELINUX" = "-lselinux") AM_CONDITIONAL(GETSEPOL, test x$enable_getsepol = xyes) +AM_CONDITIONAL(LLCRYPT, test x$enable_llcrypt = xyes) +AM_CONDITIONAL(LIBAIO, test x$enable_libaio = xyes) ]) # LC_CONDITIONALS # @@ -3487,19 +2953,21 @@ lustre/doc/Makefile lustre/include/Makefile lustre/include/lustre/Makefile lustre/include/uapi/linux/lustre/Makefile +lustre/kernel_patches/targets/4.18-rhel8.3.target +lustre/kernel_patches/targets/4.18-rhel8.2.target +lustre/kernel_patches/targets/4.18-rhel8.1.target lustre/kernel_patches/targets/4.18-rhel8.target +lustre/kernel_patches/targets/3.10-rhel7.9.target +lustre/kernel_patches/targets/3.10-rhel7.8.target lustre/kernel_patches/targets/3.10-rhel7.7.target lustre/kernel_patches/targets/3.10-rhel7.6.target lustre/kernel_patches/targets/3.10-rhel7.5.target lustre/kernel_patches/targets/4.14-rhel7.5.target lustre/kernel_patches/targets/4.14-rhel7.6.target -lustre/kernel_patches/targets/3.0-sles11.target -lustre/kernel_patches/targets/3.0-sles11sp3.target -lustre/kernel_patches/targets/3.0-sles11sp4.target -lustre/kernel_patches/targets/3.12-sles12.target -lustre/kernel_patches/targets/4.4-sles12.target -lustre/kernel_patches/targets/4.4-sles12sp3.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/3.x-fc18.target lustre/ldlm/Makefile lustre/fid/Makefile @@ -3549,6 +3017,8 @@ lustre/scripts/Makefile lustre/scripts/systemd/Makefile lustre/tests/Makefile lustre/tests/mpi/Makefile +lustre/tests/lutf/Makefile +lustre/tests/lutf/src/Makefile lustre/tests/kernel/Makefile lustre/tests/kernel/autoMakefile lustre/utils/Makefile