Whamcloud - gitweb
LU-8056 llite: inode_operations interface changed in 4.5
[fs/lustre-release.git] / lustre / autoconf / lustre-core.m4
index 1b425c0..365727e 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'
@@ -89,10 +89,10 @@ LB_CHECK_EXPORT([dev_set_rdonly], [block/ll_rw_block.c block/blk-core.c],
 #
 # 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,20 +215,6 @@ LB_CHECK_EXPORT([delete_from_page_cache], [mm/filemap.c],
 ]) # LC_EXPORT_TRUNCATE_COMPLETE_PAGE
 
 #
-# LC_CONFIG_RMTCLIENT
-#
-dnl FIXME
-dnl the AES symbol usually tied with arch, e.g. CRYPTO_AES_586
-dnl FIXME
-AC_DEFUN([LC_CONFIG_RMTCLIENT], [
-LB_CHECK_CONFIG_IM([CRYPTO_AES], [],
-       [AC_MSG_WARN([
-
-Lustre remote client require that CONFIG_CRYPTO_AES is enabled in your kernel.
-])])
-]) # LC_CONFIG_RMTCLIENT
-
-#
 # LC_CONFIG_GSS_KEYRING
 #
 # default 'auto', tests for dependencies, if found, enables;
@@ -244,17 +230,11 @@ AC_MSG_RESULT([$enable_gss_keyring])
 AS_IF([test "x$enable_gss_keyring" != xno], [
        LB_CHECK_CONFIG_IM([KEYS], [], [
                gss_keyring_conf_test="fail"
-               AC_MSG_WARN([
-
-GSS keyring backend require that CONFIG_KEYS be enabled in your kernel.
-])])
+               AC_MSG_WARN([GSS keyring backend requires that CONFIG_KEYS be enabled in your kernel.])])
 
        AC_CHECK_LIB([keyutils], [keyctl_search], [], [
                gss_keyring_conf_test="fail"
-               AC_MSG_WARN([
-
-libkeyutils is not found, which is required by gss keyring backend
-])])
+               AC_MSG_WARN([GSS keyring backend requires libkeyutils])])
 
        AS_IF([test "x$gss_keyring_conf_test" != xfail], [
                AC_DEFINE([HAVE_GSS_KEYRING], [1],
@@ -262,21 +242,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], [
@@ -296,14 +302,16 @@ kernel SUNRPC support is required by using GSS.
 # parts are depend on linux platform.
 #
 AC_DEFUN([LC_CONFIG_GSS], [
-AC_MSG_CHECKING([whether to enable gss/krb5 support])
+AC_MSG_CHECKING([whether to enable gss support])
 AC_ARG_ENABLE([gss],
-       [AC_HELP_STRING([--enable-gss], [enable gss/krb5 support])],
+       [AC_HELP_STRING([--enable-gss], [enable gss support])],
        [], [enable_gss="auto"])
 AC_MSG_RESULT([$enable_gss])
 
 AS_IF([test "x$enable_gss" != xno], [
        LC_CONFIG_GSS_KEYRING
+       LC_HAVE_CRED_TGCRED
+       LC_KEY_TYPE_INSTANTIATE_2ARGS
        sunrpc_required=$enable_gss
        LC_CONFIG_SUNRPC
        sunrpc_required="no"
@@ -322,38 +330,39 @@ 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"
        ])
 ])
 ]) # LC_CONFIG_GSS
 
+# LC_HAVE_VOID_OPENSSL_HMAC_FUNCS
 #
+# OpenSSL 1.0+ return int for HMAC functions but previous versions do not
+AC_DEFUN([LC_HAVE_VOID_OPENSSL_HMAC_FUNCS], [
+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_VOID_OPENSSL_HMAC_FUNCS, 1,
+               [OpenSSL HMAC functions return void instead of int])
+])
+]) # LC_HAVE_VOID_OPENSSL_HMAC_FUNCS
+
 # LC_INODE_PERMISION_2ARGS
 #
 # up to v2.6.27 had a 3 arg version (inode, mask, nameidata)
