X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fautoconf%2Flustre-core.m4;h=daed428f9f98b0793f4f1c4cafff656d8c0b6e9e;hb=04a38ba7cda4e242850a47b13d4402a69e8dd921;hp=9c84f4172915aac97b214a26f74d5f5bc1fddc7d;hpb=931ae518f564c2ea16677f176dbaa0da2c28897a;p=fs%2Flustre-release.git diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 9c84f41..daed428 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -1,5 +1,3 @@ -#* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- -#* vim:expandtab:shiftwidth=8:tabstop=8: # # LC_CONFIG_SRCDIR # @@ -85,23 +83,6 @@ AC_TRY_COMPILE([ ]) # -# only for Lustre-patched kernels -# -AC_DEFUN([LC_LUSTRE_VERSION_H], -[LB_CHECK_FILE([$LINUX/include/linux/lustre_version.h],[ - rm -f "$LUSTRE/include/linux/lustre_version.h" -],[ - touch "$LUSTRE/include/linux/lustre_version.h" - if test x$enable_server = xyes ; then - AC_MSG_WARN([Unpatched kernel detected.]) - AC_MSG_WARN([Lustre servers cannot be built with an unpatched kernel;]) - AC_MSG_WARN([disabling server build]) - enable_server='no' - fi -]) -]) - -# # LC_FUNC_DEV_SET_RDONLY # # check whether dev_set_rdonly is exported. This is needed until we @@ -226,17 +207,13 @@ if test x$enable_lru_resize != xno; then fi ]) -# whether to enable quota support(kernel modules) -AC_DEFUN([LC_QUOTA_MODULE], -[if test x$enable_quota != xno; then - LB_LINUX_CONFIG([QUOTA],[ - enable_quota_module='yes' - AC_DEFINE(HAVE_QUOTA_SUPPORT, 1, [Enable quota support]) - ],[ - enable_quota_module='no' - AC_MSG_WARN([quota is not enabled because the kernel - lacks quota support]) - ]) -fi +# +# Quota support. The kernel must support CONFIG_QUOTA. +# +AC_DEFUN([LC_QUOTA_CONFIG], +[LB_LINUX_CONFIG_IM([QUOTA],[AC_DEFINE(HAVE_QUOTA_SUPPORT, 1, [support quota])],[ + AC_MSG_ERROR([Lustre quota requires that CONFIG_QUOTA is enabled in your kernel.]) +]) ]) # truncate_complete_page() was exported from RHEL5/SLES10, but not in SLES11 SP0 (2.6.27) @@ -379,24 +356,6 @@ AC_TRY_RUN([ CFLAGS="$tmp_flags" ]) -# added in 2.6.16 -# -AC_DEFUN([LC_STRUCT_INTENT_FILE], -[AC_MSG_CHECKING([if struct open_intent has a file field]) -LB_LINUX_TRY_COMPILE([ - #include - #include -],[ - struct open_intent intent; - &intent.file; -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_FILE_IN_STRUCT_INTENT, 1, [struct open_intent has a file field]) -],[ - AC_MSG_RESULT([no]) -]) -]) - # # LC_CAPA_CRYPTO # @@ -447,25 +406,9 @@ AC_DEFUN([LC_CONFIG_GSS_KEYRING], fi ]) -AC_DEFUN([LC_SUNRPC_CACHE], -[AC_MSG_CHECKING([if sunrpc struct cache_head uses kref]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct cache_head ch; - &ch.ref.refcount; -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_SUNRPC_CACHE_V2, 1, [sunrpc cache facility v2]) -],[ - AC_MSG_RESULT([no]) -]) -]) - AC_DEFUN([LC_CONFIG_SUNRPC], [LB_LINUX_CONFIG_IM([SUNRPC],[], [AC_MSG_ERROR([kernel SUNRPC support is required by using GSS.])]) - LC_SUNRPC_CACHE ]) # @@ -508,50 +451,6 @@ AC_DEFUN([LC_CONFIG_GSS], fi ]) -# -# LC_FUNC_HAVE_CAN_SLEEP_ARG -# -# 2.6.5 kernel has third arg can_sleep in fs/locks.c: flock_lock_file_wait() -# -AC_DEFUN([LC_FUNC_HAVE_CAN_SLEEP_ARG], -[AC_MSG_CHECKING([if kernel has third arg can_sleep in fs/locks.c: flock_lock_file_wait()]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - int cansleep; - struct file *file; - struct file_lock *file_lock; - flock_lock_file_wait(file, file_lock, cansleep); -],[ - AC_DEFINE(HAVE_CAN_SLEEP_ARG, 1, - [kernel has third arg can_sleep in fs/locks.c: flock_lock_file_wait()]) - AC_MSG_RESULT([yes]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# -# LC_FUNC_F_OP_FLOCK -# -# rhel4.2 kernel has f_op->flock field -# -AC_DEFUN([LC_FUNC_F_OP_FLOCK], -[AC_MSG_CHECKING([if struct file_operations has flock field]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct file_operations ll_file_operations_flock; - ll_file_operations_flock.flock = NULL; -],[ - AC_DEFINE(HAVE_F_OP_FLOCK, 1, - [struct file_operations has flock field]) - AC_MSG_RESULT([yes]) -],[ - AC_MSG_RESULT([no]) -]) -]) - AC_DEFUN([LC_QUOTA_READ], [AC_MSG_CHECKING([if kernel supports quota_read]) LB_LINUX_TRY_COMPILE([ @@ -572,17 +471,16 @@ LB_LINUX_TRY_COMPILE([ # # kernel 2.6.13+ ->follow_link returns a cookie # - AC_DEFUN([LC_COOKIE_FOLLOW_LINK], [AC_MSG_CHECKING([if inode_operations->follow_link returns a cookie]) LB_LINUX_TRY_COMPILE([ #include #include ],[ - struct dentry dentry; + struct dentry *dentry = NULL; struct nameidata nd; - dentry.d_inode->i_op->put_link(&dentry, &nd, NULL); + dentry->d_inode->i_op->put_link(dentry, &nd, NULL); ],[ AC_DEFINE(HAVE_COOKIE_FOLLOW_LINK, 1, [inode_operations->follow_link returns a cookie]) AC_MSG_RESULT([yes]) @@ -664,9 +562,9 @@ AC_DEFUN([LC_S_TIME_GRAN], LB_LINUX_TRY_COMPILE([ #include ],[ - struct super_block sb; + struct super_block *sb = NULL; - return sb.s_time_gran; + return sb->s_time_gran; ],[ AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_S_TIME_GRAN, 1, [super block has s_time_gran member]) @@ -742,12 +640,9 @@ AC_DEFUN([LC_SECURITY_PLUG], [AC_MSG_CHECKING([If kernel has security plug support]) LB_LINUX_TRY_COMPILE([ #include + #include ],[ - struct dentry *dentry; - struct vfsmount *mnt; - struct iattr *iattr; - - notify_change(dentry, mnt, iattr); + notify_change(NULL, NULL, NULL); ],[ AC_MSG_RESULT(yes) AC_DEFINE(HAVE_SECURITY_PLUG, 1, @@ -840,47 +735,8 @@ LB_LINUX_TRY_COMPILE([ EXTRA_KCFLAGS="$tmp_flags" ]) -# -# LC_VFS_KERN_MOUNT -# starting from 2.6.18 kernel don't export do_kern_mount -# and want to use vfs_kern_mount instead. -# -AC_DEFUN([LC_VFS_KERN_MOUNT], -[AC_MSG_CHECKING([vfs_kern_mount exist in kernel]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - vfs_kern_mount(NULL, 0, NULL, NULL); -],[ - AC_DEFINE(HAVE_VFS_KERN_MOUNT, 1, - [vfs_kern_mount exist in kernel]) - AC_MSG_RESULT([yes]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# -# LC_INVALIDATEPAGE_RETURN_INT -# 2.6.17 changes return type for invalidatepage to 'void' from 'int' -# -AC_DEFUN([LC_INVALIDATEPAGE_RETURN_INT], -[AC_MSG_CHECKING([invalidatepage has return int]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - int rc = block_invalidatepage(NULL, 0); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_INVALIDATEPAGE_RETURN_INT, 1, - [Define if return type of invalidatepage should be int]) -],[ - AC_MSG_RESULT(no) -]) -]) - # LC_UMOUNTBEGIN_HAS_VFSMOUNT -# after 2.6.18 umount_begin has different parameters +# 2.6.18~2.6.25 umount_begin has different parameters AC_DEFUN([LC_UMOUNTBEGIN_HAS_VFSMOUNT], [AC_MSG_CHECKING([if umount_begin needs vfsmount parameter instead of super_block]) tmp_flags="$EXTRA_KCFLAGS" @@ -909,39 +765,6 @@ LB_LINUX_TRY_COMPILE([ EXTRA_KCFLAGS="$tmp_flags" ]) -# LC_SEQ_LOCK -# after 2.6.18 seq_file has lock intead of sem -AC_DEFUN([LC_SEQ_LOCK], -[AC_MSG_CHECKING([if struct seq_file has lock field]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct seq_file seq; - - mutex_unlock(&seq.lock); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SEQ_LOCK, 1, - [after 2.6.18 seq_file has lock intead of sem]) -],[ - AC_MSG_RESULT(NO) -]) -]) - -# -# LC_EXPORT_FILEMAP_FDATAWRITE_RANGE -# -# No standard kernels export this -# -AC_DEFUN([LC_EXPORT_FILEMAP_FDATAWRITE_RANGE], -[LB_CHECK_SYMBOL_EXPORT([filemap_fdatawrite_range], -[mm/filemap.c],[ -AC_DEFINE(HAVE_FILEMAP_FDATAWRITE_RANGE, 1, - [filemap_fdatawrite_range is exported by the kernel]) -],[ -]) -]) - # LC_FLUSH_OWNER_ID # starting from 2.6.18 the file_operations .flush # method has a new "fl_owner_t id" parameter @@ -952,7 +775,7 @@ LB_LINUX_TRY_COMPILE([ #include ],[ struct file_operations *fops = NULL; - fl_owner_t id; + fl_owner_t id = NULL; int i; i = fops->flush(NULL, id); @@ -1208,7 +1031,7 @@ LB_LINUX_TRY_COMPILE([ #include #include ],[ - struct hash_desc foo; + struct hash_desc foo __attribute__ ((unused)); ],[ AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_STRUCT_HASH_DESC, 1, [kernel has struct hash_desc]) @@ -1226,7 +1049,7 @@ LB_LINUX_TRY_COMPILE([ #include #include ],[ - struct blkcipher_desc foo; + struct blkcipher_desc foo __attribute__ ((unused)); ],[ AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_STRUCT_BLKCIPHER_DESC, 1, [kernel has struct blkcipher_desc]) @@ -1243,7 +1066,8 @@ AC_DEFUN([LC_FS_RENAME_DOES_D_MOVE], LB_LINUX_TRY_COMPILE([ #include ],[ - int v = FS_RENAME_DOES_D_MOVE; + int v __attribute__ ((unused)); + v = FS_RENAME_DOES_D_MOVE; ],[ AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_FS_RENAME_DOES_D_MOVE, 1, [kernel has FS_RENAME_DOES_D_MOVE flag]) @@ -1260,7 +1084,8 @@ AC_DEFUN([LC_UNREGISTER_BLKDEV_RETURN_INT], LB_LINUX_TRY_COMPILE([ #include ],[ - int i = unregister_blkdev(0,NULL); + int i __attribute__ ((unused)); + i = unregister_blkdev(0,NULL); ],[ AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_UNREGISTER_BLKDEV_RETURN_INT, 1, @@ -1464,12 +1289,32 @@ LB_LINUX_TRY_COMPILE([ # # 2.6.27 # +AC_DEFUN([LC_PGMKWRITE_USE_VMFAULT], +[AC_MSG_CHECKING([kernel .page_mkwrite uses struct vm_fault *]) +tmp_flags="$EXTRA_KCFLAGS" +EXTRA_KCFLAGS="-Werror" +LB_LINUX_TRY_COMPILE([ + #include +],[ + ((struct vm_operations_struct *)0)->page_mkwrite((struct vm_area_struct *)0, (struct vm_fault *)0); +], [ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_PGMKWRITE_USE_VMFAULT, 1, + [kernel vm_operation_struct.page_mkwrite uses struct vm_fault * as second parameter]) +],[ + AC_MSG_RESULT([no]) +]) +EXTRA_KCFLAGS="$tmp_flags" +]) + AC_DEFUN([LC_INODE_PERMISION_2ARGS], [AC_MSG_CHECKING([inode_operations->permission has two args]) LB_LINUX_TRY_COMPILE([ #include ],[ - struct inode *inode; + struct inode *inode __attribute__ ((unused)); + + inode = NULL; inode->i_op->permission(NULL, 0); ],[ AC_DEFINE(HAVE_INODE_PERMISION_2ARGS, 1, @@ -1543,9 +1388,10 @@ AC_DEFINE(HAVE_EXPORT_INODE_PERMISSION, 1, AC_DEFUN([LC_QUOTA_ON_5ARGS], [AC_MSG_CHECKING([quota_on needs 5 parameters]) LB_LINUX_TRY_COMPILE([ + #include #include ],[ - struct quotactl_ops *qop; + struct quotactl_ops *qop = NULL; qop->quota_on(NULL, 0, 0, NULL, 0); ],[ AC_DEFINE(HAVE_QUOTA_ON_5ARGS, 1, @@ -1560,9 +1406,10 @@ LB_LINUX_TRY_COMPILE([ AC_DEFUN([LC_QUOTA_OFF_3ARGS], [AC_MSG_CHECKING([quota_off needs 3 parameters]) LB_LINUX_TRY_COMPILE([ + #include #include ],[ - struct quotactl_ops *qop; + struct quotactl_ops *qop = NULL; qop->quota_off(NULL, 0, 0); ],[ AC_DEFINE(HAVE_QUOTA_OFF_3ARGS, 1, @@ -1897,6 +1744,22 @@ AC_DEFUN([LC_SET_CPUS_ALLOWED], [set_cpus_allowed is exported by the kernel])], [AC_MSG_RESULT([no])] )]) +# 2.6.32 introduces selinux_is_enabled() +AC_DEFUN([LC_SELINUX_IS_ENABLED], +[AC_MSG_CHECKING([if selinux_is_enabled is available]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + selinux_is_enabled(); +],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_SELINUX_IS_ENABLED, 1, + [selinux_is_enabled is defined]) +],[ + AC_MSG_RESULT([no]) +]) +]) + # # LC_D_OBTAIN_ALIAS # starting from 2.6.28 kernel replaces d_alloc_anon() with @@ -1931,6 +1794,16 @@ AC_DEFUN([LC_EXPORT_GENERIC_ERROR_REMOVE_PAGE], ] ) +# 2.6.32 if kernel export access_process_vm(). +AC_DEFUN([LC_EXPORT_ACCESS_PROCESS_VM], + [LB_CHECK_SYMBOL_EXPORT([access_process_vm], + [mm/memory.c], + [AC_DEFINE(HAVE_ACCESS_PROCESS_VM, 1, + [access_process_vm function is present])], + []) + ] +) + # # 2.6.36 fs_struct.lock use spinlock instead of rwlock. # @@ -2000,6 +1873,83 @@ LB_LINUX_TRY_COMPILE([ ]) # +# 2.6.37 remove kernel_locked +# +AC_DEFUN([LC_KERNEL_LOCKED], +[AC_MSG_CHECKING([if kernel_locked is defined]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + kernel_locked(); +],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_KERNEL_LOCKED, 1, + [kernel_locked is defined]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# +# 2.6.38 dentry_operations.d_compare() taken 7 arguments. +# +AC_DEFUN([LC_D_COMPARE_7ARGS], +[AC_MSG_CHECKING([if d_compare taken 7 arguments]) +LB_LINUX_TRY_COMPILE([ + #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]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# +# 2.6.38 dentry_operations.d_delete() defined 'const' for 1st parameter. +# +AC_DEFUN([LC_D_DELETE_CONST], +[AC_MSG_CHECKING([if d_delete has const declare on first parameter]) +tmp_flags="$EXTRA_KCFLAGS" +EXTRA_KCFLAGS="-Werror" +LB_LINUX_TRY_COMPILE([ + #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_MSG_RESULT([yes]) +],[ + AC_DEFINE(HAVE_D_DELETE_CONST, , []) + AC_MSG_RESULT([no]) +]) +EXTRA_KCFLAGS="$tmp_flags" +]) + +# +# 2.6.38 dcache_lock removed. rcu-walk commited. +# +AC_DEFUN([LC_DCACHE_LOCK], +[AC_MSG_CHECKING([if dcache_lock is exist]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + spin_lock(&dcache_lock); +],[ + AC_DEFINE(HAVE_DCACHE_LOCK, 1, + [dcache_lock is exist]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# # 2.6.38 export blkdev_get_by_dev # AC_DEFUN([LC_BLKDEV_GET_BY_DEV], @@ -2108,13 +2058,12 @@ AC_DEFINE(HAVE_SIMPLE_SETATTR, 1, # Lustre linux kernel checks # AC_DEFUN([LC_PROG_LINUX], - [LC_LUSTRE_VERSION_H + [ LC_CONFIG_PINGER LC_CONFIG_CHECKSUM LC_CONFIG_LIBLUSTRE_RECOVERY LC_CONFIG_HEALTH_CHECK_WRITE LC_CONFIG_LRU_RESIZE - LC_QUOTA_MODULE LC_LLITE_LLOOP_MODULE # RHEL4 patches @@ -2128,13 +2077,9 @@ AC_DEFUN([LC_PROG_LINUX], LC_CONST_ACL_SIZE - LC_STRUCT_INTENT_FILE - LC_CAPA_CRYPTO LC_CONFIG_RMTCLIENT LC_CONFIG_GSS - LC_FUNC_HAVE_CAN_SLEEP_ARG - LC_FUNC_F_OP_FLOCK LC_QUOTA_READ LC_COOKIE_FOLLOW_LINK LC_FUNC_RCU @@ -2161,11 +2106,7 @@ AC_DEFUN([LC_PROG_LINUX], # 2.6.18 LC_NR_PAGECACHE LC_STATFS_DENTRY_PARAM - LC_VFS_KERN_MOUNT - LC_INVALIDATEPAGE_RETURN_INT LC_UMOUNTBEGIN_HAS_VFSMOUNT - LC_SEQ_LOCK - LC_EXPORT_FILEMAP_FDATAWRITE_RANGE LC_FLUSH_OWNER_ID if test x$enable_server = xyes ; then LC_EXPORT_INVALIDATE_MAPPING_PAGES @@ -2214,6 +2155,7 @@ AC_DEFUN([LC_PROG_LINUX], LC_FS_STRUCT_USE_PATH # 2.6.27 + LC_PGMKWRITE_USE_VMFAULT LC_INODE_PERMISION_2ARGS LC_FILE_REMOVE_SUID LC_TRYLOCKPAGE @@ -2250,6 +2192,8 @@ AC_DEFUN([LC_PROG_LINUX], LC_SET_CPUS_ALLOWED LC_CACHE_UPCALL LC_EXPORT_GENERIC_ERROR_REMOVE_PAGE + LC_SELINUX_IS_ENABLED + LC_EXPORT_ACCESS_PROCESS_VM # 2.6.35, 3.0.0 LC_FILE_FSYNC @@ -2259,11 +2203,17 @@ AC_DEFUN([LC_PROG_LINUX], LC_FS_STRUCT_RWLOCK LC_SBOPS_EVICT_INODE + # 2.6.37 + LC_KERNEL_LOCKED + # 2.6.38 LC_ATOMIC_MNT_COUNT LC_BLKDEV_GET_BY_DEV LC_GENERIC_PERMISSION LC_QUOTA_ON_USE_PATH + LC_DCACHE_LOCK + LC_D_COMPARE_7ARGS + LC_D_DELETE_CONST # 2.6.39 LC_REQUEST_QUEUE_UNPLUG_FN @@ -2274,6 +2224,7 @@ AC_DEFUN([LC_PROG_LINUX], LC_FUNC_DEV_SET_RDONLY LC_STACK_SIZE LC_QUOTA64 + LC_QUOTA_CONFIG fi ]) @@ -2666,7 +2617,6 @@ AM_CONDITIONAL(LIBLUSTRE_TESTS, test x$enable_liblustre_tests = xyes) 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(QUOTA, test x$enable_quota_module = 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) @@ -2736,12 +2686,16 @@ lustre/obdecho/Makefile lustre/obdecho/autoMakefile lustre/obdfilter/Makefile lustre/obdfilter/autoMakefile +lustre/ofd/Makefile +lustre/ofd/autoMakefile lustre/osc/Makefile lustre/osc/autoMakefile lustre/ost/Makefile lustre/ost/autoMakefile lustre/osd-ldiskfs/Makefile lustre/osd-ldiskfs/autoMakefile +lustre/osd-zfs/Makefile +lustre/osd-zfs/autoMakefile lustre/mgc/Makefile lustre/mgc/autoMakefile lustre/mgs/Makefile @@ -2753,6 +2707,7 @@ lustre/ptlrpc/gss/autoMakefile lustre/quota/Makefile lustre/quota/autoMakefile lustre/scripts/Makefile +lustre/scripts/lustre lustre/tests/Makefile lustre/tests/mpi/Makefile lustre/utils/Makefile