X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fautoconf%2Flustre-core.m4;h=46d2ca874846a175318308bb6f8c3670a31899c9;hp=9f5997934bf023d837d46506f6ebe9563ccfe32f;hb=f7df2365bc51a7b2804f9b497cbc6bc340dd9da1;hpb=6e84dbce05959e854d886772841a5d6d0690eb65 diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 9f59979..46d2ca8 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -215,20 +215,6 @@ LB_CHECK_EXPORT([delete_from_page_cache], [mm/filemap.c], ]) # LC_EXPORT_TRUNCATE_COMPLETE_PAGE # -# LC_CONFIG_RMTCLIENT -# -dnl FIXME -dnl the AES symbol usually tied with arch, e.g. CRYPTO_AES_586 -dnl FIXME -AC_DEFUN([LC_CONFIG_RMTCLIENT], [ -LB_CHECK_CONFIG_IM([CRYPTO_AES], [], - [AC_MSG_WARN([ - -Lustre remote client require that CONFIG_CRYPTO_AES is enabled in your kernel. -])]) -]) # LC_CONFIG_RMTCLIENT - -# # LC_CONFIG_GSS_KEYRING # # default 'auto', tests for dependencies, if found, enables; @@ -244,17 +230,11 @@ AC_MSG_RESULT([$enable_gss_keyring]) AS_IF([test "x$enable_gss_keyring" != xno], [ LB_CHECK_CONFIG_IM([KEYS], [], [ gss_keyring_conf_test="fail" - AC_MSG_WARN([ - -GSS keyring backend require that CONFIG_KEYS be enabled in your kernel. -])]) + AC_MSG_WARN([GSS keyring backend requires that CONFIG_KEYS be enabled in your kernel.])]) AC_CHECK_LIB([keyutils], [keyctl_search], [], [ gss_keyring_conf_test="fail" - AC_MSG_WARN([ - -libkeyutils is not found, which is required by gss keyring backend -])]) + AC_MSG_WARN([GSS keyring backend requires libkeyutils])]) AS_IF([test "x$gss_keyring_conf_test" != xfail], [ AC_DEFINE([HAVE_GSS_KEYRING], [1], @@ -262,15 +242,7 @@ libkeyutils is not found, which is required by gss keyring backend enable_gss_keyring="yes" ], [ AS_IF([test "x$enable_gss_keyring" = xyes], [ - AC_MSG_ERROR([ - -Cannot enable gss_keyring. See above for details. -]) - ], [ - AC_MSG_WARN([ - -Cannot enable gss keyring. See above for details. -]) + AC_MSG_ERROR([Cannot enable gss_keyring. See above for details.]) ]) ]) ]) @@ -330,9 +302,9 @@ kernel SUNRPC support is required by using GSS. # parts are depend on linux platform. # AC_DEFUN([LC_CONFIG_GSS], [ -AC_MSG_CHECKING([whether to enable gss/krb5 support]) +AC_MSG_CHECKING([whether to enable gss support]) AC_ARG_ENABLE([gss], - [AC_HELP_STRING([--enable-gss], [enable gss/krb5 support])], + [AC_HELP_STRING([--enable-gss], [enable gss support])], [], [enable_gss="auto"]) AC_MSG_RESULT([$enable_gss]) @@ -360,7 +332,6 @@ AS_IF([test "x$enable_gss" != xno], [ AS_IF([test -n "$KRBDIR"], [ gss_conf_test="success" ], [ - AC_MSG_WARN([not found!]) gss_conf_test="failure" ]) @@ -370,10 +341,34 @@ AS_IF([test "x$enable_gss" != xno], [ ], [ enable_gss="no" ]) + + enable_ssk=$enable_gss ]) ]) # LC_CONFIG_GSS -# +# LC_OPENSSL_SSK +# +# OpenSSL 1.0+ return int for HMAC functions but older SLES11 versions do not +AC_DEFUN([LC_OPENSSL_SSK], [ +AC_MSG_CHECKING([whether OpenSSL has functions needed for SSK]) +AS_IF([test "x$enable_ssk" != xno], [ +AC_COMPILE_IFELSE([AC_LANG_SOURCE([ + #include + #include + + int main(void) { + int rc; + HMAC_CTX ctx; + HMAC_CTX_init(&ctx); + rc = HMAC_Init_ex(&ctx, "test", 4, EVP_md_null(), NULL); + } +])],[AC_DEFINE(HAVE_OPENSSL_SSK, 1, + [OpenSSL HMAC functions needed for SSK])], + [enable_ssk="no"]) +]) +AC_MSG_RESULT([$enable_ssk]) +]) # LC_OPENSSL_SSK + # LC_INODE_PERMISION_2ARGS # # up to v2.6.27 had a 3 arg version (inode, mask, nameidata) @@ -692,6 +687,26 @@ LB_CHECK_EXPORT([simple_setattr], [fs/libfs.c], ]) # LC_EXPORT_SIMPLE_SETATTR # +# LC_HAVE_BLK_PLUG +# +# 2.6.38 add struct blk_plug +# +AC_DEFUN([LC_HAVE_BLK_PLUG], [ +LB_CHECK_COMPILE([if 'struct blk_plug' exists], +blk_plug, [ + #include +],[ + struct blk_plug plug; + + blk_start_plug(&plug); + blk_finish_plug(&plug); +],[ + AC_DEFINE(HAVE_BLK_PLUG, 1, + [blk_plug struct exists]) +]) +]) # LC_HAVE_BLK_PLUG + +# # LC_IOP_TRUNCATE # # truncate callback removed since 2.6.39 @@ -794,6 +809,18 @@ dirty_inode_super_operation_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_GENERIC_PERMISSION # # 2.6.38 generic_permission taken 4 parameters. @@ -1260,6 +1287,23 @@ inode_ops_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 @@ -1295,6 +1339,23 @@ file_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], [ @@ -1354,6 +1415,22 @@ bio_end_sector, [ ]) # 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 + +# # LC_HAVE_REMOVE_PROC_SUBTREE # # 3.10 introduced remove_proc_subtree @@ -1407,6 +1484,38 @@ block_device_ops_release_return_int, [ ]) ]) # LC_BLKDEV_RELEASE_RETURN_INT +AC_DEFUN([LC_HAVE_PROJECT_QUOTA], [ +LB_CHECK_COMPILE([if get_projid exists], +get_projid, [ + #include +],[ + struct dquot_operations ops; + + ops.get_projid(NULL, NULL); +],[ + AC_DEFINE(HAVE_PROJECT_QUOTA, 1, + [get_projid function exists]) +]) +]) # 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 + # # LC_INVALIDATE_RANGE # @@ -1479,6 +1588,24 @@ d_count, [ ]) # LC_HAVE_DCOUNT # +# LC_PID_NS_FOR_CHILDREN +# +# 3.11 replaces pid_ns by pid_ns_for_children in struct nsproxy +# +AC_DEFUN([LC_PID_NS_FOR_CHILDREN], [ +LB_CHECK_COMPILE([if 'struct nsproxy' has 'pid_ns_for_children'], +pid_ns_for_children, [ + #include +],[ + struct nsproxy ns; + ns.pid_ns_for_children = NULL; +],[ + AC_DEFINE(HAVE_PID_NS_FOR_CHILDREN, 1, + ['struct nsproxy' has 'pid_ns_for_children']) +]) +]) # LC_PID_NS_FOR_CHILDREN + +# # LC_OLDSIZE_TRUNCATE_PAGECACHE # # 3.12 truncate_pagecache without oldsize parameter @@ -1621,6 +1748,26 @@ have_bvec_iter, [ ]) # LC_HAVE_BVEC_ITER # +# LC_HAVE_BI_CNT +# +# 4.4 redefined bi_cnt as __bi_cnt +# +AC_DEFUN([LC_HAVE_BI_CNT], [ +LB_CHECK_COMPILE([if Linux kernel has bi_cnt in struct bio], +have_bi_cnt, [ + #include + #include +],[ + struct bio bio; + int cnt; + cnt = atomic_read(&bio.bi_cnt); +], [ + AC_DEFINE(HAVE_BI_CNT, 1, + [struct bio has bi_cnt]) +]) +]) # LC_HAVE_BI_CNT + +# # LC_HAVE_TRUNCATE_IPAGE_FINAL # # 3.14 bring truncate_inode_pages_final for evict_inode @@ -1638,6 +1785,27 @@ truncate_ipages_final, [ ]) # LC_HAVE_TRUNCATE_IPAGES_FINAL # +# LC_IOPS_RENAME_WITH_FLAGS +# +# 3.14 has inode_operations->rename with 5 args +# commit 520c8b16505236fc82daa352e6c5e73cd9870cff +# +AC_DEFUN([LC_IOPS_RENAME_WITH_FLAGS], [ +LB_CHECK_COMPILE([if 'inode_operations->rename' taken flags as argument], +iops_rename_with_flags, [ + #include +],[ + struct inode *i1 = NULL, *i2 = NULL; + struct dentry *d1 = NULL, *d2 = NULL; + int rc; + rc = ((struct inode_operations *)0)->rename(i1, d1, i2, d2, 0); +], [ + AC_DEFINE(HAVE_IOPS_RENAME_WITH_FLAGS, 1, + [inode_operations->rename need flags as argument]) +]) +]) # LC_IOPS_RENAME_WITH_FLAGS + +# # LC_VFS_RENAME_6ARGS # # 3.15 has vfs_rename with 6 args @@ -1702,6 +1870,29 @@ EXTRA_KCFLAGS="$tmp_flags" ]) # LC_HAVE_IOV_ITER_INIT_DIRECTION # +# LC_HAVE_IOV_ITER_TRUNCATE +# +# +# 3.16 introduces a new API iov_iter_truncate() +# +AC_DEFUN([LC_HAVE_IOV_ITER_TRUNCATE], [ +tmp_flags="$EXTRA_KCFLAGS" +EXTRA_KCFLAGS="-Werror" +LB_CHECK_COMPILE([if 'iov_iter_truncate' exists ], +iter_truncate, [ + #include + #include +],[ + struct iov_iter *i = NULL; + + iov_iter_truncate(i, 0); +],[ + AC_DEFINE(HAVE_IOV_ITER_TRUNCATE, 1, [iov_iter_truncate exists]) +]) +EXTRA_KCFLAGS="$tmp_flags" +]) # LC_HAVE_IOV_ITER_TRUNCATE + +# # LC_HAVE_FILE_OPERATIONS_READ_WRITE_ITER # # 3.16 introduces [read|write]_iter to struct file_operations @@ -1805,6 +1996,30 @@ ki_nbytes, [ ]) # LC_KIOCB_HAS_NBYTES # +# LC_HAVE_DQUOT_QC_DQBLK +# +# 3.19 has quotactl_ops->[sg]et_dqblk that take struct kqid and qc_dqblk +# Added in commit 14bf61ffe +# +AC_DEFUN([LC_HAVE_DQUOT_QC_DQBLK], [ +tmp_flags="$EXTRA_KCFLAGS" +EXTRA_KCFLAGS="-Werror" +LB_CHECK_COMPILE([if 'quotactl_ops.set_dqblk' takes struct qc_dqblk], +qc_dqblk, [ + #include + #include +],[ + ((struct quotactl_ops *)0)->set_dqblk(NULL, *((struct kqid*)0), (struct qc_dqblk*)0); +],[ + AC_DEFINE(HAVE_DQUOT_QC_DQBLK, 1, + [quotactl_ops.set_dqblk takes struct qc_dqblk]) + AC_DEFINE(HAVE_DQUOT_KQID, 1, + [quotactl_ops.set_dqblk takes struct kqid]) +]) +EXTRA_KCFLAGS="$tmp_flags" +]) # LC_HAVE_DQUOT_QC_DQBLK + +# # LC_BACKING_DEV_INFO_REMOVAL # # 3.20 kernel removed backing_dev_info from address_space @@ -2029,6 +2244,229 @@ make_request_fn_blk_qc_t, [ ]) # LC_HAVE_QC_MAKE_REQUEST_FN # +# LC_HAVE_KEY_PAYLOAD_DATA_ARRAY +# +# 4.4 kernel merged type-specific data with the payload data for keys +# +AC_DEFUN([LC_HAVE_KEY_PAYLOAD_DATA_ARRAY], [ +LB_CHECK_COMPILE([if 'struct key' has 'payload.data' as an array], +key_payload_data_array, [ + #include +],[ + ((struct key *)0)->payload.data[0] = NULL; +],[ + AC_DEFINE(HAVE_KEY_PAYLOAD_DATA_ARRAY, 1, [payload.data is an array]) +]) +]) #LC_HAVE_KEY_PAYLOAD_DATA_ARRAY + +# +# LC_HAVE_FILE_DENTRY +# +# 4.5 adds wrapper file_dentry +# +AC_DEFUN([LC_HAVE_FILE_DENTRY], [ +LB_CHECK_COMPILE([if Linux kernel has 'file_dentry'], +file_dentry, [ + #include +],[ + file_dentry(NULL); +], [ + AC_DEFINE(HAVE_FILE_DENTRY, 1, + [kernel has file_dentry]) +]) +]) # LC_HAVE_FILE_DENTRY + +# +# LC_HAVE_INODE_LOCK +# +# 4.5 introduced inode_lock +# +AC_DEFUN([LC_HAVE_INODE_LOCK], [ +LB_CHECK_COMPILE([if 'inode_lock' is defined], +inode_lock, [ + #include +],[ + inode_lock(NULL); +], [ + AC_DEFINE(HAVE_INODE_LOCK, 1, + [inode_lock is defined]) +]) +]) # LC_HAVE_INODE_LOCK + +# +# LC_HAVE_IOP_GET_LINK +# +# 4.5 vfs replaced iop->follow_link with +# iop->get_link +# +AC_DEFUN([LC_HAVE_IOP_GET_LINK], [ +LB_CHECK_COMPILE([if 'iop' has 'get_link'], +inode_ops_get_link, [ + #include +],[ + struct inode_operations iop; + iop.get_link = NULL; +],[ + AC_DEFINE(HAVE_IOP_GET_LINK, 1, + [have iop get_link]) +]) +]) # LC_HAVE_IOP_GET_LINK + +# +# LC_HAVE_IN_COMPAT_SYSCALL +# +# 4.6 renamed is_compat_task to in_compat_syscall +# +AC_DEFUN([LC_HAVE_IN_COMPAT_SYSCALL], [ +LB_CHECK_COMPILE([if 'in_compat_syscall' is defined], +in_compat_syscall, [ + #include +],[ + in_compat_syscall(); +],[ + AC_DEFINE(HAVE_IN_COMPAT_SYSCALL, 1, + [have in_compat_syscall]) +]) +]) # LC_HAVE_IN_COMPAT_SYSCALL + +# +# LC_DIRECTIO_2ARGS +# +# Kernel version 4.7 commit c8b8e32d700fe943a935e435ae251364d016c497 +# direct-io: eliminate the offset argument to ->direct_IO +# +AC_DEFUN([LC_DIRECTIO_2ARGS], [ +LB_CHECK_COMPILE([if '->direct_IO()' taken 2 arguments], +direct_io_2args, [ + #include +],[ + struct address_space_operations ops; + struct iov_iter *iter = NULL; + struct kiocb *iocb = NULL; + int rc; + rc = ops.direct_IO(iocb, iter); +],[ + AC_DEFINE(HAVE_DIRECTIO_2ARGS, 1, + [direct_IO need 2 arguments]) +]) +]) # LC_DIRECTIO_2ARGS + +# +# LC_GENERIC_WRITE_SYNC_2ARGS +# +# Kernel version 4.7 commit c8b8e32d700fe943a935e435ae251364d016c497 +# direct-io: eliminate the offset argument to ->direct_IO +# +AC_DEFUN([LC_GENERIC_WRITE_SYNC_2ARGS], [ +LB_CHECK_COMPILE([if 'generic_write_sync()' taken 2 arguments], +generic_write_sync_2args, [ + #include +],[ + struct kiocb *iocb = NULL; + ssize_t rc; + rc = generic_write_sync(iocb, 0); +],[ + AC_DEFINE(HAVE_GENERIC_WRITE_SYNC_2ARGS, 1, + [generic_write_sync need 2 arguments]) +]) +]) # LC_GENERIC_WRITE_SYNC_2ARGS + +# +# LC_HAVE_POSIX_ACL_VALID_USER_NS +# +# 4.8 posix_acl_valid takes struct user_namespace +# +AC_DEFUN([LC_HAVE_POSIX_ACL_VALID_USER_NS], [ +LB_CHECK_COMPILE([if 'posix_acl_valid' takes 'struct user_namespace'], +posix_acl_valid, [ + #include + #include +],[ + posix_acl_valid((struct user_namespace*)NULL, (const struct posix_acl*)NULL); +],[ + AC_DEFINE(HAVE_POSIX_ACL_VALID_USER_NS, 1, + [posix_acl_valid takes struct user_namespace]) +]) +]) # LC_HAVE_POSIX_ACL_VALID_USER_NS + +# +# LC_D_COMPARE_4ARGS +# +# Kernel version 4.8 commit 6fa67e707559303e086303aeecc9e8b91ef497d5 +# get rid of 'parent' argument of ->d_compare() +# +AC_DEFUN([LC_D_COMPARE_4ARGS], [ +LB_CHECK_COMPILE([if 'd_compare' taken 4 arguments], +d_compare_4args, [ + #include +],[ + ((struct dentry_operations*)0)->d_compare(NULL,0,NULL,NULL); +],[ + AC_DEFINE(HAVE_D_COMPARE_4ARGS, 1, + [d_compare need 4 arguments]) +]) +]) # LC_D_COMPARE_4ARGS + +# +# LC_FULL_NAME_HASH_3ARGS +# +# Kernel version 4.8 commit 8387ff2577eb9ed245df9a39947f66976c6bcd02 +# vfs: make the string hashes salt the hash +# +AC_DEFUN([LC_FULL_NAME_HASH_3ARGS], [ +LB_CHECK_COMPILE([if 'full_name_hash' taken 3 arguments], +full_name_hash_3args, [ + #include +],[ + unsigned int hash; + hash = full_name_hash(NULL,NULL,0); +],[ + AC_DEFINE(HAVE_FULL_NAME_HASH_3ARGS, 1, + [full_name_hash need 3 arguments]) +]) +]) # LC_FULL_NAME_HASH_3ARGS + +# +# LC_GROUP_INFO_GID +# +# Kernel version 4.9 commit 81243eacfa400f5f7b89f4c2323d0de9982bb0fb +# cred: simpler, 1D supplementary groups +# +AC_DEFUN([LC_GROUP_INFO_GID], [ +LB_CHECK_COMPILE([if 'struct group_info' has member 'gid'], +group_info_gid, [ + #include +],[ + kgid_t *p; + p = ((struct group_info *)0)->gid; +],[ + AC_DEFINE(HAVE_GROUP_INFO_GID, 1, + [struct group_info has member gid]) +]) +]) # LC_GROUP_INFO_GID + +# +# LC_STRUCT_POSIX_ACL_XATTR +# +# Kernel version 4.8 commit 2211d5ba5c6c4e972ba6dbc912b2897425ea6621 +# posix_acl: xattr representation cleanups +# +AC_DEFUN([LC_STRUCT_POSIX_ACL_XATTR], [ +LB_CHECK_COMPILE([if 'struct posix_acl_xattr_{header,entry}' defined], +struct_posix_acl_xattr, [ + #include + #include +],[ + struct posix_acl_xattr_header *h = NULL; + struct posix_acl_xattr_entry *e; + e = (void *)(h + 1); +],[ + AC_DEFINE(HAVE_STRUCT_POSIX_ACL_XATTR, 1, + [struct posix_acl_xattr_{header,entry} defined]) +]) +]) # LC_STRUCT_POSIX_ACL_XATTR + +# # LC_PROG_LINUX # # Lustre linux kernel checks @@ -2041,11 +2479,10 @@ AC_DEFUN([LC_PROG_LINUX], [ LC_CONFIG_CHECKSUM LC_CONFIG_HEALTH_CHECK_WRITE LC_CONFIG_LRU_RESIZE - LC_LLITE_LLOOP_MODULE LC_GLIBC_SUPPORT_FHANDLES - LC_CONFIG_RMTCLIENT LC_CONFIG_GSS + LC_OPENSSL_SSK # 2.6.32 LC_BLK_QUEUE_MAX_SEGMENTS @@ -2074,6 +2511,7 @@ AC_DEFUN([LC_PROG_LINUX], [ LC_INODE_I_RCU LC_D_COMPARE_7ARGS LC_D_DELETE_CONST + LC_HAVE_BLK_PLUG # 2.6.39 LC_REQUEST_QUEUE_UNPLUG_FN @@ -2085,6 +2523,7 @@ AC_DEFUN([LC_PROG_LINUX], [ # 3.0 LC_DIRTY_INODE_WITH_FLAG + LC_SETNS # 3.1 LC_LM_XXX_LOCK_MANAGER_OPS @@ -2119,22 +2558,27 @@ AC_DEFUN([LC_PROG_LINUX], [ 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 # 3.10 LC_BLKDEV_RELEASE_RETURN_INT LC_HAVE_REMOVE_PROC_SUBTREE LC_HAVE_PROC_REMOVE + LC_HAVE_PROJECT_QUOTA + LC_HAVE_SECURITY_DENTRY_INIT_SECURITY # 3.11 LC_INVALIDATE_RANGE @@ -2143,6 +2587,7 @@ AC_DEFUN([LC_PROG_LINUX], [ LC_HAVE_DCOUNT LC_HAVE_DENTRY_D_U_D_ALIAS LC_HAVE_DENTRY_D_CHILD + LC_PID_NS_FOR_CHILDREN # 3.12 LC_OLDSIZE_TRUNCATE_PAGECACHE @@ -2155,6 +2600,7 @@ AC_DEFUN([LC_PROG_LINUX], [ # 3.14 LC_HAVE_BVEC_ITER LC_HAVE_TRUNCATE_IPAGES_FINAL + LC_IOPS_RENAME_WITH_FLAGS # 3.15 LC_VFS_RENAME_6ARGS @@ -2162,6 +2608,7 @@ AC_DEFUN([LC_PROG_LINUX], [ # 3.16 LC_DIRECTIO_USE_ITER LC_HAVE_IOV_ITER_INIT_DIRECTION + LC_HAVE_IOV_ITER_TRUNCATE LC_HAVE_FILE_OPERATIONS_READ_WRITE_ITER # 3.17 @@ -2173,6 +2620,7 @@ AC_DEFUN([LC_PROG_LINUX], [ # 3.19 LC_KIOCB_HAS_NBYTES + LC_HAVE_DQUOT_QC_DQBLK # 3.20 LC_BACKING_DEV_INFO_REMOVAL @@ -2196,6 +2644,31 @@ AC_DEFUN([LC_PROG_LINUX], [ # 4.4 LC_HAVE_LOCKS_LOCK_FILE_WAIT LC_HAVE_QC_MAKE_REQUEST_FN + LC_HAVE_KEY_PAYLOAD_DATA_ARRAY + LC_HAVE_BI_CNT + + # 4.5 + LC_HAVE_FILE_DENTRY + + # 4.5 + LC_HAVE_INODE_LOCK + LC_HAVE_IOP_GET_LINK + + # 4.6 + LC_HAVE_IN_COMPAT_SYSCALL + + # 4.7 + LC_DIRECTIO_2ARGS + LC_GENERIC_WRITE_SYNC_2ARGS + + # 4.8 + LC_HAVE_POSIX_ACL_VALID_USER_NS + LC_D_COMPARE_4ARGS + LC_FULL_NAME_HASH_3ARGS + LC_STRUCT_POSIX_ACL_XATTR + + # 4.9 + LC_GROUP_INFO_GID # AS_IF([test "x$enable_server" != xno], [ @@ -2312,25 +2785,6 @@ AS_IF([test "x$enable_nodemap_proc_debug" != xno], ]) # LC_NODEMAP_PROC_DEBUG # -# LC_LLITE_LLOOP_MODULE -# -# lloop_llite.ko does not currently work with page sizes -# of 64k or larger. -# -AC_DEFUN([LC_LLITE_LLOOP_MODULE], [ -LB_CHECK_COMPILE([whether to enable 'llite_lloop' module], -enable_llite_lloop_module, [ - #include -],[ - #if PAGE_SIZE >= 65536 - #error "PAGE_SIZE >= 65536" - #endif -], - [enable_llite_lloop_module="yes"], - [enable_llite_lloop_module="no"]) -]) # LC_LLITE_LLOOP_MODULE - -# # LC_OSD_ADDON # # configure support for optional OSD implementation @@ -2471,6 +2925,23 @@ AC_MSG_RESULT([$enable_pgstat_track]) AS_IF([test "x$enable_pgstat_track" = xyes], [AC_DEFINE([CONFIG_DEBUG_PAGESTATE_TRACKING], 1, [enable page state tracking code])]) + +PKG_PROG_PKG_CONFIG +AC_MSG_CHECKING([systemd unit file directory]) +AC_ARG_WITH([systemdsystemunitdir], + [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], + [Directory for systemd service files])], + [], [with_systemdsystemunitdir=auto]) +AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], + [def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) + AS_IF([test "x$def_systemdsystemunitdir" = "x"], + [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], + [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) + with_systemdsystemunitdir=no], + [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) +AS_IF([test "x$with_systemdsystemunitdir" != "xno"], + [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) +AC_MSG_RESULT([$with_systemdsystemunitdir]) ]) # LC_CONFIGURE # @@ -2488,8 +2959,9 @@ AM_CONDITIONAL(EXT2FS_DEVEL, test x$ac_cv_header_ext2fs_ext2fs_h = xyes) AM_CONDITIONAL(GSS, test x$enable_gss = xyes) AM_CONDITIONAL(GSS_KEYRING, test x$enable_gss_keyring = xyes) AM_CONDITIONAL(GSS_PIPEFS, test x$enable_gss_pipefs = xyes) +AM_CONDITIONAL(GSS_SSK, test x$enable_ssk = xyes) AM_CONDITIONAL(LIBPTHREAD, test x$enable_libpthread = xyes) -AM_CONDITIONAL(LLITE_LLOOP, test x$enable_llite_lloop_module = xyes) +AM_CONDITIONAL(HAVE_SYSTEMD, test "x$with_systemdsystemunitdir" != "xno") ]) # LC_CONDITIONALS # @@ -2507,7 +2979,10 @@ lustre/contrib/Makefile lustre/doc/Makefile lustre/include/Makefile lustre/include/lustre/Makefile +lustre/include/uapi/linux/Makefile lustre/kernel_patches/targets/3.10-rhel7.target +lustre/kernel_patches/targets/2.6-rhel6.9.target +lustre/kernel_patches/targets/2.6-rhel6.8.target lustre/kernel_patches/targets/2.6-rhel6.7.target lustre/kernel_patches/targets/2.6-rhel6.6.target lustre/kernel_patches/targets/2.6-rhel6.target @@ -2517,6 +2992,7 @@ 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/2.6-fc11.target lustre/kernel_patches/targets/2.6-fc12.target lustre/kernel_patches/targets/2.6-fc15.target @@ -2567,6 +3043,7 @@ lustre/ptlrpc/gss/autoMakefile lustre/quota/Makefile lustre/quota/autoMakefile lustre/scripts/Makefile +lustre/scripts/systemd/Makefile lustre/tests/Makefile lustre/tests/mpi/Makefile lustre/utils/Makefile