@@ -616,7 +625,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],
@@ -929,6 +938,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
@@ -1213,6 +1249,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
@@ -1248,6 +1301,23 @@ file_f_inode, [
 ]) # LC_HAVE_FILE_F_INODE
 
 #
+# LC_HAVE_FILE_INODE
+#
+# 3.8 has introduced inline function file_inode
+#
+AC_DEFUN([LC_HAVE_FILE_INODE], [
+LB_CHECK_COMPILE([if file_inode() exists],
+file_inode, [
+       #include <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], [
@@ -1629,9 +1699,200 @@ direct_io_iter, [
 ]) # LC_DIRECTIO_USE_ITER
 
 #
+# 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_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 cancle_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],
@@ -1666,6 +1927,223 @@ iov_iter_rw, [
 ]) # 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_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_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
+#
+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_PROG_LINUX
 #
 # Lustre linux kernel checks
@@ -1681,8 +2159,8 @@ AC_DEFUN([LC_PROG_LINUX], [
        LC_LLITE_LLOOP_MODULE
 
        LC_GLIBC_SUPPORT_FHANDLES
-       LC_CONFIG_RMTCLIENT
        LC_CONFIG_GSS
+       LC_HAVE_VOID_OPENSSL_HMAC_FUNCS
 
        # 2.6.32
        LC_BLK_QUEUE_MAX_SEGMENTS
@@ -1718,6 +2196,7 @@ AC_DEFUN([LC_PROG_LINUX], [
        LC_HAVE_FSTYPE_MOUNT
        LC_IOP_TRUNCATE
        LC_HAVE_INODE_OWNER_OR_CAPABLE
+       LC_HAVE_SECURITY_IINITSEC
 
        # 3.0
        LC_DIRTY_INODE_WITH_FLAG
@@ -1729,6 +2208,7 @@ 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
@@ -1754,12 +2234,14 @@ AC_DEFUN([LC_PROG_LINUX], [
        LC_DATA_FOR_LLITE_IS_LIST
        LC_DENTRY_OPEN_USE_PATH
        LC_HAVE_IOP_ATOMIC_OPEN
+       LC_HAVE_SB_START_WRITE
 
        # 3.7
        LC_HAVE_POSIXACL_USER_NS
 
        # 3.8
        LC_HAVE_FILE_F_INODE
+       LC_HAVE_FILE_INODE
        LC_HAVE_SUNRPC_UPCALL_HAS_3ARGS
 
        # 3.9
@@ -1796,12 +2278,50 @@ AC_DEFUN([LC_PROG_LINUX], [
 
        # 3.16
        LC_DIRECTIO_USE_ITER
+       LC_HAVE_IOV_ITER_INIT_DIRECTION
+       LC_HAVE_IOV_ITER_TRUNCATE
+       LC_HAVE_FILE_OPERATIONS_READ_WRITE_ITER
+
+       # 3.17
+       LC_KEY_MATCH_DATA
+
+       # 3.18
+       LC_PERCPU_COUNTER_INIT
+       LC_NFS_FILLDIR_USE_CTX
+
+       # 3.19
+       LC_KIOCB_HAS_NBYTES
+
+       # 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
+
+       # 4.4
+       LC_HAVE_LOCKS_LOCK_FILE_WAIT
+       LC_HAVE_QC_MAKE_REQUEST_FN
+       LC_HAVE_KEY_PAYLOAD_DATA_ARRAY
+
+       # 4.5
+       LC_HAVE_FILE_DENTRY
+
+       # 4.5
+       LC_HAVE_INODE_LOCK
+       LC_HAVE_IOP_GET_LINK
 
        #
        AS_IF([test "x$enable_server" != xno], [
@@ -1990,7 +2510,7 @@ 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
@@ -2112,15 +2632,17 @@ lustre/conf/Makefile
 lustre/contrib/Makefile
 lustre/doc/Makefile
 lustre/include/Makefile
-lustre/include/lustre_ver.h
 lustre/include/lustre/Makefile
 lustre/kernel_patches/targets/3.10-rhel7.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/2.6-fc11.target
 lustre/kernel_patches/targets/2.6-fc12.target