Whamcloud - gitweb
LU-12634 gss: uid_keyring and session_keyring moved
[fs/lustre-release.git] / lustre / autoconf / lustre-core.m4
index 84412d0..c6b5821 100644 (file)
@@ -181,24 +181,21 @@ Lustre quota requires that CONFIG_QUOTA is enabled in your kernel.
 ])])
 ]) # LC_QUOTA_CONFIG
 
+
+#[AC_DEFINE(CONFIG_LUSTRE_FS_POSIX_ACL, 1, [Enable POSIX acl])])
 #
-# LC_EXPORT_TRUNCATE_COMPLETE_PAGE
+# LC_POSIX_ACL_CONFIG
 #
-# truncate_complete_page() has never been exported from an upstream kernel
-# remove_from_page_cache() was exported between 2.6.35 and 2.6.38
-# delete_from_page_cache() is exported from 2.6.39
+# POSIX ACL support.
 #
-AC_DEFUN([LC_EXPORT_TRUNCATE_COMPLETE_PAGE], [
-LB_CHECK_EXPORT([truncate_complete_page], [mm/truncate.c],
-       [AC_DEFINE(HAVE_TRUNCATE_COMPLETE_PAGE, 1,
-               [kernel export truncate_complete_page])])
-LB_CHECK_EXPORT([remove_from_page_cache], [mm/filemap.c],
-       [AC_DEFINE(HAVE_REMOVE_FROM_PAGE_CACHE, 1,
-               [kernel export remove_from_page_cache])])
-LB_CHECK_EXPORT([delete_from_page_cache], [mm/filemap.c],
-       [AC_DEFINE(HAVE_DELETE_FROM_PAGE_CACHE, 1,
-               [kernel export delete_from_page_cache])])
-]) # LC_EXPORT_TRUNCATE_COMPLETE_PAGE
+AC_DEFUN([LC_POSIX_ACL_CONFIG], [
+LB_CHECK_CONFIG_IM([FS_POSIX_ACL],
+       [AC_DEFINE(CONFIG_LUSTRE_FS_POSIX_ACL, 1, [Enable POSIX acl])
+], [ ])
+]) # LC_POSIX_ACL_CONFIG
+
+LB_CHECK_CONFIG_IM([CRYPTO_MD5], [],
+               [AC_MSG_WARN([kernel MD5 support is recommended by using GSS.])])
 
 #
 # LC_CONFIG_GSS_KEYRING
@@ -235,23 +232,6 @@ AS_IF([test "x$enable_gss_keyring" != xno], [
 ]) # LC_CONFIG_GSS_KEYRING
 
 #
