Whamcloud - gitweb
LU-9956 kernel: kernel upgrade [SLES12 SP3 4.4.82-6.3]
[fs/lustre-release.git] / lustre / autoconf / lustre-core.m4
index 07e19b6..1b86922 100644 (file)
@@ -20,7 +20,7 @@ LUSTRE="$PWD/lustre"
 AC_SUBST(LUSTRE)
 
 # mount.lustre
-rootsbindir='$(CROSS_PATH)/sbin'
+rootsbindir='/sbin'
 AC_SUBST(rootsbindir)
 
 demodir='$(docdir)/demo'
@@ -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,25 +57,12 @@ 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 stack size big than 8k in Lustre server (all kernels)
+# Ensure the stack size is at least 8k in Lustre server (all kernels)
 #
 AC_DEFUN([LC_STACK_SIZE], [
-LB_CHECK_COMPILE([if stack size big than 8k],
+LB_CHECK_COMPILE([if stack size is at least 8k],
 stack_size_8k, [
        #include <linux/thread_info.h>
 ], [
@@ -215,32 +185,6 @@ LB_CHECK_EXPORT([delete_from_page_cache], [mm/filemap.c],
 ]) # LC_EXPORT_TRUNCATE_COMPLETE_PAGE
 
 #
-# LC_CAPA_CRYPTO
-#
-AC_DEFUN([LC_CAPA_CRYPTO], [
-LB_CHECK_CONFIG_IM([CRYPTO], [],
-       [AC_MSG_ERROR([Lustre capability require that CONFIG_CRYPTO is enabled in your kernel.])])
-LB_CHECK_CONFIG_IM([CRYPTO_HMAC], [],
-       [AC_MSG_ERROR([Lustre capability require that CONFIG_CRYPTO_HMAC is enabled in your kernel.])])
-LB_CHECK_CONFIG_IM([CRYPTO_SHA1], [],
-       [AC_MSG_ERROR([Lustre capability require that CONFIG_CRYPTO_SHA1 is enabled in your kernel.])])
-]) # LC_CAPA_CRYPTO
-
-#
-# 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;
@@ -256,17 +200,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],
@@ -274,21 +212,47 @@ 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.])
                ])
        ])
 ])
 ]) # 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 <linux/cred.h>
+],[
+       ((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)
+#
+AC_DEFUN([LC_KEY_TYPE_INSTANTIATE_2ARGS], [
+LB_CHECK_COMPILE([if 'key_type->instantiate' has two args],
+key_type_instantiate_2args, [
+       #include <linux/key-type.h>
+],[
+       ((struct key_type *)0)->instantiate(0, NULL);
+],[
+       AC_DEFINE(HAVE_KEY_TYPE_INSTANTIATE_2ARGS, 1,
+               [key_type->instantiate has two args])
+])
+]) # LC_KEY_TYPE_INSTANTIATE_2ARGS
+
+#
 # LC_CONFIG_SUNRPC
 #
 AC_DEFUN([LC_CONFIG_SUNRPC], [
@@ -302,20 +266,40 @@ kernel SUNRPC support is required by using GSS.
 ]) # LC_CONFIG_SUNRPC
 
 #
+# LC_HAVE_CRYPTO_HASH
+#
+# 4.6 kernel commit 896545098777564212b9e91af4c973f094649aa7
+# removed crypto_hash support. Since GSS only works with
+# crypto_hash it has to be disabled for newer distros.
+#
+AC_DEFUN([LC_HAVE_CRYPTO_HASH], [
+LB_CHECK_COMPILE([if crypto_hash API is supported],
+crypto_hash, [
+       #include <linux/crypto.h>
+],[
+       crypto_hash_digestsize(NULL);
+], [], [enable_gss="no"])
+])
+]) # LC_HAVE_CRYPTO_HASH
+
+#
 # LC_CONFIG_GSS (default 'auto' (tests for dependencies, if found, enables))
 #
 # Build gss and related tools of Lustre. Currently both kernel and user space
 # 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])
 
 AS_IF([test "x$enable_gss" != xno], [
        LC_CONFIG_GSS_KEYRING
+       LC_HAVE_CRYPTO_HASH
+       LC_HAVE_CRED_TGCRED
+       LC_KEY_TYPE_INSTANTIATE_2ARGS
        sunrpc_required=$enable_gss
        LC_CONFIG_SUNRPC
        sunrpc_required="no"
@@ -334,38 +318,45 @@ AS_IF([test "x$enable_gss" != xno], [
        require_krb5="no"
 
        AS_IF([test -n "$KRBDIR"], [
-               AC_CHECK_LIB([gssapi], [gss_export_lucid_sec_context], [
-                       GSSAPI_LIBS="$GSSAPI_LDFLAGS -lgssapi"
-                       gss_conf_test="success"
-               ], [
-                       AC_CHECK_LIB([gssglue], [gss_export_lucid_sec_context], [
-                               GSSAPI_LIBS="$GSSAPI_LDFLAGS -lgssglue"
-                               gss_conf_test="success"
-                       ], [
-                               AS_IF([test "x$enable_gss" = xyes], [
-                                       AC_MSG_ERROR([
-
-libgssapi or libgssglue is not found, which is required by GSS.
-])
-                               ], [
-                                       AC_MSG_WARN([
-
-libgssapi or libgssglue is not found, which is required by GSS.
-])
-                               ])
-                       ])
-               ])
-               AC_SUBST(GSSAPI_LIBS)
+               gss_conf_test="success"
+       ], [
+               gss_conf_test="failure"
        ])
 
        AS_IF([test "x$gss_conf_test" = xsuccess], [
                AC_DEFINE([HAVE_GSS], [1], [Define this is if you enable gss])
                enable_gss="yes"
+       ], [
+               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 <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);
+       }
+])],[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)
@@ -406,6 +397,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
@@ -487,6 +496,25 @@ EXTRA_KCFLAGS=$tmp_flags
 ]) # LC_QUOTA64
 
 #
