Whamcloud - gitweb
LU-11838 kernel: harden current_time autoconf test
[fs/lustre-release.git] / lustre / autoconf / lustre-core.m4
index 3772621..227fd38 100644 (file)
@@ -47,23 +47,6 @@ esac
 ]) # LC_TARGET_SUPPORTED
 
 #
-# LC_CONFIG_OBD_BUFFER_SIZE
-#
-# the maximum buffer size of lctl ioctls
-#
-AC_DEFUN([LC_CONFIG_OBD_BUFFER_SIZE], [
-AC_MSG_CHECKING([for maximum OBD ioctl size])
-AC_ARG_WITH([obd-buffer-size],
-       AC_HELP_STRING([--with-obd-buffer-size=[size]],
-               [set lctl ioctl maximum bytes (default=8192)]),
-       [OBD_BUFFER_SIZE=$with_obd_buffer_size],
-       [OBD_BUFFER_SIZE=8192])
-AC_MSG_RESULT([$OBD_BUFFER_SIZE bytes])
-AC_DEFINE_UNQUOTED(CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER, $OBD_BUFFER_SIZE,
-       [IOCTL Buffer Size])
-]) # LC_CONFIG_OBD_BUFFER_SIZE
-
-#
 # LC_GLIBC_SUPPORT_FHANDLES
 #
 AC_DEFUN([LC_GLIBC_SUPPORT_FHANDLES], [
@@ -74,19 +57,6 @@ AC_CHECK_FUNCS([name_to_handle_at],
 ]) # LC_GLIBC_SUPPORT_FHANDLES
 
 #
-# LC_FUNC_DEV_SET_RDONLY
-#
-# check whether dev_set_rdonly is exported.  This is needed until we
-# have another mechanism to fence IO from the underlying device.
-#
-AC_DEFUN([LC_FUNC_DEV_SET_RDONLY], [
-LB_CHECK_EXPORT([dev_set_rdonly], [block/ll_rw_block.c block/blk-core.c],
-       [AC_DEFINE(HAVE_DEV_SET_RDONLY, 1,
-               [kernel exports dev_set_rdonly])],
-       [AC_MSG_WARN([kernel missing dev_set_rdonly patch for testing])])
-]) # LC_FUNC_DEV_SET_RDONLY
-
-#
 # LC_STACK_SIZE
 #
 # Ensure the stack size is at least 8k in Lustre server (all kernels)
@@ -335,33 +305,40 @@ AS_IF([test "x$enable_gss" != xno], [
                gss_conf_test="failure"
        ])
 
-       AS_IF([test "x$gss_conf_test" = xsuccess], [
+       AS_IF([test "x$gss_conf_test" = xsuccess && test "x$enable_gss" != xno], [
                AC_DEFINE([HAVE_GSS], [1], [Define this is if you enable gss])
                enable_gss="yes"
        ], [
+               enable_gss_keyring="no"
                enable_gss="no"
        ])
+
+       enable_ssk=$enable_gss
+], [
+       enable_gss_keyring="no"
 ])
 ]) # LC_CONFIG_GSS
 
-# LC_HAVE_VOID_OPENSSL_HMAC_FUNCS
+# LC_OPENSSL_SSK
 #
-# OpenSSL 1.0+ return int for HMAC functions but previous versions do not
-AC_DEFUN([LC_HAVE_VOID_OPENSSL_HMAC_FUNCS], [
+# 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 <openssl/hmac.h>
        #include <openssl/evp.h>
 
        int main(void) {
                int rc;
-               HMAC_CTX ctx;
-               HMAC_CTX_init(&ctx);
-               rc = HMAC_Init_ex(&ctx, "test", 4, EVP_md_null(), NULL);
+               rc = HMAC_Init_ex(NULL, "test", 4, EVP_md_null(), NULL);
        }
-])],[],[AC_DEFINE(HAVE_VOID_OPENSSL_HMAC_FUNCS, 1,
-               [OpenSSL HMAC functions return void instead of int])
+])],[AC_DEFINE(HAVE_OPENSSL_SSK, 1,
+              [OpenSSL HMAC functions needed for SSK])],
+       [enable_ssk="no"])
 ])
-]) # LC_HAVE_VOID_OPENSSL_HMAC_FUNCS
+AC_MSG_RESULT([$enable_ssk])
+]) # LC_OPENSSL_SSK
 
 # LC_INODE_PERMISION_2ARGS
 #
@@ -403,6 +380,24 @@ blk_queue_max_segments, [
 ]) # LC_BLK_QUEUE_MAX_SEGMENTS
 
 #
+# LC_HAVE_XATTR_HANDLER_FLAGS
+#
+# 2.6.33 added a private flag to xattr_handler
+#
+AC_DEFUN([LC_HAVE_XATTR_HANDLER_FLAGS], [
+LB_CHECK_COMPILE([if 'struct xattr_handler' has flags field],
+xattr_handler_flags, [
+       #include <linux/xattr.h>
+],[
+       struct xattr_handler handler;
+
+       handler.flags = 0;
+],[
+       AC_DEFINE(HAVE_XATTR_HANDLER_FLAGS, 1, [flags field exist])
+])
+]) # LC_HAVE_XATTR_HANDLER_FLAGS
+
+#
 # LC_HAVE_DQUOT_FS_DISK_QUOTA
 #
 # 2.6.34 has quotactl_ops->[sg]et_dqblk that take struct fs_disk_quota
