X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fautoconf%2Flustre-core.m4;h=22ed68a00786ae5ab11635dd4c68792e48961058;hb=39e5bfa73414d18738001761b42ea0e3264c2983;hp=086d574cac8f6819bf18dad95bafdbf20cd7ef2e;hpb=c61168239eff571aefc2a695ef12ae355230e611;p=fs%2Flustre-release.git diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 086d574..22ed68a 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -123,6 +123,22 @@ AS_IF([test "x$enable_checksum" != xno], ]) # LC_CONFIG_CHECKSUM # +# LC_CONFIG_FLOCK +# +# enable distributed flock by default +# +AC_DEFUN([LC_CONFIG_FLOCK], [ +AC_MSG_CHECKING([whether to enable flock by default]) +AC_ARG_ENABLE([flock], + AC_HELP_STRING([--disable-flock], + [disable flock by default]), + [], [enable_flock="yes"]) +AC_MSG_RESULT([$enable_flock]) +AS_IF([test "x$enable_flock" != xno], + [AC_DEFINE(ENABLE_FLOCK, 1, [enable flock by default])]) +]) # LC_CONFIG_FLOCK + +# # LC_CONFIG_HEALTH_CHECK_WRITE # # Turn off the actual write to the disk @@ -340,6 +356,31 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([ AC_MSG_RESULT([$enable_ssk]) ]) # LC_OPENSSL_SSK +# LC_OPENSSL_GETSEPOL +# +# OpenSSL is needed for l_getsepol +AC_DEFUN([LC_OPENSSL_GETSEPOL], [ +AC_MSG_CHECKING([whether openssl-devel is present]) +AC_COMPILE_IFELSE([AC_LANG_SOURCE([ + #include + + int main(void) { + EVP_MD_CTX *mdctx = EVP_MD_CTX_create(); + } +])],[ + AC_DEFINE(HAVE_OPENSSL_GETSEPOL, 1, [openssl-devel is present]) + enable_getsepol="yes" + +],[ + enable_getsepol="no" + AC_MSG_WARN([ + +No openssk-devel headers found, unable to build l_getsepol and SELinux status checking +]) +]) +AC_MSG_RESULT([$enable_getsepol]) +]) # LC_OPENSSL_GETSEPOL + # LC_INODE_PERMISION_2ARGS # # up to v2.6.27 had a 3 arg version (inode, mask, nameidata) @@ -363,376 +404,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 -],[ - 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 -],[ - 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 - #include -],[ - ((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 - #include - ],[ - ((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 -],[ - 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 - #include - #if defined(HAVE_FS_QUOTA_QUOTAIO_H) - #include - struct v2r1_disk_dqblk dqblk_r1; - #else - #include - 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 -],[ - 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 - #include - #include -],[ - 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 -],[ - ((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 -],[ - ((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 - ],[ - ((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 -],[ - 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 -],[ - ((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 -],[ - ((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 -],[ - 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 -],[ - 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 -],[ - 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 -],[ - 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 -# -AC_DEFUN([LC_IOP_TRUNCATE], [ -LB_CHECK_COMPILE([if 'inode_operations' has '.truncate' member function], -inode_ops_truncate, [ - #include -],[ - ((struct inode_operations *)0)->truncate(NULL); -],[ - AC_DEFINE(HAVE_INODEOPS_TRUNCATE, 1, - [inode_operations has .truncate member function]) -]) -]) # LC_IOP_TRUNCATE - -# # LC_HAVE_FSTYPE_MOUNT # # 2.6.39 replace get_sb with mount in struct file_system_type @@ -815,37 +486,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 -],[ - 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 - ],[ - 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 @@ -977,6 +617,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 + #include +],[ + 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 @@ -1406,6 +1063,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 +],[ + 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 @@ -1473,6 +1147,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 +],[ + 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 @@ -1730,6 +1419,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 +],[ + 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 # @@ -1770,81 +1476,6 @@ inode_ops_set_acl, [ ]) # 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 - #include -],[ - struct bio bio = { }; - int cnt; - cnt = atomic_read(&bio.bi_cnt); -], [ - AC_DEFINE(HAVE_BI_CNT, 1, - [struct bio has bi_cnt]) -]) -]) # LC_HAVE_BI_CNT - -# -# LC_HAVE_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 -],[ - struct bio bio; - - bio.bi_rw = 0; -], [ - AC_DEFINE(HAVE_BI_RW, 1, - [struct bio has bi_rw]) -]) -]) # LC_HAVE_BI_RW - -# -# LC_HAVE_SUBMIT_BIO_2ARGS -# -# 4.4 removed an argument from submit_bio -# -AC_DEFUN([LC_HAVE_SUBMIT_BIO_2ARGS], [ -LB_CHECK_COMPILE([if submit_bio takes two arguments], -have_submit_bio_2args, [ - #include -],[ - 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 -],[ - 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 @@ -2203,6 +1834,27 @@ LB_CHECK_EXPORT([new_sync_read], [fs/read_write.c], ]) # LC_HAVE_SYNC_READ_WRITE # +# LC_HAVE___BI_CNT +# +# 4.1 redefined bi_cnt as __bi_cnt in commit dac56212e8127dbc0 +# +AC_DEFUN([LC_HAVE___BI_CNT], [ +LB_CHECK_COMPILE([if Linux kernel has __bi_cnt in struct bio], +have___bi_cnt, [ + #include + #include + #include +],[ + struct bio bio = { }; + int cnt; + cnt = atomic_read(&bio.__bi_cnt); +], [ + AC_DEFINE(HAVE___BI_CNT, 1, + [struct bio has __bi_cnt]) +]) +]) # LC_HAVE___BI_CNT + +# # LC_NEW_CANCEL_DIRTY_PAGE # # 4.2 kernel has new cancel_dirty_page @@ -2382,6 +2034,62 @@ bio_integrity_prep_fn, [ ]) # LC_BIO_INTEGRITY_PREP_FN # +# LC_HAVE_BI_OPF +# +# 4.4/4.8 redefined bi_rw as bi_opf (SLES12/kernel commit 4382e33ad37486) +# +AC_DEFUN([LC_HAVE_BI_OPF], [ +LB_CHECK_COMPILE([if Linux kernel has bi_opf in struct bio], +have_bi_opf, [ + #include +],[ + struct bio bio; + + bio.bi_opf = 0; +], [ + AC_DEFINE(HAVE_BI_OPF, 1, + [struct bio has bi_opf]) +]) +]) # LC_HAVE_BI_OPF + +# +# 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 +],[ + 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/4.9 unmap_underlying_metadata was replaced by clean_bdev_aliases +# (SLES12/kernel commit 29f3ad7d8380364c) +# +AC_DEFUN([LC_HAVE_CLEAN_BDEV_ALIASES], [ +LB_CHECK_COMPILE([if kernel has clean_bdev_aliases], +have_clean_bdev_aliases, [ + #include +],[ + 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_LOCKS_LOCK_FILE_WAIT # # 4.4 kernel have moved locks API users to @@ -2532,6 +2240,28 @@ EXTRA_KCFLAGS="$tmp_flags" ]) # LC_HAVE_XATTR_HANDLER_INODE_PARAM # +# LC_D_IN_LOOKUP +# +# Kernel version 4.6 commit 85c7f81041d57cfe9dc97f4680d5586b54534a39 +# introduced parallel lookups in the VFS layer. The inline function +# d_in_lookup was added to notify when the same item was being queried +# at the same time. +# +AC_DEFUN([LC_D_IN_LOOKUP], [ +tmp_flags="$EXTRA_KCFLAGS" +EXTRA_KCFLAGS="-Werror" +LB_CHECK_COMPILE([if 'd_in_lookup' is defined], +d_in_lookup, [ + #include +],[ + d_in_lookup(NULL); +],[ + AC_DEFINE(HAVE_D_IN_LOOKUP, 1, [d_in_lookup is defined]) +]) +EXTRA_KCFLAGS="$tmp_flags" +]) # LC_D_IN_LOOKUP + +# # LC_DIRECTIO_2ARGS # # Kernel version 4.7 commit c8b8e32d700fe943a935e435ae251364d016c497 @@ -2557,8 +2287,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], @@ -2909,6 +2639,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 +],[ + 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 @@ -2944,6 +2691,28 @@ bi_status, [ ]) # LC_BI_STATUS # +# 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 +],[ + 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_BIO_INTEGRITY_ENABLED # # 4.13 removed bio_integrity_enabled @@ -2995,6 +2764,101 @@ 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 +],[ + 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 +],[ + 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 +],[ + struct inode inode = {}; + 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_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 +],[ + 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_PROG_LINUX # # Lustre linux kernel checks @@ -3005,52 +2869,24 @@ AC_DEFUN([LC_PROG_LINUX], [ LC_CONFIG_PINGER LC_CONFIG_CHECKSUM + LC_CONFIG_FLOCK 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 + LC_OPENSSL_GETSEPOL # 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_IOP_TRUNCATE LC_HAVE_INODE_OWNER_OR_CAPABLE LC_HAVE_SECURITY_IINITSEC + LC_VFS_CREATE_USE_NAMEIDATA # 3.0 LC_DIRTY_INODE_WITH_FLAG @@ -3102,12 +2938,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 @@ -3127,6 +2965,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 @@ -3165,6 +3004,7 @@ AC_DEFUN([LC_PROG_LINUX], [ # 4.1.0 LC_IOV_ITER_RW LC_HAVE_SYNC_READ_WRITE + LC_HAVE___BI_CNT # 4.2 LC_NEW_CANCEL_DIRTY_PAGE @@ -3181,8 +3021,7 @@ AC_DEFUN([LC_PROG_LINUX], [ LC_HAVE_LOCKS_LOCK_FILE_WAIT LC_HAVE_KEY_PAYLOAD_DATA_ARRAY LC_HAVE_XATTR_HANDLER_NAME - LC_HAVE_BI_CNT - LC_HAVE_BI_RW + LC_HAVE_BI_OPF LC_HAVE_SUBMIT_BIO_2ARGS LC_HAVE_CLEAN_BDEV_ALIASES @@ -3198,6 +3037,7 @@ AC_DEFUN([LC_PROG_LINUX], [ LC_HAVE_XATTR_HANDLER_INODE_PARAM # 4.7 + LC_D_IN_LOOKUP LC_DIRECTIO_2ARGS LC_GENERIC_WRITE_SYNC_2ARGS LC_FOPS_ITERATE_SHARED @@ -3226,6 +3066,7 @@ AC_DEFUN([LC_PROG_LINUX], [ # 4.12 LC_CURRENT_TIME + LC_SUPER_BLOCK_S_UUID LC_SUPER_SETUP_BDI_NAME LC_BI_STATUS @@ -3236,6 +3077,19 @@ 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 + + # 5.0 + LC_UAPI_LINUX_MOUNT_H + + # 5.1 + LC_HAS_LINUX_SELINUX_ENABLED + # kernel patch to extend integrity interface LC_BIO_INTEGRITY_PREP_FN @@ -3272,17 +3126,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 @@ -3301,6 +3159,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 @@ -3408,12 +3267,14 @@ AC_CHECK_HEADERS([blkid/blkid.h]) 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="" @@ -3522,6 +3383,7 @@ AM_CONDITIONAL(LIBPTHREAD, test x$enable_libpthread = xyes) AM_CONDITIONAL(HAVE_SYSTEMD, test "x$with_systemdsystemunitdir" != "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) ]) # LC_CONDITIONALS # @@ -3541,26 +3403,18 @@ lustre/doc/Makefile lustre/include/Makefile lustre/include/lustre/Makefile lustre/include/uapi/linux/lustre/Makefile +lustre/kernel_patches/targets/4.18-rhel8.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 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 +lustre/kernel_patches/targets/4.12-sles12sp4.target lustre/kernel_patches/targets/3.x-fc18.target lustre/ldlm/Makefile lustre/fid/Makefile