+# LC_HAVE_ADD_WAIT_QUEUE_EXCLUSIVE
+#
+# 2.6.34 adds __add_wait_queue_exclusive
+#
+AC_DEFUN([LC_HAVE_ADD_WAIT_QUEUE_EXCLUSIVE], [
+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;
+       __add_wait_queue_exclusive(&queue, &wait);
+],[
+       AC_DEFINE(HAVE___ADD_WAIT_QUEUE_EXCLUSIVE, 1,
+                 [__add_wait_queue_exclusive exists])
+])
+]) # LC_HAVE_ADD_WAIT_QUEUE_EXCLUSIVE
+
+#
 # LC_FS_STRUCT_RWLOCK
 #
 # 2.6.36 fs_struct.lock use spinlock instead of rwlock.
@@ -609,7 +637,7 @@ EXTRA_KCFLAGS="$tmp_flags"
 #
 # LC_DCACHE_LOCK
 #
-# 2.6.38 dcache_lock removed. rcu-walk commited.
+# 2.6.38 dcache_lock removed. rcu-walk committed.
 #
 AC_DEFUN([LC_DCACHE_LOCK], [
 LB_CHECK_COMPILE([if 'dcache_lock' is exist],
@@ -665,6 +693,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
@@ -682,23 +730,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
@@ -767,6 +798,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.
@@ -819,20 +862,19 @@ lock_manager_ops_lm_xxx, [
 #
 # LC_INODE_DIO_WAIT
 #
-# 3.1 kills inode->i_alloc_sem, use i_dio_count and inode_dio_wait/
-#     inode_dio_done instead.
+# 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/done],
+LB_CHECK_COMPILE([if 'inode->i_alloc_sem' is killed and use inode_dio_wait],
 inode_dio_wait, [
        #include <linux/fs.h>
 ],[
        inode_dio_wait((struct inode *)0);
-       inode_dio_done((struct inode *)0);
 ],[
        AC_DEFINE(HAVE_INODE_DIO_WAIT, 1,
-               [inode->i_alloc_sem is killed and use inode_dio_wait/done])
+               [inode->i_alloc_sem is killed and use inode_dio_wait])
 ])
 ]) # LC_INODE_DIO_WAIT
 
@@ -883,26 +925,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
@@ -923,6 +945,33 @@ inode_i_nlink_protected, [
 ]) # 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 <linux/security.h>
+],[
+       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 <linux/security.h>
+       ],[
+               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
+
+#
 # LC_HAVE_MIGRATE_HEADER
 #
 # 3.3 introduces migrate_mode.h and migratepage has 4 args
@@ -1135,30 +1184,35 @@ generic_file_llseek_size_5args, [
 ]) # LC_FILE_LLSEEK_SIZE_5ARG
 
 #
-# LC_HAVE_DENTRY_D_ALIAS_HLIST
+# LC_LLITE_DATA_IS_LIST
 #
 # 3.6 switch i_dentry/d_alias from list to hlist
 #
-AC_DEFUN([LC_HAVE_DENTRY_D_ALIAS_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 'hlist'],
-i_dentry_d_alias_hlist, [
+LB_CHECK_COMPILE([if 'i_dentry/d_alias' uses 'list'],
+i_dentry_d_alias_list, [
        #include <linux/fs.h>
-       #include <linux/list.h>
 ],[
        struct inode inode;
-       struct dentry dentry;
-       struct hlist_head head;
-       struct hlist_node node;
-       inode.i_dentry = head;
-       dentry.d_alias = node;
+       INIT_LIST_HEAD(&inode.i_dentry);
 ],[
-       AC_DEFINE(HAVE_DENTRY_D_ALIAS_HLIST, 1,
-               [have i_dentry/d_alias uses hlist])
+       AC_DEFINE(DATA_FOR_LLITE_IS_LIST, 1,
+               [both i_dentry/d_alias uses list])
 ])
 EXTRA_KCFLAGS="$tmp_flags"
-]) # LC_HAVE_DENTRY_D_ALIAS_HLIST
+]) # LC_DATA_FOR_LLITE_IS_LIST
 
 #
 # LC_DENTRY_OPEN_USE_PATH