@@ -493,8 +488,9 @@ LB_CHECK_COMPILE([if '__add_wait_queue_exclusive' exists],
 __add_wait_queue_exclusive, [
        #include <linux/wait.h>
 ],[
-       wait_queue_head_t queue;
-       wait_queue_t      wait;
+       wait_queue_head_t queue = { };
+       wait_queue_t wait = { };
+
        __add_wait_queue_exclusive(&queue, &wait);
 ],[
        AC_DEFINE(HAVE___ADD_WAIT_QUEUE_EXCLUSIVE, 1,
@@ -514,7 +510,10 @@ fs_struct_rwlock, [
        #include <linux/spinlock.h>
        #include <linux/fs_struct.h>
 ],[
-       ((struct fs_struct *)0)->lock = (rwlock_t){ 0 };
+       struct fs_struct fss = { };
+       rwlock_t rwl = { };
+
+       fss.lock = rwl;
 ],[
        AC_DEFINE(HAVE_FS_STRUCT_RWLOCK, 1, [fs_struct.lock use rwlock])
 ])
@@ -583,6 +582,22 @@ kernel_locked, [
 ]) # LC_KERNEL_LOCKED
 
 #
+# LC_FS_STRUCT_SEQCOUNT
+#
+# 2.6.37 uses seqlock in fs_struct
+#
+AC_DEFUN([LC_FS_STRUCT_SEQCOUNT], [
+LB_CHECK_COMPILE([if fs_struct use seqcount],
+fs_struct_seqcount, [
+       #include <linux/fs_struct.h>
+],[
+       ((struct fs_struct *)0)->seq = (struct seqcount){ 0 };
+],[
+       AC_DEFINE(HAVE_FS_STRUCT_SEQCOUNT, 1, [fs_struct use seqcount])
+])
+]) # LC_FS_STRUCT_SEQCOUNT
+
+#
 # LC_D_COMPARE_7ARGS
 #
 # 2.6.38 dentry_operations.d_compare() taken 7 arguments.
@@ -681,6 +696,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 <linux/blkdev.h>
+],[
+       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
@@ -698,23 +733,6 @@ inode_ops_truncate, [
 ]) # LC_IOP_TRUNCATE
 
 #
-# LC_REQUEST_QUEUE_UNPLUG_FN
-#
-# 2.6.39 remove unplug_fn from request_queue.
-#
-AC_DEFUN([LC_REQUEST_QUEUE_UNPLUG_FN], [
-LB_CHECK_COMPILE([if 'request_queue' has 'unplug_fn' field],
-request_queue_unplug_fn, [
-       #include <linux/blkdev.h>
-],[
-       do {} while(sizeof(((struct request_queue *)0)->unplug_fn));
-],[
-       AC_DEFINE(HAVE_REQUEST_QUEUE_UNPLUG_FN, 1,
-               [request_queue has unplug_fn field])
-])
-]) # LC_REQUEST_QUEUE_UNPLUG_FN
-
-#
 # LC_HAVE_FSTYPE_MOUNT
 #
 # 2.6.39 replace get_sb with mount in struct file_system_type