-# LC_HAVE_CRED_TGCRED
-#
-# rhel7 struct cred has no member tgcred
-#
-AC_DEFUN([LC_HAVE_CRED_TGCRED], [
-LB_CHECK_COMPILE([if 'struct cred' has member 'tgcred'],
-cred_tgcred, [
-       #include <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)
@@ -296,7 +276,6 @@ 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
@@ -404,359 +383,6 @@ inode_ops_permission_2args, [
 ]) # LC_INODE_PERMISION_2ARGS
 
 #
-# LC_BLK_QUEUE_MAX_SEGMENTS
-#
-# 2.6.32 replaces 2 functions blk_queue_max_phys_segments and blk_queue_max_hw_segments by blk_queue_max_segments
-#
-AC_DEFUN([LC_BLK_QUEUE_MAX_SEGMENTS], [
-LB_CHECK_COMPILE([if 'blk_queue_max_segments' is defined],
-blk_queue_max_segments, [
-       #include <linux/blkdev.h>
-],[
-       blk_queue_max_segments(NULL, 0);
-],[
-       AC_DEFINE(HAVE_BLK_QUEUE_MAX_SEGMENTS, 1,
-               [blk_queue_max_segments is defined])
-])
-]) # 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
-#
-AC_DEFUN([LC_HAVE_DQUOT_FS_DISK_QUOTA], [
-tmp_flags="$EXTRA_KCFLAGS"
-EXTRA_KCFLAGS="-Werror"
-LB_CHECK_COMPILE([if 'quotactl_ops.set_dqblk' takes struct fs_disk_quota],
-fs_disk_quota, [
-       #include <linux/fs.h>
-       #include <linux/quota.h>
-],[
-       ((struct quotactl_ops *)0)->set_dqblk(NULL, 0, 0, (struct fs_disk_quota*)0);
-],[
-       AC_DEFINE(HAVE_DQUOT_FS_DISK_QUOTA, 1,
-               [quotactl_ops.set_dqblk takes struct fs_disk_quota])
-],[
-       LB_CHECK_COMPILE([if 'quotactl_ops.set_dqblk' takes struct kqid & fs_disk_quota],
-       kqid_fs_disk_quota, [
-               #include <linux/fs.h>
-               #include <linux/quota.h>
-       ],[
-               ((struct quotactl_ops *)0)->set_dqblk((struct super_block*)0, *((struct kqid*)0), (struct fs_disk_quota*)0);
-       ],[
-               AC_DEFINE(HAVE_DQUOT_FS_DISK_QUOTA, 1,
-                       [quotactl_ops.set_dqblk takes struct fs_disk_quota])
-               AC_DEFINE(HAVE_DQUOT_KQID, 1,
-                       [quotactl_ops.set_dqblk takes struct kqid])
-       ])
-])
-EXTRA_KCFLAGS="$tmp_flags"
-]) # LC_HAVE_DQUOT_FS_DISK_QUOTA
-
-#
-# LC_HAVE_DQUOT_SUSPEND
-#
-# 2.6.34 has renamed dquot options to dquot_*, check for dquot_suspend
-#
-AC_DEFUN([LC_HAVE_DQUOT_SUSPEND], [
-LB_CHECK_COMPILE([if 'dquot_suspend' is defined],
-dquot_suspend, [
-       #include <linux/quotaops.h>
-],[
-       dquot_suspend(NULL, -1);
-],[
-       AC_DEFINE(HAVE_DQUOT_SUSPEND, 1, [dquot_suspend is defined])
-])
-]) # LC_HAVE_DQUOT_SUSPEND
-
-#
-# LC_QUOTA64
-#
-# Check if kernel has been patched for 64-bit quota limits support.
-# The upstream version of this patch in RHEL6 2.6.32 kernels introduces
-# the constant QFMT_VFS_V1 in include/linux/quota.h, so we can check for
-# that in the absence of quotaio_v1.h in the kernel headers.
-#
-AC_DEFUN([LC_QUOTA64], [
-tmp_flags="$EXTRA_KCFLAGS"
-EXTRA_KCFLAGS="-I$LINUX/fs"
-LB_CHECK_COMPILE([if kernel has 64-bit quota limits support],
-quota64, [
-       #include <linux/kernel.h>
-       #include <linux/fs.h>
-       #if defined(HAVE_FS_QUOTA_QUOTAIO_H)
-       #include <quota/quotaio_v2.h>
-       struct v2r1_disk_dqblk dqblk_r1;
-       #else
-       #include <linux/quota.h>
-       int ver = QFMT_VFS_V1;
-       #endif
-], [], [
-       AC_DEFINE(HAVE_QUOTA64, 1, [have quota64])
-],[
-       LB_CHECK_FILE([$LINUX/include/linux/lustre_version.h],
-               [AC_MSG_ERROR([You have got no 64-bit kernel quota support.])])
-])
-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.
-#
-AC_DEFUN([LC_FS_STRUCT_RWLOCK], [
-LB_CHECK_COMPILE([if 'fs_struct.lock' use rwlock],
-fs_struct_rwlock, [
-       #include <asm/atomic.h>
-       #include <linux/spinlock.h>
-       #include <linux/fs_struct.h>
-],[
-       struct fs_struct fss = { };
-       rwlock_t rwl = { };
-
-       fss.lock = rwl;
-],[
-       AC_DEFINE(HAVE_FS_STRUCT_RWLOCK, 1, [fs_struct.lock use rwlock])
-])
-]) # LC_FS_STRUCT_RWLOCK
-
-#
-# LC_SBOPS_EVICT_INODE
-#
-# 2.6.36 super_operations add evict_inode method. it hybird of
-# delete_inode & clear_inode.
-#
-AC_DEFUN([LC_SBOPS_EVICT_INODE], [
-LB_CHECK_COMPILE([if 'super_operations.evict_inode' exist],
-super_ops_evict_inode, [
-       #include <linux/fs.h>
-],[
-       ((struct super_operations *)0)->evict_inode(NULL);
-],[
-       AC_DEFINE(HAVE_SBOPS_EVICT_INODE, 1,
-               [super_operations.evict_inode() is exist in kernel])
-])
-]) # LC_SBOPS_EVICT_INODE
-
-#
-# LC_FILE_FSYNC
-#
-# 2.6.35 file_operations.fsync taken 2 arguments.
-# 3.0.0 file_operations.fsync takes 4 arguments.
-#
-AC_DEFUN([LC_FILE_FSYNC], [
-LB_CHECK_COMPILE([if 'file_operations.fsync' takes 4 arguments],
-file_ops_fsync_4args, [
-       #include <linux/fs.h>
-],[
-       ((struct file_operations *)0)->fsync(NULL, 0, 0, 0);
-],[
-       AC_DEFINE(HAVE_FILE_FSYNC_4ARGS, 1,
-               [file_operations.fsync takes 4 arguments])
-],[
-       LB_CHECK_COMPILE([if 'file_operations.fsync' takes 2 arguments],
-       file_ops_fsync_2args, [
-               #include <linux/fs.h>
-       ],[
-               ((struct file_operations *)0)->fsync(NULL, 0);
-       ],[
-               AC_DEFINE(HAVE_FILE_FSYNC_2ARGS, 1,
-                       [file_operations.fsync takes 2 arguments])
-       ])
-])
-]) # LC_FILE_FSYNC
-
-#
-# LC_KERNEL_LOCKED
-#
-# 2.6.37 remove kernel_locked
-#
-AC_DEFUN([LC_KERNEL_LOCKED], [
-LB_CHECK_COMPILE([if 'kernel_locked' is defined],
-kernel_locked, [
-       #include <linux/smp_lock.h>
-],[
-       kernel_locked();
-],[
-       AC_DEFINE(HAVE_KERNEL_LOCKED, 1, [kernel_locked is defined])
-])
-]) # 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.
-#
-AC_DEFUN([LC_D_COMPARE_7ARGS], [
-LB_CHECK_COMPILE([if 'dentry_operations.d_compare()' taken 7 arguments],
-dentry_ops_d_compare_7arg, [
-       #include <linux/dcache.h>
-],[
-       ((struct dentry_operations*)0)->d_compare(NULL,NULL,NULL,NULL,0,NULL,NULL);
-],[
-       AC_DEFINE(HAVE_D_COMPARE_7ARGS, 1, [d_compare need 7 arguments])
-])
-]) # LC_D_COMPARE_7ARGS
-
-#
-# LC_D_DELETE_CONST
-#
-# 2.6.38 dentry_operations.d_delete() defined 'const' for 1st parameter.
-#
-AC_DEFUN([LC_D_DELETE_CONST], [
-tmp_flags="$EXTRA_KCFLAGS"
-EXTRA_KCFLAGS="-Werror"
-LB_CHECK_COMPILE([if 'dentry_operations.d_delete()' has const declare on first parameter],
-dentry_ops_d_delete_1st_const, [
-       #include <linux/dcache.h>
-],[
-       const struct dentry *d = NULL;
-       ((struct dentry_operations*)0)->d_delete(d);
-],[
-       AC_DEFINE(HAVE_D_DELETE_CONST, const,
-               [d_delete first parameter declared const])
-],[
-       AC_DEFINE(HAVE_D_DELETE_CONST, [],
-               [d_delete first parameter declared is not const])
-])
-EXTRA_KCFLAGS="$tmp_flags"
-]) # LC_D_DELETE_CONST
-
-#
-# LC_DCACHE_LOCK
-#
-# 2.6.38 dcache_lock removed. rcu-walk committed.
-#
-AC_DEFUN([LC_DCACHE_LOCK], [
-LB_CHECK_COMPILE([if 'dcache_lock' is exist],
-dcache_lock, [
-       #include <linux/dcache.h>
-],[
-       spin_lock(&dcache_lock);
-],[
-       AC_DEFINE(HAVE_DCACHE_LOCK, 1,
-               [dcache_lock is exist])
-])
-]) # LC_DCACHE_LOCK
-
-#
-# LC_INODE_I_RCU
-#
-# 2.6.38 inode.i_rcu added.
-#
-AC_DEFUN([LC_INODE_I_RCU], [
-LB_CHECK_COMPILE([if 'inode.i_rcu' exists],
-inode_i_rcu, [
-       #include <linux/fs.h>
-],[
-       struct inode ino;
-       struct rcu_head rcu = {};
-       ino.i_rcu = rcu;
-],[
-       AC_DEFINE(HAVE_INODE_I_RCU, 1,
-               [inode.i_rcu exists])
-])
-]) # LC_INODE_I_RCU
-
-#
-# LC_BLKDEV_GET_BY_DEV
-#
-# 2.6.38 export blkdev_get_by_dev
-#
-AC_DEFUN([LC_BLKDEV_GET_BY_DEV], [
-LB_CHECK_EXPORT([blkdev_get_by_dev], [fs/block_dev.c],
-       [AC_DEFINE(HAVE_BLKDEV_GET_BY_DEV, 1,
-               [blkdev_get_by_dev is exported by the kernel])])
-]) # LC_BLKDEV_GET_BY_DEV
-
-#
-# LC_EXPORT_SIMPLE_SETATTR
-#
-# 2.6.38 export simple_setattr
-#
-AC_DEFUN([LC_EXPORT_SIMPLE_SETATTR], [
-LB_CHECK_EXPORT([simple_setattr], [fs/libfs.c],
-       [AC_DEFINE(HAVE_SIMPLE_SETATTR, 1,
-               [simple_setattr is exported by the kernel])])
-]) # 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_HAVE_FSTYPE_MOUNT
 #
 # 2.6.39 replace get_sb with mount in struct file_system_type
@@ -839,37 +465,6 @@ AC_CHECK_FUNCS([setns])
 ]) # LC_SETNS
 
 #
-# LC_GENERIC_PERMISSION
-#
-# 2.6.38 generic_permission taken 4 parameters.
-# in fact, it means rcu-walk aware permission bring.
-#
-# 3.1 generic_permission taken 2 parameters.
-# see kernel commit 2830ba7f34ebb27c4e5b8b6ef408cd6d74860890
-#
-AC_DEFUN([LC_GENERIC_PERMISSION], [
-LB_CHECK_COMPILE([if 'generic_permission' take 2 arguments],
-generic_permission_2args, [
-       #include <linux/fs.h>
-],[
-       generic_permission(NULL, 0);
-],[
-       AC_DEFINE(HAVE_GENERIC_PERMISSION_2ARGS, 1,
-               [generic_permission taken 2 arguments])
-],[
-       LB_CHECK_COMPILE([if 'generic_permission' take 4 arguments],
-       generic_permission_4args, [
-               #include <linux/fs.h>
-       ],[
-               generic_permission(NULL, 0, 0, NULL);
-       ],[
-               AC_DEFINE(HAVE_GENERIC_PERMISSION_4ARGS, 1,
-                       [generic_permission taken 4 arguments])
-       ])
-])
-]) # LC_GENERIC_PERMISSION
-
-#
 # LC_LM_XXX_LOCK_MANAGER_OPS
 #
 # 3.1 renames lock-manager ops(lock_manager_operations) from fl_xxx to lm_xxx
@@ -881,7 +476,7 @@ lock_manager_ops_lm_xxx, [
        #include <linux/fs.h>
 ],[
        struct lock_manager_operations lm_ops;
-       lm_ops.lm_compare_owner = NULL;
+       lm_ops.lm_notify = NULL;
 ],[
        AC_DEFINE(HAVE_LM_XXX_LOCK_MANAGER_OPS, 1,
                [lock-manager ops renamed to lm_xxx])
@@ -1001,6 +596,23 @@ security_inode_init_security_callback, [
 ]) # LC_HAVE_SECURITY_IINITSEC
 
 #
+# 2.6.39 vfs_create takes a 'struct nameidata' parameter
+#
+AC_DEFUN([LC_VFS_CREATE_USE_NAMEIDATA], [
+LB_CHECK_COMPILE([if vfs_create takes a struct nameidata parameter],
+vfs_create, [
+       #include <linux/namei.h>
+       #include <linux/fs.h>
+],[
+       struct nameidata *nd;
+       vfs_create(NULL, NULL, 0, nd);
+],[
+       AC_DEFINE(HAVE_VFS_CREATE_USE_NAMEIDATA, 1,
+               [vfs_create use nameidata as parameter])
+])
+]) # LC_VFS_CREATE_USE_NAMEIDATA
+
+#
 # LC_HAVE_MIGRATE_HEADER
 #
 # 3.3 introduces migrate_mode.h and migratepage has 4 args
@@ -1430,6 +1042,23 @@ is_sxid, [
 ]) # LC_HAVE_IS_SXID
 
 #
+# LC_HAVE_VFS_GETATTR_2ARGS
+#
+AC_DEFUN([LC_HAVE_VFS_GETATTR_2ARGS], [
+LB_CHECK_COMPILE([if vfs_getattr takes 2 args],
+vfs_getattr, [
+       #include <linux/fs.h>
+],[
+       struct path path;
+
+       vfs_getattr(&path, NULL);
+],[
+       AC_DEFINE(HAVE_VFS_GETATTR_2ARGS, 1,
+               [vfs_getattr takes 2 args])
+])
+]) # LC_HAVE_VFS_GETATTR_2ARGS
+
+#
 # LC_HAVE_REMOVE_PROC_SUBTREE
 #
 # 3.10 introduced remove_proc_subtree
@@ -1497,6 +1126,21 @@ security_dentry_init_security, [
 ]) # LC_HAVE_SECURITY_DENTRY_INIT_SECURITY
 
 #
+# 3.10 exports security_inode_listsecurity
+#
+AC_DEFUN([LC_HAVE_SECURITY_INODE_LISTSECURITY], [
+LB_CHECK_COMPILE([if security_inode_listsecurity() is available/exported],
+security_inode_listsecurity, [
+       #include <linux/security.h>
+],[
+       security_inode_listsecurity(NULL, NULL, 0);
+],[
+       AC_DEFINE(HAVE_SECURITY_INODE_LISTSECURITY, 1,
+                 [security_inode_listsecurity() is available/exported])
+])
+]) # LC_HAVE_SECURITY_INODE_LISTSECURITY
+
+#
 # LC_INVALIDATE_RANGE
 #
 # 3.11 invalidatepage requires the length of the range to invalidate
@@ -1754,6 +1398,23 @@ vfs_unlink_3args, [
 ])
 ]) # LC_VFS_UNLINK_3ARGS
 