@@ -1202,6 +1256,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 <linux/fs.h>
+],[
+       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
@@ -1225,18 +1296,35 @@ posix_acl_to_xattr_user_namespace, [
 # 3.8 struct file has new member f_inode
 #
 AC_DEFUN([LC_HAVE_FILE_F_INODE], [
-LB_CHECK_COMPILE([if 'struct file' has memeber 'f_inode'],
+LB_CHECK_COMPILE([if 'struct file' has member 'f_inode'],
 file_f_inode, [
        #include <linux/fs.h>
 ],[
        ((struct file *)0)->f_inode = NULL;
 ],[
        AC_DEFINE(HAVE_FILE_F_INODE, 1,
-               [struct file has memeber f_inode])
+               [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 <linux/fs.h>
+],[
+       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], [
@@ -1263,9 +1351,10 @@ hlist_for_each_entry_3args, [
        #include <linux/list.h>
        #include <linux/fs.h>
 ],[
+       struct hlist_head *head = NULL;
        struct inode *inode;
-       struct dentry *dentry;
-       hlist_for_each_entry(dentry, &inode->i_dentry, d_alias) {
+
+       hlist_for_each_entry(inode, head, i_hash) {
                continue;
        }
 ],[
@@ -1281,7 +1370,7 @@ hlist_for_each_entry_3args, [
 # f73a1c7d117d07a96d89475066188a2b79e53c48
 #
 AC_DEFUN([LC_HAVE_BIO_END_SECTOR], [
-LB_CHECK_COMPILE([if 'bio_end_sector is defined],
+LB_CHECK_COMPILE([if 'bio_end_sector' is defined],
 bio_end_sector, [
        #include <linux/bio.h>
 ],[
@@ -1295,41 +1384,86 @@ bio_end_sector, [
 ]) # LC_HAVE_BIO_END_SECTOR
 
 #
-# LC_HAVE_ONLY_PROCFS_SEQ
+# 3.9 created is_sxid
+#
+AC_DEFUN([LC_HAVE_IS_SXID], [
+LB_CHECK_COMPILE([if 'is_sxid' is defined],
+is_sxid, [
+       #include <linux/fs.h>
+],[
+       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+ only supports procfs seq_files handling
+# 3.10 introduced remove_proc_subtree
 #
-AC_DEFUN([LC_HAVE_ONLY_PROCFS_SEQ], [
-LB_CHECK_COMPILE([if procfs only supports using 'seq_files'],
-only_procfs_seq_files, [
+AC_DEFUN([LC_HAVE_REMOVE_PROC_SUBTREE], [
+LB_CHECK_COMPILE([if 'remove_proc_subtree' is defined],
+remove_proc_subtree, [
        #include <linux/proc_fs.h>
 ],[
-       ((struct proc_dir_entry *)0)->write_proc(NULL, NULL, 0, NULL);
-], [], [
-       AC_DEFINE(HAVE_ONLY_PROCFS_SEQ, 1,
-               [only seq_files supported])
+       remove_proc_subtree(NULL, NULL);
+], [
+       AC_DEFINE(HAVE_REMOVE_PROC_SUBTREE, 1,
+                 [remove_proc_subtree is defined])
 ])
-]) # LC_HAVE_ONLY_PROCFS_SEQ
+]) # LC_HAVE_REMOVE_PROC_SUBTREE
 
 #
-# LC_BLKDEV_RELEASE_RETURN_INT
+# LC_HAVE_PROC_REMOVE
 #
-# 3.10 release for block device doesn't return int
+# 3.10 introduced proc_remove
 #
-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_PROC_REMOVE], [
+LB_CHECK_COMPILE([if 'proc_remove' is defined],
+proc_remove, [
+       #include <linux/proc_fs.h>
+],[
+       proc_remove(NULL);
+], [
+       AC_DEFINE(HAVE_PROC_REMOVE, 1,
+                 [proc_remove is defined])
+])
+]) # LC_HAVE_PROC_REMOVE
+
+AC_DEFUN([LC_HAVE_PROJECT_QUOTA], [
+LB_CHECK_COMPILE([if get_projid exists],
+get_projid, [
+       #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
+#
+# 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 <linux/security.h>
+],[
+       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
@@ -1403,6 +1537,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
@@ -1420,6 +1572,61 @@ truncate_pagecache_old_size, [
 ]) # LC_OLDSIZE_TRUNCATE_PAGECACHE
 
 #
+# LC_HAVE_DENTRY_D_U_D_ALIAS
+#
+# 3.11 kernel moved d_alias to the union d_u in struct dentry
+#
+# Some distros move d_alias to d_u but it is still a struct list
+#
+AC_DEFUN([LC_HAVE_DENTRY_D_U_D_ALIAS], [
+AS_IF([test "x$lb_cv_compile_i_dentry_d_alias_list" = xyes], [
+       LB_CHECK_COMPILE([if list 'dentry.d_u.d_alias' exist],
+       d_alias, [
+               #include <linux/list.h>
+               #include <linux/dcache.h>
+       ],[
+               struct dentry de;
+               INIT_LIST_HEAD(&de.d_u.d_alias);
+       ],[
+               AC_DEFINE(HAVE_DENTRY_D_U_D_ALIAS, 1,
+                       [list dentry.d_u.d_alias exist])
+       ])
+],[
+       LB_CHECK_COMPILE([if hlist 'dentry.d_u.d_alias' exist],
+       d_alias, [
+               #include <linux/list.h>
+               #include <linux/dcache.h>
+       ],[
+               struct dentry de;
+               INIT_HLIST_NODE(&de.d_u.d_alias);
+       ],[
+               AC_DEFINE(HAVE_DENTRY_D_U_D_ALIAS, 1,
+                       [hlist dentry.d_u.d_alias exist])
+       ])
+])
+]) # LC_HAVE_DENTRY_D_U_D_ALIAS
+
+#
+# LC_HAVE_DENTRY_D_CHILD
+#
+# 3.11 kernel d_child has been moved out of the union d_u
+# in struct dentry
+#
+AC_DEFUN([LC_HAVE_DENTRY_D_CHILD], [
+LB_CHECK_COMPILE([if 'dentry.d_child' exist],
+d_child, [
+       #include <linux/list.h>
+       #include <linux/dcache.h>
+],[
+       struct dentry de;
+       INIT_LIST_HEAD(&de.d_child);
+],[
+       AC_DEFINE(HAVE_DENTRY_D_CHILD, 1,
+               [dentry.d_child exist])
+])
+]) # LC_HAVE_DENTRY_D_CHILD
+
+#
 # LC_KIOCB_KI_LEFT
 #
 # 3.12 ki_left removed from struct kiocb
@@ -1490,6 +1697,99 @@ 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;
+], [
+       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
@@ -1505,6 +1805,28 @@ truncate_ipages_final, [
                [kernel has truncate_inode_pages_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
 #
@@ -1523,31 +1845,841 @@ vfs_rename_6args, [
 ]) # LC_VFS_RENAME_6ARGS
 
 #
-# LC_PROG_LINUX
+# LC_DIRECTIO_USE_ITER
 #
-# Lustre linux kernel checks
+# 3.16 kernel changes direct IO to use iov_iter
 #
-AC_DEFUN([LC_PROG_LINUX], [
-       AC_MSG_NOTICE([Lustre kernel checks
-==============================================================================])
-
-       LC_CONFIG_PINGER
-       LC_CONFIG_CHECKSUM
-       LC_CONFIG_HEALTH_CHECK_WRITE
-       LC_CONFIG_LRU_RESIZE
-       LC_LLITE_LLOOP_MODULE
-
-       LC_GLIBC_SUPPORT_FHANDLES
-       LC_CAPA_CRYPTO
-       LC_CONFIG_RMTCLIENT
-       LC_CONFIG_GSS
+AC_DEFUN([LC_DIRECTIO_USE_ITER], [
+LB_CHECK_COMPILE([if direct IO uses iov_iter],
+direct_io_iter, [
+       #include <linux/fs.h>
+],[
+       struct address_space_operations ops;
+       struct iov_iter *iter = NULL;
+       loff_t offset = 0;
 
-       # 2.6.32
-       LC_BLK_QUEUE_MAX_SEGMENTS
+       ops.direct_IO(0, NULL, iter, offset);
+],[
+       AC_DEFINE(HAVE_DIRECTIO_ITER, 1,
+               [direct IO uses iov_iter])
+])
+]) # LC_DIRECTIO_USE_ITER
 
-       # 2.6.34
-       LC_HAVE_DQUOT_FS_DISK_QUOTA
+#
+# LC_HAVE_IOV_ITER_INIT_DIRECTION
+#
+#
+# 3.16 linux commit 71d8e532b1549a478e6a6a8a44f309d050294d00
+#      changed iov_iter_init api to start accepting a tag
+#      that defines if its a read or write operation
+#
+AC_DEFUN([LC_HAVE_IOV_ITER_INIT_DIRECTION], [
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_CHECK_COMPILE([if 'iov_iter_init' takes a tag],
+iter_init, [
+       #include <linux/uio.h>
+       #include <linux/fs.h>
+],[
+       const struct iovec *iov = NULL;
+
+       iov_iter_init(NULL, READ, iov, 1, 0);
+],[
+       AC_DEFINE(HAVE_IOV_ITER_INIT_DIRECTION, 1,
+               [iov_iter_init handles directional tag])
+])
+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 <linux/uio.h>
+       #include <linux/fs.h>
+],[
+       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
+#
+AC_DEFUN([LC_HAVE_FILE_OPERATIONS_READ_WRITE_ITER], [
+LB_CHECK_COMPILE([if 'file_operations.[read|write]_iter' exist],
+file_function_iter, [
+       #include <linux/fs.h>
+],[
+       ((struct file_operations *)NULL)->read_iter(NULL, NULL);
+       ((struct file_operations *)NULL)->write_iter(NULL, NULL);
+],[
+       AC_DEFINE(HAVE_FILE_OPERATIONS_READ_WRITE_ITER, 1,
+               [file_operations.[read|write]_iter functions exist])
+])
+]) # LC_HAVE_FILE_OPERATIONS_READ_WRITE_ITER
+
+#
+# LC_KEY_MATCH_DATA
+#
+# 3.17 replaces key_type::match with match_preparse
+#      and has new struct key_match_data
+#
+AC_DEFUN([LC_KEY_MATCH_DATA], [
+LB_CHECK_COMPILE([if struct key_match field exist],
+key_match, [
+       #include <linux/key-type.h>
+],[
+       struct key_match_data data;
+],[
+       AC_DEFINE(HAVE_KEY_MATCH_DATA, 1,
+               [struct key_match_data exist])
+])
+]) # LC_KEY_MATCH_DATA
+
+#
+# LC_NFS_FILLDIR_USE_CTX
+#
+# 3.18 kernel moved from void cookie to struct dir_context
+#
+AC_DEFUN([LC_NFS_FILLDIR_USE_CTX], [
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_CHECK_COMPILE([if filldir_t uses struct dir_context],
+filldir_ctx, [
+       #include <linux/fs.h>
+],[
+       int filldir(struct dir_context *ctx, const char* name,
+                   int i, loff_t off, u64 tmp, unsigned temp)
+       {
+               return 0;
+       }
+
+       struct dir_context ctx = {
+               .actor = filldir,
+       };
+
+       ctx.actor(NULL, "test", 0, (loff_t) 0, 0, 0);
+],[
+       AC_DEFINE(HAVE_FILLDIR_USE_CTX, 1,
+               [filldir_t needs struct dir_context as argument])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+]) # LC_NFS_FILLDIR_USE_CTX
+
+#
+# LC_PERCPU_COUNTER_INIT
+#
+# 3.18 For kernels 3.18 and after percpu_counter_init starts
+#      to pass a GFP_* memory allocation flag for internal
+#      memory allocation purposes.
+#
+AC_DEFUN([LC_PERCPU_COUNTER_INIT], [
+LB_CHECK_COMPILE([if percpu_counter_init uses GFP_* flag as argument],
+percpu_counter_init, [
+       #include <linux/percpu_counter.h>
+],[
+       percpu_counter_init(NULL, 0, GFP_KERNEL);
+],[
+       AC_DEFINE(HAVE_PERCPU_COUNTER_INIT_GFP_FLAG, 1,
+               [percpu_counter_init uses GFP_* flag])
+])
+]) # LC_PERCPU_COUNTER_INIT
+
+#
+# LC_KIOCB_HAS_NBYTES
+#
+# 3.19 kernel removed ki_nbytes from struct kiocb
+#
+AC_DEFUN([LC_KIOCB_HAS_NBYTES], [
+LB_CHECK_COMPILE([if struct kiocb has ki_nbytes field],
+ki_nbytes, [
+       #include <linux/fs.h>
+],[
+       struct kiocb iocb;
+
+       iocb.ki_nbytes = 0;
+],[
+       AC_DEFINE(HAVE_KI_NBYTES, 1, [ki_nbytes field exist])
+])
+]) # 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 <linux/fs.h>
+       #include <linux/quota.h>
+],[
+       ((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
+#
+AC_DEFUN([LC_BACKING_DEV_INFO_REMOVAL], [
+LB_CHECK_COMPILE([if struct address_space has backing_dev_info],
+backing_dev_info, [
+       #include <linux/fs.h>
+],[
+       struct address_space mapping;
+
+       mapping.backing_dev_info = NULL;
+],[
+       AC_DEFINE(HAVE_BACKING_DEV_INFO, 1, [backing_dev_info exist])
+])
+]) # LC_BACKING_DEV_INFO_REMOVAL
+
+#
+# LC_HAVE_BDI_CAP_MAP_COPY
+#
+# 3.20  removed mmap handling for backing devices since
+#      it breaks on non-MMU systems. See kernel commit
+#      b4caecd48005fbed3949dde6c1cb233142fd69e9
+#
+AC_DEFUN([LC_HAVE_BDI_CAP_MAP_COPY], [
+LB_CHECK_COMPILE([if have 'BDI_CAP_MAP_COPY'],
+bdi_cap_map_copy, [
+       #include <linux/backing-dev.h>
+],[
+       struct backing_dev_info info;
+
+       info.capabilities = BDI_CAP_MAP_COPY;
+],[
+       AC_DEFINE(HAVE_BDI_CAP_MAP_COPY, 1,
+               [BDI_CAP_MAP_COPY exist])
+])
+]) # LC_HAVE_BDI_CAP_MAP_COPY
+
+#
+# LC_CANCEL_DIRTY_PAGE
+#
+# 4.0.0 kernel removed cancel_dirty_page
+#
+AC_DEFUN([LC_CANCEL_DIRTY_PAGE], [
+LB_CHECK_COMPILE([if cancel_dirty_page still exist],
+cancel_dirty_page, [
+       #include <linux/mm.h>
+],[
+       cancel_dirty_page(NULL, PAGE_SIZE);
+],[
+       AC_DEFINE(HAVE_CANCEL_DIRTY_PAGE, 1,
+               [cancel_dirty_page is still available])
+])
+]) # LC_CANCEL_DIRTY_PAGE
+
+#
+# LC_IOV_ITER_RW
+#
+# 4.1 kernel has iov_iter_rw
+#
+AC_DEFUN([LC_IOV_ITER_RW], [
+LB_CHECK_COMPILE([if iov_iter_rw exist],
+iov_iter_rw, [
+       #include <linux/fs.h>
+       #include <linux/uio.h>
+],[
+       struct iov_iter *iter = NULL;
+
+       iov_iter_rw(iter);
+],[
+       AC_DEFINE(HAVE_IOV_ITER_RW, 1,
+               [iov_iter_rw exist])
+])
+]) # LC_IOV_ITER_RW
+
+#
+# LC_HAVE_SYNC_READ_WRITE
+#
+# 4.1 new_sync_[read|write] no longer exported
+#
+AC_DEFUN([LC_HAVE_SYNC_READ_WRITE], [
+LB_CHECK_EXPORT([new_sync_read], [fs/read_write.c],
+       [AC_DEFINE(HAVE_SYNC_READ_WRITE, 1,
+                       [new_sync_[read|write] is exported by the kernel])])
+]) # LC_HAVE_SYNC_READ_WRITE
+
+#
+# LC_NEW_CANCEL_DIRTY_PAGE
+#
+# 4.2 kernel has new cancel_dirty_page
+#
+AC_DEFUN([LC_NEW_CANCEL_DIRTY_PAGE], [
+LB_CHECK_COMPILE([if cancel_dirty_page with one argument exist],
+new_cancel_dirty_page, [
+       #include <linux/mm.h>
+],[
+       cancel_dirty_page(NULL);
+],[
+       AC_DEFINE(HAVE_NEW_CANCEL_DIRTY_PAGE, 1,
+               [cancel_dirty_page with one arguement is available])
+])
+]) # LC_NEW_CANCEL_DIRTY_PAGE
+
+#
+# LC_SYMLINK_OPS_USE_NAMEIDATA
+#
+# For the 4.2+ kernels the file system internal symlink api no
+# longer uses struct nameidata as a argument
+#
+AC_DEFUN([LC_SYMLINK_OPS_USE_NAMEIDATA], [
+LB_CHECK_COMPILE([if symlink inode operations have struct nameidata argument],
+symlink_use_nameidata, [
+       #include <linux/namei.h>
+       #include <linux/fs.h>
+],[
+       struct nameidata *nd = NULL;
+
+       ((struct inode_operations *)0)->follow_link(NULL, nd);
+       ((struct inode_operations *)0)->put_link(NULL, nd, NULL);
+],[
+       AC_DEFINE(HAVE_SYMLINK_OPS_USE_NAMEIDATA, 1,
+               [symlink inode operations need struct nameidata argument])
+])
+]) # LC_SYMLINK_OPS_USE_NAMEIDATA
+
+#
+# LC_BIO_ENDIO_USES_ONE_ARG
+#
+# 4.2 kernel bio_endio now only takes one argument
+#
+AC_DEFUN([LC_BIO_ENDIO_USES_ONE_ARG], [
+LB_CHECK_COMPILE([if 'bio_endio' with one argument exist],
+bio_endio, [
+       #include <linux/bio.h>
+],[
+       bio_endio(NULL);
+],[
+       AC_DEFINE(HAVE_BIO_ENDIO_USES_ONE_ARG, 1,
+               [bio_endio takes only one argument])
+])
+]) # LC_BIO_ENDIO_USES_ONE_ARG
+
+#
+# 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 <linux/loop.h>
+       ],[
+               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
+#
+AC_DEFUN([LC_HAVE_CACHE_HEAD_HLIST], [
+LB_CHECK_COMPILE([if 'struct cache_head' has 'cache_list' field],
+cache_head_has_hlist, [
+       #include <linux/sunrpc/cache.h>
+],[
+       do {} while(sizeof(((struct cache_head *)0)->cache_list));
+],[
+       AC_DEFINE(HAVE_CACHE_HEAD_HLIST, 1,
+               [cache_head has hlist cache_list])
+])
+]) # 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_LOCKS_LOCK_FILE_WAIT
+#
+# 4.4 kernel have moved locks API users to
+# locks_lock_inode_wait()
+#
+AC_DEFUN([LC_HAVE_LOCKS_LOCK_FILE_WAIT], [
+LB_CHECK_COMPILE([if 'locks_lock_file_wait' exists],
+locks_lock_file_wait, [
+       #include <linux/fs.h>
+],[
+       locks_lock_file_wait(NULL, NULL);
+],[
+       AC_DEFINE(HAVE_LOCKS_LOCK_FILE_WAIT, 1,
+               [kernel has locks_lock_file_wait])
+])
+]) # LC_HAVE_LOCKS_LOCK_FILE_WAIT
+
+#
+# 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 <linux/key.h>
+],[
+       ((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 <linux/fs.h>
+],[
+       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 <linux/fs.h>
+],[
+       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 <linux/fs.h>
+],[
+       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 <linux/compat.h>
+],[
+       in_compat_syscall();
+],[
+       AC_DEFINE(HAVE_IN_COMPAT_SYSCALL, 1,
+               [have 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_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_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
+
+#
+# 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 timespec ts = current_time(NULL);
+],[
+       AC_DEFINE(HAVE_CURRENT_TIME, 1,
+               [current_time() has replaced CURRENT_TIME])
+])
+]) # LIBCFS_CURRENT_TIME
+
+#
+# LC_PROG_LINUX
+#
+# Lustre linux kernel checks
+#
+AC_DEFUN([LC_PROG_LINUX], [
+       AC_MSG_NOTICE([Lustre kernel checks
+==============================================================================])
+
+       LC_CONFIG_PINGER
+       LC_CONFIG_CHECKSUM
+       LC_CONFIG_HEALTH_CHECK_WRITE
+       LC_CONFIG_LRU_RESIZE
+
+       LC_GLIBC_SUPPORT_FHANDLES
+       LC_CONFIG_GSS
+       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
+       LC_HAVE_ADD_WAIT_QUEUE_EXCLUSIVE
 
        # 2.6.35, 3.0.0
        LC_FILE_FSYNC
@@ -1568,16 +2700,18 @@ 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
        LC_HAVE_INODE_OWNER_OR_CAPABLE
+       LC_HAVE_SECURITY_IINITSEC
 
        # 3.0
        LC_DIRTY_INODE_WITH_FLAG
+       LC_SETNS
 
        # 3.1
        LC_LM_XXX_LOCK_MANAGER_OPS
@@ -1586,9 +2720,9 @@ AC_DEFUN([LC_PROG_LINUX], [
        LC_FILE_LLSEEK_SIZE
        LC_INODE_PERMISION_2ARGS
        LC_RADIX_EXCEPTION_ENTRY
+       LC_HAVE_LOOP_CTL_GET_FREE
 
        # 3.2
-       LC_HAVE_VOID_MAKE_REQUEST_FN
        LC_HAVE_PROTECT_I_NLINK
 
        # 3.3
@@ -1608,30 +2742,38 @@ AC_DEFUN([LC_PROG_LINUX], [
        LC_FILE_LLSEEK_SIZE_5ARG
 
        # 3.6
-       LC_HAVE_DENTRY_D_ALIAS_HLIST
+       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_HAVE_ONLY_PROCFS_SEQ
-       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
        LC_HAVE_DIR_CONTEXT
        LC_D_COMPARE_5ARGS
        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
@@ -1644,13 +2786,96 @@ 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
 
+       # 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
+       LC_KEY_MATCH_DATA
+
+       # 3.18
+       LC_PERCPU_COUNTER_INIT
+       LC_NFS_FILLDIR_USE_CTX
+
+       # 3.19
+       LC_KIOCB_HAS_NBYTES
+       LC_HAVE_DQUOT_QC_DQBLK
+
+       # 3.20
+       LC_BACKING_DEV_INFO_REMOVAL
+       LC_HAVE_BDI_CAP_MAP_COPY
+
+       # 4.0.0
+       LC_CANCEL_DIRTY_PAGE
+
+       # 4.1.0
+       LC_IOV_ITER_RW
+       LC_HAVE_SYNC_READ_WRITE
+
+       # 4.2
+       LC_NEW_CANCEL_DIRTY_PAGE
+       LC_BIO_ENDIO_USES_ONE_ARG
+       LC_SYMLINK_OPS_USE_NAMEIDATA
+
+       # 4.3
+       LC_HAVE_CACHE_HEAD_HLIST
+       LC_HAVE_XATTR_HANDLER_SIMPLIFIED
+
+       # 4.4
+       LC_HAVE_LOCKS_LOCK_FILE_WAIT
+       LC_HAVE_KEY_PAYLOAD_DATA_ARRAY
+       LC_HAVE_BI_CNT
+       LC_HAVE_BI_RW
+       LC_HAVE_SUBMIT_BIO_2ARGS
+       LC_HAVE_CLEAN_BDEV_ALIASES
+
+       # 4.5
+       LC_HAVE_FILE_DENTRY
+
+       # 4.5
+       LC_HAVE_INODE_LOCK
+       LC_HAVE_IOP_GET_LINK
+
+       # 4.6
+       LC_HAVE_IN_COMPAT_SYSCALL
+       LC_HAVE_XATTR_HANDLER_INODE_PARAM
+
+       # 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
+       LC_IOP_XATTR
+
+       # 4.9
+       LC_GROUP_INFO_GID
+       LC_VFS_SETXATTR
+
+       # 4.10
+       LC_IOP_GENERIC_READLINK
+       LC_HAVE_VM_FAULT_ADDRESS
+
+       # 4.11
+       LC_INODEOPS_ENHANCED_GETATTR
+       LC_VM_OPERATIONS_REMOVE_VMF_ARG
+
+       # 4.12
+       LC_CURRENT_TIME
+
        #
        AS_IF([test "x$enable_server" != xno], [
-               LC_FUNC_DEV_SET_RDONLY
                LC_STACK_SIZE
                LC_QUOTA64
                LC_QUOTA_CONFIG
@@ -1706,9 +2931,9 @@ AC_ARG_ENABLE([mpitests],
                                MPI_Initialized(&flag);
                                return 0;
                        }
-               ])], [lb_cv_mpi_tests="yes"], [lb_cv_mpi_tests="no"
-                       enable_mpitests=$lb_cv_mpi_tests])
+               ])], [lb_cv_mpi_tests="yes"], [lb_cv_mpi_tests="no"])
                ])
+               enable_mpitests=$lb_cv_mpi_tests
                CC=$oldcc
        fi
        AC_SUBST(MPICC_WRAPPER)
@@ -1746,22 +2971,6 @@ AS_IF([test "x$enable_quota" != xno -a "x$enable_utils" != xno], [
 ]) # LC_QUOTA
 
 #
-# LC_CONFIG_SPLIT
-#
-# whether to enable split support
-#
-AC_DEFUN([LC_CONFIG_SPLIT], [
-AC_MSG_CHECKING([whether to enable split support])
-AC_ARG_ENABLE([split],
-       AC_HELP_STRING([--enable-split],
-               [enable split support]),
-       [], [enable_split='no'])
-AC_MSG_RESULT([$enable_split])
-AS_IF([test "x$enable_split" != xno],
-    [AC_DEFINE(HAVE_SPLIT_SUPPORT, 1, [enable split support])])
-]) # LC_CONFIG_SPLIT
-
-#
 # LC_CONFIG_NODEMAP_PROC_DEBUG
 #
 # enable nodemap proc file debugging
@@ -1779,25 +2988,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
@@ -1848,40 +3038,36 @@ 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 -Werror"])
+       [CFLAGS="$CFLAGS -Wall -Werror"])
 
 # maximum MDS thread count
 LC_MDS_MAX_THREADS
 
-# libcfs/include/libcfs/posix/libcfs.h
-# lustre/utils/llverdev.c
-AC_CHECK_HEADERS([sys/user.h sys/vfs.h stdint.h blkid/blkid.h])
-
-# libcfs/include/libcfs/linux/linux-prim.h, ...
-AC_CHECK_HEADERS([linux/types.h sys/types.h linux/unistd.h unistd.h])
+# lustre/utils/gss/gss_util.c
+# lustre/utils/gss/gssd_proc.c
+# lustre/utils/gss/krb5_util.c
+# lustre/utils/llog_reader.c
+# lustre/utils/create_iam.c
+# lustre/utils/libiam.c
+AC_CHECK_HEADERS([netdb.h endian.h])
+AC_CHECK_FUNCS([gethostbyname])
 
-# libcfs/include/libcfs/linux/linux-prim.h
-AC_CHECK_HEADERS([linux/random.h], [], [],
-                [#ifdef HAVE_LINUX_TYPES_H
-                 #include <linux/types.h>
-                 #endif
-                ])
+# lustre/utils/llverdev.c
+AC_CHECK_HEADERS([blkid/blkid.h])
 
-# utils/llverfs.c
+# lustre/utils/llverfs.c
 AC_CHECK_HEADERS([ext2fs/ext2fs.h])
 
 SELINUX=""
 AC_CHECK_LIB([selinux], [is_selinux_enabled],
-       [AC_CHECK_HEADERS([selinux.h],
+       [AC_CHECK_HEADERS([selinux/selinux.h],
                        [SELINUX="-lselinux"
                        AC_DEFINE([HAVE_SELINUX], 1,
                                [support for selinux ])],
                        [AC_MSG_WARN([
 
-No selinux-devel package found, unable to build selinux enabled tools
+No libselinux-devel package found, unable to build selinux enabled tools
 ])
 ])],
        [AC_MSG_WARN([
@@ -1940,6 +3126,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
 
 #
@@ -1948,7 +3151,6 @@ AS_IF([test "x$enable_pgstat_track" = xyes],
 # AM_CONDITIONALS for lustre
 #
 AC_DEFUN([LC_CONDITIONALS], [
-AM_CONDITIONAL(LIBLUSTRE, false)
 AM_CONDITIONAL(MPITESTS, test x$enable_mpitests = xyes, Build MPI Tests)
 AM_CONDITIONAL(CLIENT, test x$enable_client = xyes)
 AM_CONDITIONAL(SERVER, test x$enable_server = xyes)
@@ -1958,8 +3160,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
 
 #
@@ -1976,15 +3180,22 @@ lustre/conf/Makefile
 lustre/contrib/Makefile
 lustre/doc/Makefile
 lustre/include/Makefile
-lustre/include/lustre_ver.h
-lustre/include/linux/Makefile
 lustre/include/lustre/Makefile
+lustre/include/uapi/linux/lustre/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
 lustre/kernel_patches/targets/2.6-rhel5.target
 lustre/kernel_patches/targets/2.6-sles11.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/2.6-fc11.target
 lustre/kernel_patches/targets/2.6-fc12.target
 lustre/kernel_patches/targets/2.6-fc15.target
@@ -2004,8 +3215,6 @@ lustre/lfsck/Makefile
 lustre/lfsck/autoMakefile
 lustre/mdt/Makefile
 lustre/mdt/autoMakefile
-lustre/nodemap/Makefile
-lustre/nodemap/autoMakefile
 lustre/mdd/Makefile
 lustre/mdd/autoMakefile
 lustre/fld/Makefile
@@ -2037,8 +3246,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