@@ -724,8 +742,10 @@ LB_CHECK_COMPILE([if 'file_system_type' has 'mount' field],
 file_system_type_mount, [
        #include <linux/fs.h>
 ],[
-       struct file_system_type fst;
-       void *i = (void *) fst.mount;
+       struct file_system_type fst = { };
+       void *mount;
+
+       mount = (void *)fst.mount;
 ],[
        AC_DEFINE(HAVE_FSTYPE_MOUNT, 1,
                [struct file_system_type has mount field])
@@ -774,7 +794,7 @@ LB_CHECK_COMPILE([if 'dirty_inode' super_operation takes flag],
 dirty_inode_super_operation_flag, [
        #include <linux/fs.h>
 ],[
-       struct inode *inode;
+       struct inode *inode = NULL;
        inode->i_sb->s_op->dirty_inode(NULL, 0);
 ],[
        AC_DEFINE(HAVE_DIRTY_INODE_HAS_FLAG, 1,
@@ -783,6 +803,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.
@@ -898,26 +930,6 @@ radix_tree_exceptional_entry, [
 ]) # LC_RADIX_EXCEPTION_ENTRY
 
 #
-# LC_HAVE_VOID_MAKE_REQUEST_FN
-#
-# 3.2 request_queue.make_request_fn defined as function returns with void
-# see kernel commit 5a7bbad27a410350e64a2d7f5ec18fc73836c14f
-#
-AC_DEFUN([LC_HAVE_VOID_MAKE_REQUEST_FN], [
-LB_CHECK_COMPILE([if 'request_queue.make_request_fn' returns void but not int],
-make_request_fn_void, [
-       #include <linux/blkdev.h>
-],[
-       int ret;
-       make_request_fn *mrf;
-       ret = mrf(NULL, NULL);
-],[],[
-       AC_DEFINE(HAVE_VOID_MAKE_REQUEST_FN, 1,
-               [request_queue.make_request_fn returns void but not int])
-])
-]) # LC_HAVE_VOID_MAKE_REQUEST_FN
-
-#
 # LC_HAVE_PROTECT_I_NLINK
 #
 # 3.2 protects inode->i_nlink from direct modification
@@ -994,7 +1006,7 @@ address_space_ops_migratepage_4args, [
        #include <linux/migrate_mode.h>
 #endif
 ],[
-       struct address_space_operations aops;
+       struct address_space_operations aops = { };
        aops.migratepage(NULL, NULL, NULL, MIGRATE_ASYNC);
 ],[
        AC_DEFINE(HAVE_MIGRATEPAGE_4ARGS, 1,
@@ -1367,9 +1379,10 @@ LB_CHECK_COMPILE([if 'bio_end_sector' is defined],
 bio_end_sector, [
        #include <linux/bio.h>
 ],[
-       struct bio bio;
+       struct bio bio = { };
+       unsigned long long end;
 
-       bio_end_sector(&bio);
+       end = bio_end_sector(&bio);
 ],[
        AC_DEFINE(HAVE_BIO_END_SECTOR, 1,
                  [bio_end_sector is defined])
@@ -1384,7 +1397,7 @@ LB_CHECK_COMPILE([if 'is_sxid' is defined],
 is_sxid, [
        #include <linux/fs.h>
 ],[
-       struct inode inode;
+       struct inode inode = { };
 
        is_sxid(inode.i_mode);
 ],[
@@ -1426,25 +1439,21 @@ proc_remove, [
 ])
 ]) # LC_HAVE_PROC_REMOVE
 
-#
-# LC_BLKDEV_RELEASE_RETURN_INT
-#
-# 3.10 release for block device doesn't return int
-#
-AC_DEFUN([LC_BLKDEV_RELEASE_RETURN_INT], [
-LB_CHECK_COMPILE([if 'block_device_operations' release returns 'int'],
-block_device_ops_release_return_int, [
-       #include <linux/blkdev.h>
+AC_DEFUN([LC_HAVE_PROJECT_QUOTA], [
+LB_CHECK_COMPILE([if get_projid exists],
+get_projid, [
+       struct inode;
+       #include <linux/quota.h>
 ],[
-       struct block_device_operations fops;
-       int i __attribute__ ((unused));
+       struct dquot_operations ops = { };
 
-       i = fops.release(NULL, 0);
+       ops.get_projid(NULL, NULL);
 ],[
-       AC_DEFINE(HAVE_BLKDEV_RELEASE_RETURN_INT, 1,
-               [block device release returns int])
+       AC_DEFINE(HAVE_PROJECT_QUOTA, 1,
+               [get_projid function exists])
 ])
-]) # LC_BLKDEV_RELEASE_RETURN_INT
+]) # LC_HAVE_PROJECT_QUOTA
+
 
 #
 # LC_HAVE_SECURITY_DENTRY_INIT_SECURITY
@@ -1491,8 +1500,13 @@ LB_CHECK_COMPILE([if 'dir_context' exist],
 dir_context, [
        #include <linux/fs.h>
 ],[
+#ifdef FMODE_KABI_ITERATE
+#error "back to use readdir in kabi_extand mode"
+#else
        struct dir_context ctx;
+
        ctx.pos = 0;
+#endif
 ],[
        AC_DEFINE(HAVE_DIR_CONTEXT, 1,
                [dir_context exist])
@@ -1522,12 +1536,14 @@ d_compare_5args, [
 # 3.11 need to access d_count to get dentry reference count
 #
 AC_DEFUN([LC_HAVE_DCOUNT], [
-LB_CHECK_COMPILE([if 'd_count' exist],
+LB_CHECK_COMPILE([if 'd_count' exists],
 d_count, [
        #include <linux/dcache.h>
 ],[
-       struct dentry de;
-       d_count(&de);
+       struct dentry de = { };
+       int count;
+
+       count = d_count(&de);
 ],[
        AC_DEFINE(HAVE_D_COUNT, 1,
                [d_count exist])
@@ -1535,6 +1551,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 <linux/nsproxy.h>
+],[
+       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
@@ -1552,6 +1586,24 @@ truncate_pagecache_old_size, [
 ]) # LC_OLDSIZE_TRUNCATE_PAGECACHE
 
 #
+# LC_PTR_ERR_OR_ZERO
+#
+# For some reason SLES11SP4 is missing the PTR_ERR_OR_ZERO macro
+# It was added to linux kernel 3.12
+#
+AC_DEFUN([LC_PTR_ERR_OR_ZERO_MISSING], [
+LB_CHECK_COMPILE([if 'PTR_ERR_OR_ZERO' is missing],
+is_err_or_null, [
+       #include <linux/err.h>
+],[
+       if (PTR_ERR_OR_ZERO(NULL)) return 0;
+],[
+       AC_DEFINE(HAVE_PTR_ERR_OR_ZERO, 1,
+               ['PTR_ERR_OR_ZERO' exist])
+])
+]) # LC_PTR_ERR_OR_ZERO_MISSING
+
+#
 # LC_HAVE_DENTRY_D_U_D_ALIAS
 #
 # 3.11 kernel moved d_alias to the union d_u in struct dentry
@@ -1624,6 +1676,27 @@ kiocb_ki_left, [
 ]) # LC_KIOCB_KI_LEFT
 
 #
+# LC_INIT_LIST_HEAD_RCU
+#
+# 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.
+#
+AC_DEFUN([LC_INIT_LIST_HEAD_RCU], [
+LB_CHECK_COMPILE([if 'INIT_LIST_HEAD_RCU' exists],
+init_list_head_rcu, [
+       #include <linux/list.h>
+       #include <linux/rculist.h>
+],[
+       struct list_head list;
+       INIT_LIST_HEAD_RCU(&list);
+],[
+       AC_DEFINE(HAVE_INIT_LIST_HEAD_RCU, 1,
+                 [INIT_LIST_HEAD_RCU exists])
+])
+]) # LC_INIT_LIST_HEAD_RCU
+
+#
 # LC_VFS_RENAME_5ARGS
 #
 # 3.13 has vfs_rename with 5 args
@@ -1669,6 +1742,7 @@ have_bvec_iter, [
        #include <linux/bio.h>
 ],[
        struct bvec_iter iter;
+
        iter.bi_bvec_done = 0;
 ], [
        AC_DEFINE(HAVE_BVEC_ITER, 1,
@@ -1677,6 +1751,100 @@ have_bvec_iter, [
 ]) # LC_HAVE_BVEC_ITER
 
 #
+# LC_IOP_SET_ACL
+#
+# 3.14 adds set_acl method to inode_operations
+# see kernel commit 893d46e443346370cd4ea81d9d35f72952c62a37
+#
+AC_DEFUN([LC_IOP_SET_ACL], [
+LB_CHECK_COMPILE([if 'inode_operations' has '.set_acl' member function],
+inode_ops_set_acl, [
+       #include <linux/fs.h>
+],[
+       struct inode_operations iop;
+       iop.set_acl = NULL;
+],[
+       AC_DEFINE(HAVE_IOP_SET_ACL, 1,
+               [inode_operations has .set_acl member function])
+])
+]) # LC_IOP_SET_ACL
+
+#
+# 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 <asm/atomic.h>
+       #include <linux/bio.h>
+],[
+       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_BI_RW
+#
+# 4.4 redefined bi_rw as bi_opf
+#
+AC_DEFUN([LC_HAVE_BI_RW], [
+LB_CHECK_COMPILE([if Linux kernel has bi_rw in struct bio],
+have_bi_rw, [
+       #include <linux/bio.h>
+],[
+       struct bio bio;
+
+       bio.bi_rw = 0;
+], [
+       AC_DEFINE(HAVE_BI_RW, 1,
+               [struct bio has bi_rw])
+])
+]) # LC_HAVE_BI_RW
+
+#
+# LC_HAVE_SUBMIT_BIO_2ARGS
+#
+# 4.4 removed an argument from submit_bio
+#
+AC_DEFUN([LC_HAVE_SUBMIT_BIO_2ARGS], [
+LB_CHECK_COMPILE([if submit_bio takes two arguments],
+have_submit_bio_2args, [
+       #include <linux/bio.h>
+],[
+       struct bio bio;
+       submit_bio(READ, &bio);
+], [
+       AC_DEFINE(HAVE_SUBMIT_BIO_2ARGS, 1,
+               [submit_bio takes two arguments])
+])
+]) # LC_HAVE_SUBMIT_BIO_2_ARGS
+
+#
+# LC_HAVE_CLEAN_BDEV_ALIASES
+#
+# 4.4 unmap_underlying_metadata was replaced by clean_bdev_aliases
+#
+AC_DEFUN([LC_HAVE_CLEAN_BDEV_ALIASES], [
+LB_CHECK_COMPILE([if kernel has clean_bdev_aliases],
+have_clean_bdev_aliases, [
+       #include <linux/buffer_head.h>
+],[
+       struct block_device bdev;
+       clean_bdev_aliases(&bdev,1,1);
+], [
+       AC_DEFINE(HAVE_CLEAN_BDEV_ALIASES, 1,
+               [kernel has clean_bdev_aliases])
+])
+]) # LC_HAVE_CLEAN_BDEV_ALIASES
+
+#
 # LC_HAVE_TRUNCATE_IPAGE_FINAL
 #
 # 3.14 bring truncate_inode_pages_final for evict_inode
@@ -1694,6 +1862,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 <linux/fs.h>
+],[
+       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
@@ -1720,7 +1909,7 @@ LB_CHECK_COMPILE([if direct IO uses iov_iter],
 direct_io_iter, [
        #include <linux/fs.h>
 ],[
-       struct address_space_operations ops;
+       struct address_space_operations ops = { };
        struct iov_iter *iter = NULL;
        loff_t offset = 0;
 
@@ -1799,6 +1988,23 @@ file_function_iter, [
 ]) # LC_HAVE_FILE_OPERATIONS_READ_WRITE_ITER
 
 #
+# LC_HAVE_INTERVAL_BLK_INTEGRITY
+#
+# 3.17 replace sector_size with interval in struct blk_integrity
+#
+AC_DEFUN([LC_HAVE_INTERVAL_BLK_INTEGRITY], [
+LB_CHECK_COMPILE([if 'blk_integrity.interval' exist],
+interval_blk_integrity, [
+       #include <linux/blkdev.h>
+],[
+       ((struct blk_integrity *)0)->interval = 0;
+],[
+       AC_DEFINE(HAVE_INTERVAL_BLK_INTEGRITY, 1,
+               [blk_integrity.interval exist])
+])
+]) # LC_HAVE_INTERVAL_BLK_INTEGRITY
+
+#
 # LC_KEY_MATCH_DATA
 #
 # 3.17 replaces key_type::match with match_preparse
@@ -1810,6 +2016,8 @@ key_match, [
        #include <linux/key-type.h>
 ],[
        struct key_match_data data;
+
+       data.raw_data = NULL;
 ],[
        AC_DEFINE(HAVE_KEY_MATCH_DATA, 1,
                [struct key_match_data exist])
@@ -1875,7 +2083,7 @@ LB_CHECK_COMPILE([if struct kiocb has ki_nbytes field],
 ki_nbytes, [
        #include <linux/fs.h>
 ],[
-       struct kiocb iocb;
+       struct kiocb iocb = { };
 
        iocb.ki_nbytes = 0;
 ],[
@@ -2051,6 +2259,25 @@ bio_endio, [
 ]) # LC_BIO_ENDIO_USES_ONE_ARG
 
 #
+# LC_HAVE_INTERVAL_EXP_BLK_INTEGRITY
+#
+# 4.3 replace interval with interval_exp in 'struct blk_integrity'
+# 'struct blk_integrity_profile' is also added in this version,
+# thus use this to determine whether 'struct blk_integrity' has profile
+#
+AC_DEFUN([LC_HAVE_INTERVAL_EXP_BLK_INTEGRITY], [
+LB_CHECK_COMPILE([if 'blk_integrity.interval_exp' exist],
+blk_integrity_interval_exp, [
+       #include <linux/blkdev.h>
+],[
+       ((struct blk_integrity *)0)->interval_exp = 0;
+],[
+       AC_DEFINE(HAVE_INTERVAL_EXP_BLK_INTEGRITY, 1,
+               [blk_integrity.interval_exp exist])
+])
+]) # LC_HAVE_INTERVAL_EXP_BLK_INTEGRITY
+
+#
 # LC_HAVE_LOOP_CTL_GET_FREE
 #
 # 4.x kernel have moved userspace APIs to
@@ -2094,6 +2321,67 @@ cache_head_has_hlist, [
 ]) # LC_HAVE_CACHE_HEAD_HLIST
 
 #
+# LC_HAVE_XATTR_HANDLER_SIMPLIFIED
+#
+# Kernel version 4.3 commit e409de992e3ea3674393465f07cc71c948edd87a
+# simplified xattr_handler handling by passing in the handler pointer
+#
+AC_DEFUN([LC_HAVE_XATTR_HANDLER_SIMPLIFIED], [
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_CHECK_COMPILE([if 'struct xattr_handler' functions pass in handler pointer],
+xattr_handler_simplified, [
+       #include <linux/xattr.h>
+],[
+       struct xattr_handler handler;
+
+       ((struct xattr_handler *)0)->get(&handler, NULL, NULL, NULL, 0);
+       ((struct xattr_handler *)0)->set(&handler, NULL, NULL, NULL, 0, 0);
+],[
+       AC_DEFINE(HAVE_XATTR_HANDLER_SIMPLIFIED, 1, [handler pointer is parameter])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+]) # LC_HAVE_XATTR_HANDLER_SIMPLIFIED
+
+#
+# LC_HAVE_BIP_ITER_BIO_INTEGRITY_PAYLOAD
+#
+# 4.3 replace interval with interval_exp in 'struct blk_integrity'.
+#
+AC_DEFUN([LC_HAVE_BIP_ITER_BIO_INTEGRITY_PAYLOAD], [
+LB_CHECK_COMPILE([if 'bio_integrity_payload.bip_iter' exist],
+bio_integrity_payload_bip_iter, [
+       #include <linux/bio.h>
+],[
+       ((struct bio_integrity_payload *)0)->bip_iter.bi_size = 0;
+],[
+       AC_DEFINE(HAVE_BIP_ITER_BIO_INTEGRITY_PAYLOAD, 1,
+               [bio_integrity_payload.bip_iter exist])
+])
+]) # LC_HAVE_BIP_ITER_BIO_INTEGRITY_PAYLOAD
+
+#
+# LC_BIO_INTEGRITY_PREP_FN
+#
+# Lustre kernel patch extents bio_integrity_prep to accept optional
+# generate/verify_fn as extra args.
+#
+AC_DEFUN([LC_BIO_INTEGRITY_PREP_FN], [
+LB_CHECK_COMPILE([if 'bio_integrity_prep_fn' exists],
+bio_integrity_prep_fn, [
+       #include <linux/bio.h>
+],[
+       bio_integrity_prep_fn(NULL, NULL, NULL);
+],[
+       AC_DEFINE(HAVE_BIO_INTEGRITY_PREP_FN, 1,
+               [kernel has bio_integrity_prep_fn])
+       AC_SUBST(PATCHED_INTEGRITY_INTF)
+],[
+       AC_SUBST(PATCHED_INTEGRITY_INTF, [#])
+])
+]) # LC_BIO_INTEGRITY_PREP_FN
+
+#
 # LC_HAVE_LOCKS_LOCK_FILE_WAIT
 #
 # 4.4 kernel have moved locks API users to
@@ -2112,26 +2400,6 @@ locks_lock_file_wait, [
 ]) # LC_HAVE_LOCKS_LOCK_FILE_WAIT
 
 #
-# LC_HAVE_QC_MAKE_REQUEST_FN
-#
-# 4.4 request_queue.make_request_fn defined as function returns with blk_qc_t
-# see kernel commit dece16353ef47d8d33f5302bc158072a9d65e26f
-#
-AC_DEFUN([LC_HAVE_QC_MAKE_REQUEST_FN], [
-LB_CHECK_COMPILE([if 'request_queue.make_request_fn' returns blk_qc_t],
-make_request_fn_blk_qc_t, [
-       #include <linux/blkdev.h>
-],[
-       blk_qc_t ret;
-       make_request_fn *mrf;
-       ret = mrf(NULL, NULL);
-],[
-       AC_DEFINE(HAVE_QC_MAKE_REQUEST_FN, 1,
-               [request_queue.make_request_fn returns 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
@@ -2141,13 +2409,35 @@ LB_CHECK_COMPILE([if 'struct key' has 'payload.data' as an array],
 key_payload_data_array, [
        #include <linux/key.h>
 ],[
-       ((struct key *)0)->payload.data[0] = NULL;
+       struct key key = { };
+
+       key.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_XATTR_HANDLER_NAME
+#
+# Kernel version 4.4 commit 98e9cb5711c68223f0e4d5201b9a6add255ec550
+# add a name member to struct xattr_handler
+#
+AC_DEFUN([LC_HAVE_XATTR_HANDLER_NAME], [
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_CHECK_COMPILE([if 'struct xattr_handler' has a name member],
+xattr_handler_name, [
+       #include <linux/xattr.h>
+],[
+       ((struct xattr_handler *)NULL)->name = NULL;
+],[
+       AC_DEFINE(HAVE_XATTR_HANDLER_NAME, 1, [xattr_handler has a name member])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+]) # LC_HAVE_XATTR_HANDLER_NAME
+
+#
 # LC_HAVE_FILE_DENTRY
 #
 # 4.5 adds wrapper file_dentry
@@ -2218,6 +2508,493 @@ in_compat_syscall, [
 ]) # LC_HAVE_IN_COMPAT_SYSCALL
 
 #
+# LC_HAVE_XATTR_HANDLER_INODE_PARAM
+#
+# Kernel version 4.6 commit b296821a7c42fa58baa17513b2b7b30ae66f3336
+# and commit 5930122683dff58f0846b0f0405b4bd598a3ba6a added inode parameter
+# to xattr_handler functions
+#
+AC_DEFUN([LC_HAVE_XATTR_HANDLER_INODE_PARAM], [
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_CHECK_COMPILE([if 'struct xattr_handler' functions have inode parameter],
+xattr_handler_inode_param, [
+       #include <linux/xattr.h>
+],[
+       const struct xattr_handler handler;
+
+       ((struct xattr_handler *)0)->get(&handler, NULL, NULL, NULL, NULL, 0);
+       ((struct xattr_handler *)0)->set(&handler, NULL, NULL, NULL, NULL, 0, 0);
+],[
+       AC_DEFINE(HAVE_XATTR_HANDLER_INODE_PARAM, 1, [needs inode parameter])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+]) # LC_HAVE_XATTR_HANDLER_INODE_PARAM
+
+#
+# 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 <linux/fs.h>
+],[
+       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 <linux/fs.h>
+],[
+       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_FOP_ITERATE_SHARED
+#
+# Kernel version 4.7 adds iterate_shared method to file_operations
+#
+AC_DEFUN([LC_FOP_ITERATE_SHARED], [
+LB_CHECK_COMPILE([if 'file_operations' has 'iterate_shared'],
+fop_iterate_shared, [
+       #include <linux/fs.h>
+],[
+       struct file_operations fop;
+       fop.iterate_shared = NULL;
+],[
+       AC_DEFINE(HAVE_FOP_ITERATE_SHARED, 1,
+               [file_operations has iterate_shared])
+])
+]) # LC_FOP_ITERATE_SHARED
+
+#
+# LC_FOPS_ITERATE_SHARED
+#
+# 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.
+#
+AC_DEFUN([LC_FOPS_ITERATE_SHARED], [
+LB_CHECK_COMPILE([if ext4_dir_operations uses iterate_shared],
+iterate_shared, [
+       #include <linux/fs.h>
+],[
+       ((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
+
+#
+# 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 <linux/fs.h>
+       #include <linux/posix_acl.h>
+],[
+       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 <linux/dcache.h>
+],[
+       ((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 <linux/stringhash.h>
+],[
+       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_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 <linux/fs.h>
+       #include <linux/posix_acl_xattr.h>
+],[
+       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_IOP_XATTR
+#
+# Kernel version 4.8 commit fd50ecaddf8372a1d96e0daeaac0f93cf04e4d42
+# removed {get,set,remove}xattr inode operations
+#
+AC_DEFUN([LC_IOP_XATTR], [
+LB_CHECK_COMPILE([if 'inode_operations' has {get,set,remove}xattr members],
+inode_ops_xattr, [
+       #include <linux/fs.h>
+],[
+       struct inode_operations iop;
+       iop.setxattr = NULL;
+       iop.getxattr = NULL;
+       iop.removexattr = NULL;
+],[
+       AC_DEFINE(HAVE_IOP_XATTR, 1,
+               [inode_operations has {get,set,remove}xattr members])
+])
+]) # LC_IOP_XATTR
+
+#
+# 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 <linux/cred.h>
+],[
+       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_VFS_SETXATTR
+#
+# Kernel version 4.9 commit 5d6c31910bc0713e37628dc0ce677dcb13c8ccf4
+# added __vfs_{get,set,remove}xattr helpers
+#
+AC_DEFUN([LC_VFS_SETXATTR], [
+LB_CHECK_COMPILE([if '__vfs_setxattr' helper is available],
+vfs_setxattr, [
+       #include <linux/xattr.h>
+],[
+       __vfs_setxattr(NULL, NULL, NULL, NULL, 0, 0);
+],[
+       AC_DEFINE(HAVE_VFS_SETXATTR, 1,
+               ['__vfs_setxattr is available])
+])
+]) # LC_VFS_SETXATTR
+
+#
+# LC_POSIX_ACL_UPDATE_MODE
+#
+# Kernel version 4.9 commit 073931017b49d9458aa351605b43a7e34598caef
+# posix_acl: Clear SGID bit when setting file permissions
+#
+AC_DEFUN([LC_POSIX_ACL_UPDATE_MODE], [
+LB_CHECK_COMPILE([if 'posix_acl_update_mode' exists],
+posix_acl_update_mode, [
+       #include <linux/fs.h>
+       #include <linux/posix_acl.h>
+],[
+       posix_acl_update_mode(NULL, NULL, NULL);
+],[
+       AC_DEFINE(HAVE_POSIX_ACL_UPDATE_MODE, 1,
+               ['posix_acl_update_mode' is available])
+])
+]) # LC_POSIX_ACL_UPDATE_MODE
+
+#
+# LC_IOP_GENERIC_READLINK
+#
+# Kernel version 4.10 commit dfeef68862edd7d4bafe68ef7aeb5f658ef24bb5
+# removed generic_readlink from individual file systems
+#
+AC_DEFUN([LC_IOP_GENERIC_READLINK], [
+LB_CHECK_COMPILE([if 'generic_readlink' still exist],
+inode_ops_readlink, [
+       #include <linux/fs.h>
+],[
+       struct inode_operations iop;
+       iop.readlink = generic_readlink;
+],[
+       AC_DEFINE(HAVE_IOP_GENERIC_READLINK, 1,
+               [generic_readlink has been removed])
+])
+]) # LC_IOP_GENERIC_READLINK
+
+#
+# LC_HAVE_VM_FAULT_ADDRESS
+#
+# Kernel version 4.10 commit 1a29d85eb0f19b7d8271923d8917d7b4f5540b3e
+# removed virtual_address field. Need to use address field instead
+#
+AC_DEFUN([LC_HAVE_VM_FAULT_ADDRESS], [
+LB_CHECK_COMPILE([if 'struct vm_fault' replaced virtual_address with address field],
+vm_fault_address, [
+       #include <linux/mm.h>
+],[
+       struct vm_fault vmf;
+       vmf.address = NULL;
+],[
+       AC_DEFINE(HAVE_VM_FAULT_ADDRESS, 1,
+               [virtual_address has been replaced by address field])
+])
+]) # LC_HAVE_VM_FAULT_ADDRESS
+
+#
+# LC_INODEOPS_ENHANCED_GETATTR
+#
+# Kernel version 4.11 commit a528d35e8bfcc521d7cb70aaf03e1bd296c8493f
+# expanded getattr to be able to get more stat information.
+#
+AC_DEFUN([LC_INODEOPS_ENHANCED_GETATTR], [
+LB_CHECK_COMPILE([if 'inode_operations' getattr member can gather advance stats],
+getattr_path, [
+       #include <linux/fs.h>
+],[
+       struct path path;
+
+       ((struct inode_operations *)1)->getattr(&path, NULL, 0, 0);
+],[
+       AC_DEFINE(HAVE_INODEOPS_ENHANCED_GETATTR, 1,
+               [inode_operations .getattr member function can gather advance stats])
+])
+]) # LC_INODEOPS_ENHANCED_GETATTR
+
+#
+# LC_VM_OPERATIONS_REMOVE_VMF_ARG
+#
+# Kernel version 4.11 commit 11bac80004499ea59f361ef2a5516c84b6eab675
+# removed struct vm_area_struct as an argument for vm_operations since
+# in the same kernel version struct vma_area_struct was folded into
+# struct vm_fault.
+#
+AC_DEFUN([LC_VM_OPERATIONS_REMOVE_VMF_ARG], [
+LB_CHECK_COMPILE([if 'struct vm_operations' removed struct vm_area_struct],
+vm_operations_no_vm_area_struct, [
+       #include <linux/mm.h>
+],[
+       struct vm_fault vmf;
+
+       ((struct vm_operations_struct *)0)->fault(&vmf);
+       ((struct vm_operations_struct *)0)->page_mkwrite(&vmf);
+],[
+       AC_DEFINE(HAVE_VM_OPS_USE_VM_FAULT_ONLY, 1,
+               ['struct vm_operations' remove struct vm_area_struct argument])
+])
+]) # LC_VM_OPERATIONS_REMOVE_VMF_ARG
+
+#
+# LC_HAVE_KEY_USAGE_REFCOUNT
+#
+# Kernel version 4.11 commit fff292914d3a2f1efd05ca71c2ba72a3c663201e
+# converted key.usage from atomic_t to refcount_t.
+#
+AC_DEFUN([LC_HAVE_KEY_USAGE_REFCOUNT], [
+LB_CHECK_COMPILE([if 'key.usage' is refcount_t],
+key_usage_refcount, [
+       #include <linux/key.h>
+],[
+       struct key key = { };
+
+       refcount_read(&key.usage);
+],[
+       AC_DEFINE(HAVE_KEY_USAGE_REFCOUNT, 1, [key.usage is of type refcount_t])
+])
+]) #LC_HAVE_KEY_USAGE_REFCOUNT
+
+#
+# LC_HAVE_CRYPTO_MAX_ALG_NAME_128
+#
+# Kernel version 4.11 commit f437a3f477cce402dbec6537b29e9e33962c9f73
+# switched CRYPTO_MAX_ALG_NAME from 64 to 128.
+#
+AC_DEFUN([LC_HAVE_CRYPTO_MAX_ALG_NAME_128], [
+LB_CHECK_COMPILE([if 'CRYPTO_MAX_ALG_NAME' is 128],
+crypto_max_alg_name, [
+       #include <linux/crypto.h>
+],[
+       #if CRYPTO_MAX_ALG_NAME != 128
+       exit(1);
+       #endif
+],[
+       AC_DEFINE(HAVE_CRYPTO_MAX_ALG_NAME_128, 1,
+               ['CRYPTO_MAX_ALG_NAME' is 128])
+])
+]) # LC_HAVE_CRYPTO_MAX_ALG_NAME_128
+
+#
+# Kernel version 4.12 commit 47f38c539e9a42344ff5a664942075bd4df93876
+# CURRENT_TIME is not 64 bit time safe so it was replaced with
+# current_time()
+#
+AC_DEFUN([LC_CURRENT_TIME], [
+LB_CHECK_COMPILE([if CURRENT_TIME has been replaced with current_time],
+current_time, [
+       #include <linux/fs.h>
+],[
+       struct iattr attr;
+
+       attr.ia_atime = current_time(NULL);
+],[
+       AC_DEFINE(HAVE_CURRENT_TIME, 1,
+               [current_time() has replaced CURRENT_TIME])
+])
+]) # LIBCFS_CURRENT_TIME
+
+#
+# LC_SUPER_SETUP_BDI_NAME
+#
+# Kernel version 4.12 commit 9594caf216dc0fe3e318b34af0127276db661241
+# unified bdi handling
+#
+AC_DEFUN([LC_SUPER_SETUP_BDI_NAME], [
+LB_CHECK_COMPILE([if 'super_setup_bdi_name' exist],
+super_setup_bdi_name, [
+       #include <linux/fs.h>
+],[
+       super_setup_bdi_name(NULL, "lustre");
+],[
+       AC_DEFINE(HAVE_SUPER_SETUP_BDI_NAME, 1,
+               ['super_setup_bdi_name' is available])
+])
+]) # LC_SUPER_SETUP_BDI_NAME
+
+#
+# LC_BI_STATUS
+#
+# 4.12 replace bi_error to bi_status
+#
+AC_DEFUN([LC_BI_STATUS], [
+LB_CHECK_COMPILE([if 'bi_status' exist],
+bi_status, [
+       #include <linux/blk_types.h>
+],[
+       ((struct bio *)0)->bi_status = 0;
+],[
+       AC_DEFINE(HAVE_BI_STATUS, 1,
+               ['bi_status' is available])
+])
+]) # LC_BI_STATUS
+
+#
+# LC_BIO_INTEGRITY_ENABLED
+#
+# 4.13 removed bio_integrity_enabled
+#
+AC_DEFUN([LC_BIO_INTEGRITY_ENABLED], [
+LB_CHECK_COMPILE([if 'bio_integrity_enabled' exist],
+bio_integrity_enabled, [
+       #include <linux/bio.h>
+],[
+       bio_integrity_enabled(NULL);
+],[
+       AC_DEFINE(HAVE_BIO_INTEGRITY_ENABLED, 1,
+               ['bio_integrity_enabled' is available])
+])
+]) # LC_BIO_INTEGRITY_ENABLED
+
+#
+# LC_PAGEVEC_INIT_ONE_PARAM
+#
+# 4.14 pagevec_init takes one parameter
+#
+AC_DEFUN([LC_PAGEVEC_INIT_ONE_PARAM], [
+LB_CHECK_COMPILE([if 'pagevec_init' takes one parameter],
+pagevec_init, [
+       #include <linux/pagevec.h>
+],[
+       pagevec_init(NULL);
+],[
+       AC_DEFINE(HAVE_PAGEVEC_INIT_ONE_PARAM, 1,
+               ['pagevec_init' takes one parameter])
+])
+]) # LC_PAGEVEC_INIT_ONE_PARAM
+
+#
+# LC_BI_BDEV
+#
+# 4.14 replaced bi_bdev to bi_disk
+#
+AC_DEFUN([LC_BI_BDEV], [
+LB_CHECK_COMPILE([if 'bi_bdev' exist],
+bi_bdev, [
+       #include <linux/bio.h>
+],[
+       ((struct bio *)0)->bi_bdev = NULL;
+],[
+       AC_DEFINE(HAVE_BI_BDEV, 1,
+               ['bi_bdev' is available])
+])
+]) # LC_BI_BDEV
+
+#
 # LC_PROG_LINUX
 #
 # Lustre linux kernel checks
@@ -2230,15 +3007,17 @@ 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_GSS
-       LC_HAVE_VOID_OPENSSL_HMAC_FUNCS
+       LC_OPENSSL_SSK
 
        # 2.6.32
        LC_BLK_QUEUE_MAX_SEGMENTS
 
+       # 2.6.33
+       LC_HAVE_XATTR_HANDLER_FLAGS
+
        # 2.6.34
        LC_HAVE_DQUOT_FS_DISK_QUOTA
        LC_HAVE_DQUOT_SUSPEND
@@ -2255,6 +3034,7 @@ AC_DEFUN([LC_PROG_LINUX], [
 
        # 2.6.37
        LC_KERNEL_LOCKED
+       LC_FS_STRUCT_SEQCOUNT
 
        # 2.6.38
        LC_BLKDEV_GET_BY_DEV
@@ -2263,9 +3043,9 @@ 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
        LC_HAVE_FHANDLE_SYSCALLS
        LC_HAVE_FSTYPE_MOUNT
        LC_IOP_TRUNCATE
@@ -2274,6 +3054,7 @@ AC_DEFUN([LC_PROG_LINUX], [
 
        # 3.0
        LC_DIRTY_INODE_WITH_FLAG
+       LC_SETNS
 
        # 3.1
        LC_LM_XXX_LOCK_MANAGER_OPS
@@ -2285,7 +3066,6 @@ AC_DEFUN([LC_PROG_LINUX], [
        LC_HAVE_LOOP_CTL_GET_FREE
 
        # 3.2
-       LC_HAVE_VOID_MAKE_REQUEST_FN
        LC_HAVE_PROTECT_I_NLINK
 
        # 3.3
@@ -2324,9 +3104,9 @@ AC_DEFUN([LC_PROG_LINUX], [
        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
@@ -2336,10 +3116,13 @@ 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
+       LC_PTR_ERR_OR_ZERO_MISSING
        LC_KIOCB_KI_LEFT
+       LC_INIT_LIST_HEAD_RCU
 
        # 3.13
        LC_VFS_RENAME_5ARGS
@@ -2348,6 +3131,8 @@ AC_DEFUN([LC_PROG_LINUX], [
        # 3.14
        LC_HAVE_BVEC_ITER
        LC_HAVE_TRUNCATE_IPAGES_FINAL
+       LC_IOPS_RENAME_WITH_FLAGS
+       LC_IOP_SET_ACL
 
        # 3.15
        LC_VFS_RENAME_6ARGS
@@ -2359,6 +3144,7 @@ AC_DEFUN([LC_PROG_LINUX], [
        LC_HAVE_FILE_OPERATIONS_READ_WRITE_ITER
 
        # 3.17
+       LC_HAVE_INTERVAL_BLK_INTEGRITY
        LC_KEY_MATCH_DATA
 
        # 3.18
@@ -2386,12 +3172,19 @@ AC_DEFUN([LC_PROG_LINUX], [
        LC_SYMLINK_OPS_USE_NAMEIDATA
 
        # 4.3
+       LC_HAVE_INTERVAL_EXP_BLK_INTEGRITY
+       LC_HAVE_BIP_ITER_BIO_INTEGRITY_PAYLOAD
        LC_HAVE_CACHE_HEAD_HLIST
+       LC_HAVE_XATTR_HANDLER_SIMPLIFIED
 
        # 4.4
        LC_HAVE_LOCKS_LOCK_FILE_WAIT
-       LC_HAVE_QC_MAKE_REQUEST_FN
        LC_HAVE_KEY_PAYLOAD_DATA_ARRAY
+       LC_HAVE_XATTR_HANDLER_NAME
+       LC_HAVE_BI_CNT
+       LC_HAVE_BI_RW
+       LC_HAVE_SUBMIT_BIO_2ARGS
+       LC_HAVE_CLEAN_BDEV_ALIASES
 
        # 4.5
        LC_HAVE_FILE_DENTRY
@@ -2402,10 +3195,52 @@ AC_DEFUN([LC_PROG_LINUX], [
 
        # 4.6
        LC_HAVE_IN_COMPAT_SYSCALL
+       LC_HAVE_XATTR_HANDLER_INODE_PARAM
+
+       # 4.7
+       LC_DIRECTIO_2ARGS
+       LC_GENERIC_WRITE_SYNC_2ARGS
+       LC_FOPS_ITERATE_SHARED
+
+       # 4.8
+       LC_HAVE_POSIX_ACL_VALID_USER_NS
+       LC_D_COMPARE_4ARGS
+       LC_FULL_NAME_HASH_3ARGS
+       LC_STRUCT_POSIX_ACL_XATTR
+       LC_IOP_XATTR
+
+       # 4.9
+       LC_GROUP_INFO_GID
+       LC_VFS_SETXATTR
+       LC_POSIX_ACL_UPDATE_MODE
+
+       # 4.10
+       LC_IOP_GENERIC_READLINK
+       LC_HAVE_VM_FAULT_ADDRESS
+
+       # 4.11
+       LC_INODEOPS_ENHANCED_GETATTR
+       LC_VM_OPERATIONS_REMOVE_VMF_ARG
+       LC_HAVE_KEY_USAGE_REFCOUNT
+       LC_HAVE_CRYPTO_MAX_ALG_NAME_128
+
+       # 4.12
+       LC_CURRENT_TIME
+       LC_SUPER_SETUP_BDI_NAME
+       LC_BI_STATUS
+
+       # 4.13
+       LC_BIO_INTEGRITY_ENABLED
+
+       # 4.14
+       LC_PAGEVEC_INIT_ONE_PARAM
+       LC_BI_BDEV
+
+       # kernel patch to extend integrity interface
+       LC_BIO_INTEGRITY_PREP_FN
 
        #
        AS_IF([test "x$enable_server" != xno], [
-               LC_FUNC_DEV_SET_RDONLY
                LC_STACK_SIZE
                LC_QUOTA64
                LC_QUOTA_CONFIG
@@ -2518,25 +3353,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 <asm/page.h>
-],[
-       #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
@@ -2587,8 +3403,6 @@ AC_DEFUN([LC_CONFIGURE], [
 AC_MSG_NOTICE([Lustre core checks
 ==============================================================================])
 
-LC_CONFIG_OBD_BUFFER_SIZE
-
 AS_IF([test $target_cpu == "i686" -o $target_cpu == "x86_64"],
        [CFLAGS="$CFLAGS -Wall -Werror"])
 
@@ -2610,6 +3424,15 @@ AC_CHECK_HEADERS([blkid/blkid.h])
 # lustre/utils/llverfs.c
 AC_CHECK_HEADERS([ext2fs/ext2fs.h])
 
+# lustre/utils/lfs.c
+AC_CHECK_LIB([z], [crc32], [
+            AC_CHECK_HEADER([zlib.h], [], [
+                            AC_MSG_ERROR([zlib.h not found.])])
+            ], [
+            AC_MSG_ERROR([
+zlib library not found. Please install zlib development package.])
+])
+
 SELINUX=""
 AC_CHECK_LIB([selinux], [is_selinux_enabled],
        [AC_CHECK_HEADERS([selinux/selinux.h],
@@ -2677,6 +3500,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
 
 #
@@ -2694,8 +3534,10 @@ 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")
+AM_CONDITIONAL(XATTR_HANDLER, test "x$lb_cv_compile_xattr_handler_flags" = xyes)
 ]) # LC_CONDITIONALS
 
 #
@@ -2709,11 +3551,17 @@ lustre/Makefile
 lustre/autoMakefile
 lustre/autoconf/Makefile
 lustre/conf/Makefile
+lustre/conf/resource/Makefile
 lustre/contrib/Makefile
 lustre/doc/Makefile
 lustre/include/Makefile
 lustre/include/lustre/Makefile
-lustre/kernel_patches/targets/3.10-rhel7.target
+lustre/include/uapi/linux/lustre/Makefile
+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/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
@@ -2724,6 +3572,8 @@ 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/2.6-fc11.target
 lustre/kernel_patches/targets/2.6-fc12.target
 lustre/kernel_patches/targets/2.6-fc15.target
@@ -2749,7 +3599,6 @@ lustre/fld/Makefile
 lustre/fld/autoMakefile
 lustre/obdclass/Makefile
 lustre/obdclass/autoMakefile
-lustre/obdclass/linux/Makefile
 lustre/obdecho/Makefile
 lustre/obdecho/autoMakefile
 lustre/ofd/Makefile
@@ -2774,8 +3623,11 @@ 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/tests/kernel/Makefile
+lustre/tests/kernel/autoMakefile
 lustre/utils/Makefile
 lustre/utils/gss/Makefile
 lustre/osp/Makefile