+# LC_HAVE_D_IS_POSITIVE
+#
+# Kernel version 3.13 b18825a7c8e37a7cf6abb97a12a6ad71af160de7
+# d_is_positive is added
+#
+AC_DEFUN([LC_HAVE_D_IS_POSITIVE], [
+LB_CHECK_COMPILE([if 'd_is_positive' exist],
+d_is_positive, [
+       #include <linux/dcache.h>
+],[
+       d_is_positive(NULL);
+],[
+       AC_DEFINE(HAVE_D_IS_POSITIVE, 1,
+               ['d_is_positive' is available])
+])
+]) # LC_HAVE_D_IS_POSITIVE
+
 #
 # LC_HAVE_BVEC_ITER
 #
@@ -2104,23 +1765,6 @@ bdi_cap_map_copy, [
 ]) # 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
@@ -2173,23 +1817,6 @@ have___bi_cnt, [
 ]) # LC_HAVE___BI_CNT
 
 #
-# 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
@@ -2229,6 +1856,23 @@ bio_endio, [
 ]) # LC_BIO_ENDIO_USES_ONE_ARG
 
 #
+# LC_ACCOUNT_PAGE_DIRTIED_3ARGS
+#
+# 4.2 [to 4.5] kernel page dirtied takes 3 arguments
+#
+AC_DEFUN([LC_ACCOUNT_PAGE_DIRTIED_3ARGS], [
+LB_CHECK_COMPILE([if 'account_page_dirtied' with 3 args exists],
+account_page_dirtied, [
+       #include <linux/mm.h>
+],[
+       account_page_dirtied(NULL, NULL, NULL);
+],[
+       AC_DEFINE(HAVE_ACCOUNT_PAGE_DIRTIED_3ARGS, 1,
+               [account_page_dirtied takes three arguments])
+])
+]) # LC_ACCOUNT_PAGE_DIRTIED_3ARGS
+
+#
 # LC_HAVE_INTERVAL_EXP_BLK_INTEGRITY
 #
 # 4.3 replace interval with interval_exp in 'struct blk_integrity'
@@ -2580,6 +2224,23 @@ EXTRA_KCFLAGS="$tmp_flags"
 ]) # LC_D_IN_LOOKUP
 
 #
+# LC_LOCK_PAGE_MEMCG
+#
+# Kernel version 4.6 adds lock_page_memcg
+#
+AC_DEFUN([LC_LOCK_PAGE_MEMCG], [
+LB_CHECK_COMPILE([if 'lock_page_memcg' is defined],
+lock_page_memcg, [
+       #include <linux/memcontrol.h>
+],[
+       lock_page_memcg(NULL);
+],[
+       AC_DEFINE(HAVE_LOCK_PAGE_MEMCG, 1,
+               [lock_page_memcg is defined])
+])
+]) # LC_LOCK_PAGE_MEMCG
+
+#
 # LC_DIRECTIO_2ARGS
 #
 # Kernel version 4.7 commit c8b8e32d700fe943a935e435ae251364d016c497
@@ -2605,8 +2266,8 @@ direct_io_2args, [
 #
 # LC_GENERIC_WRITE_SYNC_2ARGS
 #
-# Kernel version 4.7 commit c8b8e32d700fe943a935e435ae251364d016c497
-# direct-io: eliminate the offset argument to ->direct_IO
+# Kernel version 4.7 commit dde0c2e79848298cc25621ad080d47f94dbd7cce
+# fs: add IOCB_SYNC and IOCB_DSYNC
 #
 AC_DEFUN([LC_GENERIC_WRITE_SYNC_2ARGS], [
 LB_CHECK_COMPILE([if 'generic_write_sync()' taken 2 arguments],
@@ -2626,7 +2287,7 @@ generic_write_sync_2args, [
 #
 # LC_FOP_ITERATE_SHARED
 #
-# Kernel version 4.7 adds iterate_shared method to file_operations
+# Kernel v4.6-rc3-29-g6192269 adds iterate_shared method to file_operations
 #
 AC_DEFUN([LC_FOP_ITERATE_SHARED], [
 LB_CHECK_COMPILE([if 'file_operations' has 'iterate_shared'],
@@ -2642,29 +2303,6 @@ fop_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
@@ -2957,6 +2595,23 @@ current_time, [
 ]) # LIBCFS_CURRENT_TIME
 
 #
+# Kernel version 4.12-rc3 85787090a21eb749d8b347eaf9ff1a455637473c
+# changed struct super_block s_uuid into a proper uuid_t
+#
+AC_DEFUN([LC_SUPER_BLOCK_S_UUID], [
+LB_CHECK_COMPILE([if 'struct super_block' s_uuid is uuid_t],
+super_block_s_uuid, [
+       #include <linux/fs.h>
+],[
+       struct super_block sb;
+
+       uuid_parse(NULL, &sb.s_uuid);
+],[
+       AC_DEFINE(HAVE_S_UUID_AS_UUID_T, 1, ['s_uuid' is an uuid_t])
+])
+]) # LC_SUPER_BLOCK_S_UUID
+
+#
 # LC_SUPER_SETUP_BDI_NAME
 #
 # Kernel version 4.12 commit 9594caf216dc0fe3e318b34af0127276db661241
@@ -3043,6 +2698,231 @@ bi_bdev, [
 ]) # LC_BI_BDEV
 
 #
+# LC_I_PAGES
+#
+# kernel 4.17 commit b93b016313b3ba8003c3b8bb71f569af91f19fc7
+#
+AC_DEFUN([LC_I_PAGES], [
+LB_CHECK_COMPILE([if struct address_space has i_pages],
+i_pages, [
+       #include <linux/fs.h>
+],[
+       struct address_space mapping = {};
+       void *i_pages;
+
+       i_pages = &mapping.i_pages;
+],[
+       AC_DEFINE(HAVE_I_PAGES, 1,
+               [struct address_space has i_pages])
+])
+]) # LC_I_PAGES
+
+#
+# LC_VM_FAULT_T
+#
+# kernel 4.17 commit 3d3539018d2cbd12e5af4a132636ee7fd8d43ef0
+# mm: create the new vm_fault_t type
+#
+AC_DEFUN([LC_VM_FAULT_T], [
+LB_CHECK_COMPILE([if vm_fault_t type exists],
+vm_fault_t, [
+       #include <linux/mm_types.h>
+],[
+       vm_fault_t x = VM_FAULT_SIGBUS;
+       (void)x
+],[
+       AC_DEFINE(HAVE_VM_FAULT_T, 1,
+               [if vm_fault_t type exists])
+])
+]) # LC_VM_FAULT_T
+
+#
+# LC_INODE_TIMESPEC64
+#
+# kernel 4.17-rc7 commit 8efd6894ff089adeeac7cb9f32125b85d963d1bc
+# fs: add timespec64_truncate()
+# kernel 4.18 commit 95582b00838837fc07e042979320caf917ce3fe6
+# inode timestamps switched to timespec64
+# kernel 4.19-rc2 commit 976516404ff3fab2a8caa8bd6f5efc1437fed0b8
+# y2038: remove unused time interfaces
+# ...
+#  timespec_trunc
+# ...
+# When inode times are timespec64 stop using the deprecated
+# time interfaces.
+#
+AC_DEFUN([LC_INODE_TIMESPEC64], [
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_CHECK_COMPILE([if inode timestamps are struct timespec64],
+inode_timespec64, [
+       #include <linux/fs.h>
+],[
+       struct inode *inode = NULL;
+       struct timespec64 ts = {};
+
+       inode->i_atime = timespec64_trunc(ts, 1);
+       (void)inode;
+],[
+       AC_DEFINE(HAVE_INODE_TIMESPEC64, 1,
+               [inode times are using timespec64])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+]) # LC_INODE_TIMESPEC64
+
+#
+# LC___XA_SET_MARK
+#
+# kernel 4.20 commit v4.19-rc5-248-g9b89a0355144
+# xarray: Add XArray marks
+#
+AC_DEFUN([LC___XA_SET_MARK], [
+LB_CHECK_COMPILE([if '__xa_set_mark' exists],
+__xa_set_mark, [
+       #include <linux/xarray.h>
+       #include <linux/fs.h>
+],[
+       struct xarray *xa = NULL;
+
+       __xa_set_mark(xa, 0, PAGECACHE_TAG_DIRTY);
+],[
+       AC_DEFINE(HAVE___XA_SET_MARK, 1,
+               [__xa_set_mark exists])
+])
+]) # LC___XA_SET_MARK
+
+#
+# LC_UAPI_LINUX_MOUNT_H
+#
+# kernel 4.20 commit e262e32d6bde0f77fb0c95d977482fc872c51996
+# vfs: Suppress MS_* flag defs within the kernel ...
+#
+AC_DEFUN([LC_UAPI_LINUX_MOUNT_H], [
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_CHECK_COMPILE([if MS_RDONLY was moved to uapi/linux/mount.h],
+uapi_linux_mount, [
+       #include <uapi/linux/mount.h>
+],[
+       int x = MS_RDONLY;
+       (void)x;
+],[
+       AC_DEFINE(HAVE_UAPI_LINUX_MOUNT_H, 1,
+               [if MS_RDONLY was moved to uapi/linux/mount.h])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+]) # LC_UAPI_LINUX_MOUNT_H
+
+#
+# LC_HAVE_SUNRPC_CACHE_HASH_LOCK_IS_A_SPINLOCK
+#
+# kernel 4.20 commit 1863d77f15da0addcd293a1719fa5d3ef8cde3ca
+# SUNRPC: Replace the cache_detail->hash_lock with a regular spinlock
+#
+# Now that the reader functions are all RCU protected, use a regular
+# spinlock rather than a reader/writer lock.
+#
+AC_DEFUN([LC_HAVE_SUNRPC_CACHE_HASH_LOCK_IS_A_SPINLOCK], [
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_CHECK_COMPILE([if cache_detail->hash_lock is a spinlock],
+hash_lock_isa_spinlock_t, [
+       #include <linux/sunrpc/cache.h>
+],[
+       spinlock_t *lock = &(((struct cache_detail *)0)->hash_lock);
+       spin_lock(lock);
+],[
+       AC_DEFINE(HAVE_CACHE_HASH_SPINLOCK, 1,
+               [if cache_detail->hash_lock is a spinlock])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+]) # LC_HAVE_SUNRPC_CACHE_HASH_LOCK_IS_A_SPINLOCK
+
+#
+# LC_HAS_LINUX_SELINUX_ENABLED
+#
+# kernel 5.1 commit 3d252529480c68bfd6a6774652df7c8968b28e41
+# SELinux: Remove unused selinux_is_enabled
+#
+AC_DEFUN([LC_HAS_LINUX_SELINUX_ENABLED], [
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_CHECK_COMPILE([if linux/selinux.h exists],
+selinux_is_enabled, [
+       #include <linux/selinux.h>
+],[
+       bool has_selinux = selinux_is_enabled();
+       (void)has_selinux;
+],[
+       AC_DEFINE(HAVE_LINUX_SELINUX_IS_ENABLED, 1,
+               [if linux/selinux.h exists])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+]) # LC_HAS_LINUX_SELINUX_ENABLED
+
+#
+# LC_ACCOUNT_PAGE_DIRTIED
+#
+# After 5.2 kernel page dirtied is not exported
+#
+AC_DEFUN([LC_ACCOUNT_PAGE_DIRTIED], [
+LB_CHECK_COMPILE([if 'account_page_dirtied' is exported],
+account_page_dirtied, [
+       #include <linux/mm.h>
+],[
+       account_page_dirtied(NULL, NULL);
+],[
+       AC_DEFINE(HAVE_ACCOUNT_PAGE_DIRTIED, 1,
+               [account_page_dirtied is available])
+])
+]) # LC_ACCOUNT_PAGE_DIRTIED
+
+#
+# LC_BIO_BI_PHYS_SEGMENTS
+#
+# kernel 5.3-rc1 commit 14ccb66b3f585b2bc21e7256c96090abed5a512c
+# block: remove the bi_phys_segments field in struct bio
+#
+AC_DEFUN([LC_BIO_BI_PHYS_SEGMENTS], [
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_CHECK_COMPILE([if struct bio has bi_phys_segments member],
+bye_bio_bi_phys_segments, [
+       #include <linux/bio.h>
+],[
+       struct bio *bio = NULL;
+       bio->bi_phys_segments++;
+],[
+       AC_DEFINE(HAVE_BIO_BI_PHYS_SEGMENTS, 1,
+               [struct bio has bi_phys_segments member])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+]) # LC_BIO_BI_PHYS_SEGMENTS
+
+#
+# LC_LM_COMPARE_OWNER_EXISTS
+#
+# kernel 5.3-rc3 commit f85d93385e9fe6886a751f647f6812a89bf6bee3
+# locks: Cleanup lm_compare_owner and lm_owner_key
+# removed lm_compare_owner
+#
+AC_DEFUN([LC_LM_COMPARE_OWNER_EXISTS], [
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_CHECK_COMPILE([if lock_manager_operations has lm_compare_owner],
+lock_manager_ops_lm_compare_owner, [
+       #include <linux/fs.h>
+],[
+       struct lock_manager_operations lm_ops;
+       lm_ops.lm_compare_owner = NULL;
+],[
+       AC_DEFINE(HAVE_LM_COMPARE_OWNER, 1,
+               [lock_manager_operations has lm_compare_owner])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+]) # LC_LM_COMPARE_OWNER_EXISTS
+
+#
 # LC_PROG_LINUX
 #
 # Lustre linux kernel checks
@@ -3062,44 +2942,12 @@ AC_DEFUN([LC_PROG_LINUX], [
        LC_OPENSSL_SSK
        LC_OPENSSL_GETSEPOL
 
-       # 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
-       LC_EXPORT_SIMPLE_SETATTR
-       LC_EXPORT_TRUNCATE_COMPLETE_PAGE
-
-       # 2.6.36
-       LC_FS_STRUCT_RWLOCK
-       LC_SBOPS_EVICT_INODE
-
-       # 2.6.37
-       LC_KERNEL_LOCKED
-       LC_FS_STRUCT_SEQCOUNT
-
-       # 2.6.38
-       LC_BLKDEV_GET_BY_DEV
-       LC_GENERIC_PERMISSION
-       LC_DCACHE_LOCK
-       LC_INODE_I_RCU
-       LC_D_COMPARE_7ARGS
-       LC_D_DELETE_CONST
-       LC_HAVE_BLK_PLUG
-
        # 2.6.39
        LC_HAVE_FHANDLE_SYSCALLS
        LC_HAVE_FSTYPE_MOUNT
        LC_HAVE_INODE_OWNER_OR_CAPABLE
        LC_HAVE_SECURITY_IINITSEC
+       LC_VFS_CREATE_USE_NAMEIDATA
 
        # 3.0
        LC_DIRTY_INODE_WITH_FLAG
@@ -3151,12 +2999,14 @@ AC_DEFUN([LC_PROG_LINUX], [
        LC_HAVE_HLIST_FOR_EACH_3ARG
        LC_HAVE_BIO_END_SECTOR
        LC_HAVE_IS_SXID
+       LC_HAVE_VFS_GETATTR_2ARGS
 
        # 3.10
        LC_HAVE_REMOVE_PROC_SUBTREE
        LC_HAVE_PROC_REMOVE
        LC_HAVE_PROJECT_QUOTA
        LC_HAVE_SECURITY_DENTRY_INIT_SECURITY
+       LC_HAVE_SECURITY_INODE_LISTSECURITY
 
        # 3.11
        LC_INVALIDATE_RANGE
@@ -3176,6 +3026,7 @@ AC_DEFUN([LC_PROG_LINUX], [
        # 3.13
        LC_VFS_RENAME_5ARGS
        LC_VFS_UNLINK_3ARGS
+       LC_HAVE_D_IS_POSITIVE
 
        # 3.14
        LC_HAVE_BVEC_ITER
@@ -3208,18 +3059,15 @@ AC_DEFUN([LC_PROG_LINUX], [
        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
        LC_HAVE___BI_CNT
 
        # 4.2
-       LC_NEW_CANCEL_DIRTY_PAGE
        LC_BIO_ENDIO_USES_ONE_ARG
        LC_SYMLINK_OPS_USE_NAMEIDATA
+       LC_ACCOUNT_PAGE_DIRTIED_3ARGS
 
        # 4.3
        LC_HAVE_INTERVAL_EXP_BLK_INTEGRITY
@@ -3245,12 +3093,13 @@ AC_DEFUN([LC_PROG_LINUX], [
        # 4.6
        LC_HAVE_IN_COMPAT_SYSCALL
        LC_HAVE_XATTR_HANDLER_INODE_PARAM
+       LC_LOCK_PAGE_MEMCG
 
        # 4.7
        LC_D_IN_LOOKUP
        LC_DIRECTIO_2ARGS
        LC_GENERIC_WRITE_SYNC_2ARGS
-       LC_FOPS_ITERATE_SHARED
+       LC_FOP_ITERATE_SHARED
 
        # 4.8
        LC_HAVE_POSIX_ACL_VALID_USER_NS
@@ -3276,6 +3125,7 @@ AC_DEFUN([LC_PROG_LINUX], [
 
        # 4.12
        LC_CURRENT_TIME
+       LC_SUPER_BLOCK_S_UUID
        LC_SUPER_SETUP_BDI_NAME
        LC_BI_STATUS
 
@@ -3286,15 +3136,37 @@ AC_DEFUN([LC_PROG_LINUX], [
        LC_PAGEVEC_INIT_ONE_PARAM
        LC_BI_BDEV
 
+       # 4.17
+       LC_VM_FAULT_T
+       LC_I_PAGES
+
+       # 4.18
+       LC_INODE_TIMESPEC64
+
+       # 4.20
+       LC___XA_SET_MARK
+       LC_UAPI_LINUX_MOUNT_H
+       LC_HAVE_SUNRPC_CACHE_HASH_LOCK_IS_A_SPINLOCK
+
+       # 5.1
+       LC_HAS_LINUX_SELINUX_ENABLED
+
+       # 5.2
+       LC_ACCOUNT_PAGE_DIRTIED
+
+       # 5.3
+       LC_BIO_BI_PHYS_SEGMENTS
+       LC_LM_COMPARE_OWNER_EXISTS
+
        # kernel patch to extend integrity interface
        LC_BIO_INTEGRITY_PREP_FN
 
        #
        AS_IF([test "x$enable_server" != xno], [
                LC_STACK_SIZE
-               LC_QUOTA64
                LC_QUOTA_CONFIG
        ])
+       LC_POSIX_ACL_CONFIG
 ]) # LC_PROG_LINUX
 
 #
@@ -3322,17 +3194,21 @@ AC_ARG_ENABLE([mpitests],
                case $enableval in
                yes)
                        MPICC_WRAPPER="mpicc"
+                       MPI_BIN=$(eval which $MPICC_WRAPPER | xargs dirname)
                        ;;
                no)
                        enable_mpitests="no"
+                       MPI_BIN=""
                        ;;
                *)
                        MPICC_WRAPPER=$enableval
+                       MPI_BIN=$(eval echo $MPICC_WRAPPER | xargs dirname)
                        ;;
                esac
        ], [
                enable_mpitests="yes"
                MPICC_WRAPPER="mpicc"
+               MPI_BIN=$(eval which $MPICC_WRAPPER | xargs dirname)
        ])
 
        if test "x$enable_mpitests" != "xno"; then
@@ -3351,6 +3227,7 @@ AC_ARG_ENABLE([mpitests],
                enable_mpitests=$lb_cv_mpi_tests
                CC=$oldcc
        fi
+       AC_SUBST(MPI_BIN)
        AC_SUBST(MPICC_WRAPPER)
 ]) # LB_CONFIG_MPITESTS
 
@@ -3418,7 +3295,7 @@ AS_IF([test $ENABLEOSDADDON -eq 0], [
                OSDADDON=""
        ], [ln -s $OSDADDON $LUSTRE/$OSDMODNAME], [
                AC_MSG_RESULT([$OSDMODNAME])
-               OSDADDON="subdir-m += $OSDMODNAME"
+               OSDADDON="obj-m += $OSDMODNAME/"
        ], [
                AC_MSG_RESULT([can't link])
                OSDADDON=""
@@ -3451,22 +3328,22 @@ LC_MDS_MAX_THREADS
 AC_CHECK_HEADERS([netdb.h endian.h])
 AC_CHECK_FUNCS([gethostbyname])
 
-# lustre/utils/llverdev.c
-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.])
+AS_IF([test "$enable_dist" = "no"], [
+               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],
                        [SELINUX="-lselinux"
@@ -3550,6 +3427,23 @@ AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitd
 AS_IF([test "x$with_systemdsystemunitdir" != "xno"],
        [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])])
 AC_MSG_RESULT([$with_systemdsystemunitdir])
+
+AC_MSG_CHECKING([bash-completion directory])
+AC_ARG_WITH([bash-completion-dir],
+       AS_HELP_STRING([--with-bash-completion-dir[=PATH]],
+               [Install the bash auto-completion script in this directory.]),
+       [],
+       [with_bash_completion_dir=yes])
+AS_IF([test "x$with_bash_completion_dir" = "xyes"], [
+       BASH_COMPLETION_DIR="`pkg-config --variable=completionsdir bash-completion`"
+       AS_IF([test "x$BASH_COMPLETION_DIR" = "x"], [
+               [BASH_COMPLETION_DIR="$datadir/bash-completion/completions"]
+       ])
+], [
+       BASH_COMPLETION_DIR="$with_bash_completion_dir"
+])
+AC_SUBST([BASH_COMPLETION_DIR])
+AC_MSG_RESULT([$BASH_COMPLETION_DIR])
 ]) # LC_CONFIGURE
 
 #
@@ -3562,7 +3456,6 @@ 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)
 AM_CONDITIONAL(SPLIT, test x$enable_split = xyes)
-AM_CONDITIONAL(BLKID, test x$ac_cv_header_blkid_blkid_h = xyes)
 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)
@@ -3570,6 +3463,7 @@ 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(HAVE_SYSTEMD, test "x$with_systemdsystemunitdir" != "xno")
+AM_CONDITIONAL(ENABLE_BASH_COMPLETION, test "x$with_bash_completion_dir" != "xno")
 AM_CONDITIONAL(XATTR_HANDLER, test "x$lb_cv_compile_xattr_handler_flags" = xyes)
 AM_CONDITIONAL(SELINUX, test "$SELINUX" = "-lselinux")
 AM_CONDITIONAL(GETSEPOL, test x$enable_getsepol = xyes)
@@ -3592,17 +3486,13 @@ lustre/doc/Makefile
 lustre/include/Makefile
 lustre/include/lustre/Makefile
 lustre/include/uapi/linux/lustre/Makefile
+lustre/kernel_patches/targets/4.18-rhel8.1.target
+lustre/kernel_patches/targets/4.18-rhel8.target
+lustre/kernel_patches/targets/3.10-rhel7.7.target
 lustre/kernel_patches/targets/3.10-rhel7.6.target
 lustre/kernel_patches/targets/3.10-rhel7.5.target
 lustre/kernel_patches/targets/4.14-rhel7.5.target
 lustre/kernel_patches/targets/4.14-rhel7.6.target
-lustre/kernel_patches/targets/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
@@ -3610,9 +3500,6 @@ lustre/kernel_patches/targets/3.12-sles12.target
 lustre/kernel_patches/targets/4.4-sles12.target
 lustre/kernel_patches/targets/4.4-sles12sp3.target
 lustre/kernel_patches/targets/4.12-sles12sp4.target
-lustre/kernel_patches/targets/2.6-fc11.target
-lustre/kernel_patches/targets/2.6-fc12.target
-lustre/kernel_patches/targets/2.6-fc15.target
 lustre/kernel_patches/targets/3.x-fc18.target
 lustre/ldlm/Makefile
 lustre/fid/Makefile