X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fautoconf%2Flustre-core.m4;h=620963c27439d8fc2a03915d47b39e841960d2ea;hp=bbecaf87377cbba12977f4cd9b5e9871671406d0;hb=dadfda622c03c35c16910cc82fe7d8aa099e9ea9;hpb=68cf17efb9ccb01a7842368dd307c6f00d3a7ac2 diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index bbecaf8..620963c 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -20,7 +20,7 @@ LUSTRE="$PWD/lustre" AC_SUBST(LUSTRE) # mount.lustre -rootsbindir='/sbin' +rootsbindir='$(CROSS_PATH)/sbin' AC_SUBST(rootsbindir) demodir='$(docdir)/demo' @@ -62,7 +62,7 @@ AC_ARG_WITH([obd-buffer-size], OBD_BUFFER_SIZE=8192 ]) AC_MSG_RESULT([$OBD_BUFFER_SIZE bytes]) -AC_DEFINE_UNQUOTED(OBD_MAX_IOCTL_BUFFER, $OBD_BUFFER_SIZE, [IOCTL Buffer Size]) +AC_DEFINE_UNQUOTED(CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER, $OBD_BUFFER_SIZE, [IOCTL Buffer Size]) ]) # @@ -120,13 +120,13 @@ LB_LINUX_TRY_COMPILE([ # AC_DEFUN([LC_MDS_MAX_THREADS], [ - AC_ARG_WITH([mds_max_threads], - AC_HELP_STRING([--with-mds-max-threads=size], - [define the maximum number of threads available on the MDS: (default=512)]), - [ - MDS_THREAD_COUNT=$with_mds_max_threads - AC_DEFINE_UNQUOTED(MDT_MAX_THREADS, $MDS_THREAD_COUNT, [maximum number of mdt threads]) - ]) + AC_ARG_WITH([mds_max_threads], + AC_HELP_STRING([--with-mds-max-threads=count], + [maximum threads available on the MDS: (default=512)]), + [ + MDS_THREAD_COUNT=$with_mds_max_threads + AC_DEFINE_UNQUOTED(MDS_MAX_THREADS, $MDS_THREAD_COUNT, [maximum number of MDS threads]) + ]) ]) # @@ -216,10 +216,10 @@ AC_DEFUN([LC_QUOTA_CONFIG], ]) ]) -# truncate_complete_page() was exported from RHEL5/SLES10, but not in SLES11 SP0 (2.6.27) +# 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 -AC_DEFUN([LC_EXPORT_TRUNCATE_COMPLETE], +AC_DEFUN([LC_EXPORT_TRUNCATE_COMPLETE_PAGE], [LB_CHECK_SYMBOL_EXPORT([truncate_complete_page], [mm/truncate.c], [AC_DEFINE(HAVE_TRUNCATE_COMPLETE_PAGE, 1, @@ -234,128 +234,6 @@ AC_DEFUN([LC_EXPORT_TRUNCATE_COMPLETE], [kernel export delete_from_page_cache])]) ]) -AC_DEFUN([LC_EXPORT_D_REHASH_COND], -[LB_CHECK_SYMBOL_EXPORT([d_rehash_cond], -[fs/dcache.c],[ -AC_DEFINE(HAVE_D_REHASH_COND, 1, - [d_rehash_cond is exported by the kernel]) -],[ -]) -]) - -AC_DEFUN([LC_EXPORT___D_REHASH], -[LB_CHECK_SYMBOL_EXPORT([__d_rehash], -[fs/dcache.c],[ -AC_DEFINE(HAVE___D_REHASH, 1, - [__d_rehash is exported by the kernel]) -],[ -]) -]) - -# The actual symbol exported varies among architectures, so we need -# to check many symbols (but only in the current architecture.) No -# matter what symbol is exported, the kernel #defines node_to_cpumask -# to the appropriate function and that's what we use. -AC_DEFUN([LC_EXPORT_NODE_TO_CPUMASK], - [LB_CHECK_SYMBOL_EXPORT([node_to_cpumask], - [arch/$LINUX_ARCH/mm/numa.c], - [AC_DEFINE(HAVE_NODE_TO_CPUMASK, 1, - [node_to_cpumask is exported by - the kernel])]) # x86_64 - LB_CHECK_SYMBOL_EXPORT([node_to_cpu_mask], - [arch/$LINUX_ARCH/kernel/smpboot.c], - [AC_DEFINE(HAVE_NODE_TO_CPUMASK, 1, - [node_to_cpumask is exported by - the kernel])]) # ia64 - LB_CHECK_SYMBOL_EXPORT([node_2_cpu_mask], - [arch/$LINUX_ARCH/kernel/smpboot.c], - [AC_DEFINE(HAVE_NODE_TO_CPUMASK, 1, - [node_to_cpumask is exported by - the kernel])]) # i386 - ]) - -# -# -# between 2.6.5 - 2.6.22 filemap_populate is exported in some kernels -# -AC_DEFUN([LC_FILEMAP_POPULATE], -[AC_MSG_CHECKING([for exported filemap_populate]) -LB_LINUX_TRY_COMPILE([ - #include - #include -],[ - filemap_populate(NULL, 0, 0, __pgprot(0), 0, 0); -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_FILEMAP_POPULATE, 1, [Kernel exports filemap_populate]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# -# added in 2.6.17 -# -AC_DEFUN([LC_BIT_SPINLOCK_H], -[LB_CHECK_FILE([$LINUX/include/linux/bit_spinlock.h],[ - AC_MSG_CHECKING([if bit_spinlock.h can be compiled]) - LB_LINUX_TRY_COMPILE([ - #include - #include - #include - ],[],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_BIT_SPINLOCK_H, 1, [Kernel has bit_spinlock.h]) - ],[ - AC_MSG_RESULT([no]) - ]) -], -[]) -]) - -# -# LC_CONST_ACL_SIZE -# -AC_DEFUN([LC_CONST_ACL_SIZE], -[AC_MSG_CHECKING([calc acl size]) -tmp_flags="$CFLAGS" -CFLAGS="$CFLAGS -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -I$LINUX/arch/`echo $target_cpu|sed -e 's/powerpc64/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -include $AUTOCONF_HDIR/autoconf.h $EXTRA_KCFLAGS" -AC_TRY_RUN([ - #define __KERNEL__ - #include - #undef __KERNEL__ - // block include - #define __LINUX_POSIX_ACL_H - - #ifdef CONFIG_FS_POSIX_ACL - # include - #endif - - #include - - int main(void) - { - /* LUSTRE_POSIX_ACL_MAX_ENTRIES = 32 */ - int size = posix_acl_xattr_size(32); - FILE *f = fopen("acl.size","w+"); - fprintf(f,"%d", size); - fclose(f); - - return 0; - } -],[ - acl_size=`cat acl.size` - AC_MSG_RESULT([ACL size $acl_size]) - AC_DEFINE_UNQUOTED(XATTR_ACL_SIZE, AS_TR_SH([$acl_size]), [size of xattr acl]) -],[ - AC_ERROR([ACL size can't be computed]) -],[ - AC_MSG_RESULT([can't check ACL size, make it 260]) - AC_DEFINE_UNQUOTED(XATTR_ACL_SIZE,260) -]) -CFLAGS="$tmp_flags" -]) - # # LC_CAPA_CRYPTO # @@ -384,35 +262,47 @@ AC_DEFUN([LC_CONFIG_RMTCLIENT], ]) # -# LC_CONFIG_GSS_KEYRING (default enabled, if gss is enabled) +# LC_CONFIG_GSS_KEYRING (default 'auto', tests for dependencies, if found, enables; only called if gss is enabled) # AC_DEFUN([LC_CONFIG_GSS_KEYRING], [AC_MSG_CHECKING([whether to enable gss keyring backend]) AC_ARG_ENABLE([gss_keyring], [AC_HELP_STRING([--disable-gss-keyring], [disable gss keyring backend])], - [],[enable_gss_keyring='yes']) + [],[enable_gss_keyring='auto']) AC_MSG_RESULT([$enable_gss_keyring]) if test x$enable_gss_keyring != xno; then - LB_LINUX_CONFIG_IM([KEYS],[], - [AC_MSG_ERROR([GSS keyring backend require that CONFIG_KEYS be enabled in your kernel.])]) + LB_LINUX_CONFIG_IM([KEYS],[], + [gss_keyring_conf_test='fail'; + AC_MSG_WARN([GSS keyring backend require that CONFIG_KEYS be enabled in your kernel.])]) - AC_CHECK_LIB([keyutils], [keyctl_search], [], - [AC_MSG_ERROR([libkeyutils is not found, which is required by gss keyring backend])],) + 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_DEFINE([HAVE_GSS_KEYRING], [1], - [Define this if you enable gss keyring backend]) + if test x$gss_keyring_conf_test != xfail; then + AC_DEFINE([HAVE_GSS_KEYRING], [1], [Define this if you enable gss keyring backend]) + enable_gss_keyring='yes' + else + if test x$enable_gss_keyring == xyes; then + AC_MSG_ERROR([Cannot enable gss_keyring. See above for details.]) + else + AC_MSG_WARN([Cannot enable gss keyring. See above for details.]) + fi + fi fi ]) AC_DEFUN([LC_CONFIG_SUNRPC], [LB_LINUX_CONFIG_IM([SUNRPC],[], - [AC_MSG_ERROR([kernel SUNRPC support is required by using GSS.])]) + [if test x$sunrpc_required == xyes; then + AC_MSG_ERROR([kernel SUNRPC support is required by using GSS.]) + fi]) ]) # -# LC_CONFIG_GSS (default disabled) +# LC_CONFIG_GSS (default 'auto' (tests for dependencies, if found, enables)) # # Build gss and related tools of Lustre. Currently both kernel and user space # parts are depend on linux platform. @@ -421,441 +311,53 @@ AC_DEFUN([LC_CONFIG_GSS], [AC_MSG_CHECKING([whether to enable gss/krb5 support]) AC_ARG_ENABLE([gss], [AC_HELP_STRING([--enable-gss], [enable gss/krb5 support])], - [],[enable_gss='no']) + [],[enable_gss='auto']) AC_MSG_RESULT([$enable_gss]) - if test x$enable_gss == xyes; then + if test x$enable_gss != xno; then LC_CONFIG_GSS_KEYRING - LC_CONFIG_SUNRPC - - AC_DEFINE([HAVE_GSS], [1], [Define this if you enable gss]) - - LB_LINUX_CONFIG_IM([CRYPTO_MD5],[], - [AC_MSG_WARN([kernel MD5 support is recommended by using GSS.])]) - LB_LINUX_CONFIG_IM([CRYPTO_SHA1],[], - [AC_MSG_WARN([kernel SHA1 support is recommended by using GSS.])]) - LB_LINUX_CONFIG_IM([CRYPTO_SHA256],[], - [AC_MSG_WARN([kernel SHA256 support is recommended by using GSS.])]) - LB_LINUX_CONFIG_IM([CRYPTO_SHA512],[], - [AC_MSG_WARN([kernel SHA512 support is recommended by using GSS.])]) - - AC_CHECK_LIB([gssapi], [gss_init_sec_context], - [GSSAPI_LIBS="$GSSAPI_LDFLAGS -lgssapi"], - [AC_CHECK_LIB([gssglue], [gss_init_sec_context], - [GSSAPI_LIBS="$GSSAPI_LDFLAGS -lgssglue"], - [AC_MSG_ERROR([libgssapi or libgssglue is not found, which is required by GSS.])])],) + sunrpc_required=$enable_gss + LC_CONFIG_SUNRPC + sunrpc_required=no + + LB_LINUX_CONFIG_IM([CRYPTO_MD5],[], + [AC_MSG_WARN([kernel MD5 support is recommended by using GSS.])]) + LB_LINUX_CONFIG_IM([CRYPTO_SHA1],[], + [AC_MSG_WARN([kernel SHA1 support is recommended by using GSS.])]) + LB_LINUX_CONFIG_IM([CRYPTO_SHA256],[], + [AC_MSG_WARN([kernel SHA256 support is recommended by using GSS.])]) + LB_LINUX_CONFIG_IM([CRYPTO_SHA512],[], + [AC_MSG_WARN([kernel SHA512 support is recommended by using GSS.])]) + + require_krb5=$enable_gss + AC_KERBEROS_V5 + require_krb5=no + + if test x$KRBDIR != x; then + 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'], + [if test x$enable_gss == xyes; then + AC_MSG_ERROR([libgssapi or libgssglue is not found, which is required by GSS.]) + else + AC_MSG_WARN([libgssapi or libgssglue is not found, which is required by GSS.]) + fi])],) + AC_SUBST(GSSAPI_LIBS) + fi - AC_SUBST(GSSAPI_LIBS) + if test x$gss_conf_test == xsuccess; then + AC_DEFINE([HAVE_GSS], [1], [Define this is if you enable gss]) + enable_gss='yes' + fi - AC_KERBEROS_V5 fi ]) -AC_DEFUN([LC_TASK_CLENV_STORE], -[ - AC_MSG_CHECKING([if we can store cl_env in task_struct]) - if test x$have_task_clenv_store != xyes ; then - LC_TASK_CLENV_TUX_INFO - fi -]) - -# 2.6.12 - -# ~2.6.12 merge patch from oracle to convert tree_lock from spinlock to rwlock -# yet tree_lock is converted from rwlock to spin_lock since v2.6.26 -AC_DEFUN([LC_RW_TREE_LOCK], -[AC_MSG_CHECKING([if kernel has tree_lock as rwlock]) -tmp_flags="$EXTRA_KCFLAGS" -EXTRA_KCFLAGS="-Werror" -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct address_space a; - - write_lock(&a.tree_lock); -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_RW_TREE_LOCK, 1, [kernel has tree_lock as rw_lock]) -],[ - AC_MSG_RESULT([no]) -]) -EXTRA_KCFLAGS="$tmp_flags" -]) - -# 2.6.18 - -# LC_UMOUNTBEGIN_HAS_VFSMOUNT -# 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" -EXTRA_KCFLAGS="-Werror" -LB_LINUX_TRY_COMPILE([ - #include - - struct vfsmount; - static void cfg_umount_begin (struct vfsmount *v, int flags) - { - ; - } - - static struct super_operations cfg_super_operations = { - .umount_begin = cfg_umount_begin, - }; -],[ - cfg_super_operations.umount_begin(NULL,0); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_UMOUNTBEGIN_VFSMOUNT, 1, - [Define umount_begin need second argument]) -],[ - AC_MSG_RESULT(no) -]) -EXTRA_KCFLAGS="$tmp_flags" -]) - -#2.6.18 + RHEL5 (fc6) - -# -# LC_LINUX_FIEMAP_H -# -# fiemap.h is added since v2.6.28 -# RHEL5 2.6.18 has it, while SLES10 2.6.27 does not -# -AC_DEFUN([LC_LINUX_FIEMAP_H], -[LB_CHECK_FILE([$LINUX/include/linux/fiemap.h],[ - AC_MSG_CHECKING([if fiemap.h can be compiled]) - LB_LINUX_TRY_COMPILE([ - #include - #include - ],[],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_LINUX_FIEMAP_H, 1, [Kernel has fiemap.h]) - ],[ - AC_MSG_RESULT([no]) - ]) -], -[]) -]) - -# 2.6.19 - -# LC_FILE_WRITEV -# 2.6.19 replaced writev with aio_write -AC_DEFUN([LC_FILE_WRITEV], -[AC_MSG_CHECKING([writev in fops]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct file_operations *fops = NULL; - fops->writev = NULL; -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_FILE_WRITEV, 1, - [use fops->writev]) -],[ - AC_MSG_RESULT(no) -]) -]) - -# LC_FILE_READV -# 2.6.19 replaced readv with aio_read -AC_DEFUN([LC_FILE_READV], -[AC_MSG_CHECKING([readv in fops]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct file_operations *fops = NULL; - fops->readv = NULL; -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_FILE_READV, 1, - [use fops->readv]) -],[ - AC_MSG_RESULT(no) -]) -]) - -# 2.6.20 - -# LC_CANCEL_DIRTY_PAGE -# 2.6.20 introduced cancel_dirty_page instead of clear_page_dirty. -AC_DEFUN([LC_CANCEL_DIRTY_PAGE], - [AC_MSG_CHECKING([kernel has cancel_dirty_page]) - # the implementation of cancel_dirty_page in OFED 1.4.1's SLES10 SP2 - # backport is broken, so ignore it - if test -f $OFED_BACKPORT_PATH/linux/mm.h && - test "$(sed -ne '/^static inline void cancel_dirty_page(struct page \*page, unsigned int account_size)$/,/^}$/p' $OFED_BACKPORT_PATH/linux/mm.h | md5sum)" = "c518cb32d6394760c5bca14cb7538d3e -"; then - AC_MSG_RESULT(no) - else - LB_LINUX_TRY_COMPILE([ - #include - #include -],[ - cancel_dirty_page(NULL, 0); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_CANCEL_DIRTY_PAGE, 1, - [kernel has cancel_dirty_page instead of clear_page_dirty]) -],[ - AC_MSG_RESULT(no) -]) - fi -]) - -# raid5-zerocopy patch - -# -# LC_PAGE_CONSTANT -# -# In order to support raid5 zerocopy patch, we have to patch the kernel to make -# it support constant page, which means the page won't be modified during the -# IO. -# -AC_DEFUN([LC_PAGE_CONSTANT], -[AC_MSG_CHECKING([if kernel have PageConstant defined]) -LB_LINUX_TRY_COMPILE([ - #include - #include -],[ - #ifndef PG_constant - #error "Have no raid5 zcopy patch" - #endif -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_PAGE_CONSTANT, 1, [kernel have PageConstant supported]) -],[ - AC_MSG_RESULT(no); -]) -]) - -# 2.6.22 - -# 2.6.22 lost second parameter for invalidate_bdev -AC_DEFUN([LC_INVALIDATE_BDEV_2ARG], -[AC_MSG_CHECKING([if invalidate_bdev has second argument]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - invalidate_bdev(NULL,0); -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_INVALIDATE_BDEV_2ARG, 1, - [invalidate_bdev has second argument]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# -# check for crypto API -# -AC_DEFUN([LC_ASYNC_BLOCK_CIPHER], -[AC_MSG_CHECKING([if kernel has block cipher support]) -LB_LINUX_TRY_COMPILE([ - #include - #include -],[ - struct crypto_blkcipher *tfm; - tfm = crypto_alloc_blkcipher("aes", 0, sizeof(tfm) ); -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_ASYNC_BLOCK_CIPHER, 1, [kernel has block cipher support]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# -# check for struct hash_desc -# -AC_DEFUN([LC_STRUCT_HASH_DESC], -[AC_MSG_CHECKING([if kernel has struct hash_desc]) -LB_LINUX_TRY_COMPILE([ - #include - #include -],[ - struct hash_desc foo __attribute__ ((unused)); -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_STRUCT_HASH_DESC, 1, [kernel has struct hash_desc]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# -# check for struct blkcipher_desc -# -AC_DEFUN([LC_STRUCT_BLKCIPHER_DESC], -[AC_MSG_CHECKING([if kernel has struct blkcipher_desc]) -LB_LINUX_TRY_COMPILE([ - #include - #include -],[ - struct blkcipher_desc foo __attribute__ ((unused)); -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_STRUCT_BLKCIPHER_DESC, 1, [kernel has struct blkcipher_desc]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# -# 2.6.19 check for FS_RENAME_DOES_D_MOVE flag -# -AC_DEFUN([LC_FS_RENAME_DOES_D_MOVE], -[AC_MSG_CHECKING([if kernel has FS_RENAME_DOES_D_MOVE flag]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - 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]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# 2.6.23 - -# 2.6.23 have return type 'void' for unregister_blkdev -AC_DEFUN([LC_UNREGISTER_BLKDEV_RETURN_INT], -[AC_MSG_CHECKING([if unregister_blkdev return int]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - int i __attribute__ ((unused)); - i = unregister_blkdev(0,NULL); -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_UNREGISTER_BLKDEV_RETURN_INT, 1, - [unregister_blkdev return int]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# 2.6.23 change .sendfile to .splice_read -AC_DEFUN([LC_KERNEL_SPLICE_READ], -[AC_MSG_CHECKING([if kernel has .splice_read]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct file_operations file; - - file.splice_read = NULL; -], [ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_KERNEL_SPLICE_READ, 1, - [kernel has .slice_read]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# 2.6.23 change .sendfile to .splice_read -# RHEL4 (-92 kernel) have both sendfile and .splice_read API -AC_DEFUN([LC_KERNEL_SENDFILE], -[AC_MSG_CHECKING([if kernel has .sendfile]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct file_operations file; - - file.sendfile = NULL; -], [ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_KERNEL_SENDFILE, 1, - [kernel has .sendfile]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# 2.6.23 extract nfs export related data into exportfs.h -AC_DEFUN([LC_HAVE_EXPORTFS_H], -[LB_CHECK_FILE([$LINUX/include/linux/exportfs.h], [ - AC_DEFINE(HAVE_LINUX_EXPORTFS_H, 1, - [kernel has include/exportfs.h]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# 2.6.23 has new page fault handling API -AC_DEFUN([LC_VM_OP_FAULT], -[AC_MSG_CHECKING([kernel has .fault in vm_operation_struct]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct vm_operations_struct op; - - op.fault = NULL; -], [ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_VM_OP_FAULT, 1, - [kernel has .fault in vm_operation_struct]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# 2.6.23 add code to wait other users to complete before removing procfs entry -AC_DEFUN([LC_PROCFS_USERS], -[AC_MSG_CHECKING([if kernel has pde_users member in procfs entry struct]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct proc_dir_entry pde; - - pde.pde_users = 0; -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_PROCFS_USERS, 1, - [kernel has pde_users member in procfs entry struct]) -],[ - LB_LINUX_TRY_COMPILE([ - #include "$LINUX/fs/proc/internal.h" - ],[ - struct proc_dir_entry_aux pde_aux; - - pde_aux.pde_users = 0; - ],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_PROCFS_USERS, 1, - [kernel has pde_users member in proc_dir_entry_aux]) - ],[ - AC_MSG_RESULT([no]) - ]) -]) -]) - -# 2.6.23 exports exportfs_decode_fh -AC_DEFUN([LC_EXPORTFS_DECODE_FH], -[LB_CHECK_SYMBOL_EXPORT([exportfs_decode_fh], -[fs/exportfs/expfs.c],[ - AC_DEFINE(HAVE_EXPORTFS_DECODE_FH, 1, - [exportfs_decode_fh has been export]) -],[ -]) -]) - # 2.6.24 -# 2.6.24 need linux/mm_types.h included -AC_DEFUN([LC_HAVE_MMTYPES_H], -[LB_CHECK_FILE([$LINUX/include/linux/mm_types.h], [ - AC_DEFINE(HAVE_LINUX_MMTYPES_H, 1, - [kernel has include/mm_types.h]) -],[ - AC_MSG_RESULT([no]) -]) -]) - # 2.6.24 has bio_endio with 2 args AC_DEFUN([LC_BIO_ENDIO_2ARG], [AC_MSG_CHECKING([if kernel has bio_endio with 2 args]) @@ -872,25 +374,6 @@ LB_LINUX_TRY_COMPILE([ ]) ]) -# 2.6.24 has new members in exports struct. -AC_DEFUN([LC_FH_TO_DENTRY], -[AC_MSG_CHECKING([if kernel has .fh_to_dentry member in export_operations struct]) -LB_LINUX_TRY_COMPILE([ - #include -#ifdef HAVE_LINUX_EXPORTFS_H - #include -#endif -],[ - do{ }while(sizeof(((struct export_operations *)0)->fh_to_dentry)); -], [ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_FH_TO_DENTRY, 1, - [kernel has .fh_to_dentry member in export_operations struct]) -],[ - AC_MSG_RESULT([no]) -]) -]) - # 2.6.24 removes long aged procfs entry -> deleted member AC_DEFUN([LC_PROCFS_DELETED], [AC_MSG_CHECKING([if kernel has deleted member in procfs entry struct]) @@ -909,466 +392,89 @@ LB_LINUX_TRY_COMPILE([ ]) ]) -# 2.6.24 has bdi_init()/bdi_destroy() functions. -AC_DEFUN([LC_EXPORT_BDI_INIT], -[LB_CHECK_SYMBOL_EXPORT([bdi_init], -[mm/backing-dev.c],[ - AC_DEFINE(HAVE_BDI_INIT, 1, - [bdi_init/bdi_destroy functions are present]) -],[ -]) -]) - -# 2.6.26 - -# 2.6.26 isn't export set_fs_pwd and change paramter in fs struct -AC_DEFUN([LC_FS_STRUCT_USE_PATH], -[AC_MSG_CHECKING([fs_struct use path structure]) -LB_LINUX_TRY_COMPILE([ - #include - #include - #include -],[ - struct fs_struct fs; - - fs.pwd = *((struct path *)sizeof(fs)); -], [ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_FS_STRUCT_USE_PATH, 1, - [fs_struct use path structure]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# -# 2.6.27 -# - -# LC_SECURITY_PLUG # for SLES10 SP2 (2.6.27) -# check security plug in sles10 sp2 kernel -AC_DEFUN([LC_SECURITY_PLUG], -[AC_MSG_CHECKING([If kernel has security plug support]) -LB_LINUX_TRY_COMPILE([ - #include - #include -],[ - notify_change(NULL, NULL, NULL); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SECURITY_PLUG, 1, - [SLES10 SP2 use extra parameter in vfs]) -],[ - AC_MSG_RESULT(no) -]) -]) - -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_PGMKWRITE_COMPACT], -[AC_MSG_CHECKING([if kernel .page_mkwrite is located in vm_operation_struct._pmkw]) -tmp_flags="$EXTRA_KCFLAGS" -EXTRA_KCFLAGS="-Werror" -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct vm_operations_struct *vm_ops; - - vm_ops = NULL; - vm_ops->_pmkw.page_mkwrite(NULL, NULL); -], [ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_PGMKWRITE_COMPACT, 1, - [kernel .page_mkwrite is located in vm_operation_struct._pmkw]) -],[ - 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 __attribute__ ((unused)); - - inode = NULL; - inode->i_op->permission(NULL, 0); -],[ - AC_DEFINE(HAVE_INODE_PERMISION_2ARGS, 1, - [inode_operations->permission has two args]) - AC_MSG_RESULT([yes]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# 2.6.27 have new page locking API -AC_DEFUN([LC_TRYLOCKPAGE], -[AC_MSG_CHECKING([kernel uses trylock_page for page lock]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - trylock_page(NULL); -],[ - AC_DEFINE(HAVE_TRYLOCK_PAGE, 1, - [kernel uses trylock_page for page lock]) - AC_MSG_RESULT([yes]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# 2.6.27 removed the read_inode from super_operations. -AC_DEFUN([LC_READ_INODE_IN_SBOPS], -[AC_MSG_CHECKING([super_operations has a read_inode field]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct super_operations *sop; - sop->read_inode(NULL); -],[ - AC_DEFINE(HAVE_READ_INODE_IN_SBOPS, 1, - [super_operations has a read_inode]) - AC_MSG_RESULT([yes]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# 2.6.27 has inode_permission instead of permisson -AC_DEFUN([LC_EXPORT_INODE_PERMISSION], -[LB_CHECK_SYMBOL_EXPORT([inode_permission], -[fs/namei.c],[ -AC_DEFINE(HAVE_EXPORT_INODE_PERMISSION, 1, - [inode_permission is exported by the kernel]) -],[ -]) -]) - -# 2.6.27 use 5th parameter in quota_on for remount. -AC_DEFUN([LC_QUOTA_ON_5ARGS], -[AC_MSG_CHECKING([quota_on needs 5 parameters]) -LB_LINUX_TRY_COMPILE([ - #include - #include -],[ - struct quotactl_ops *qop = NULL; - qop->quota_on(NULL, 0, 0, NULL, 0); -],[ - AC_DEFINE(HAVE_QUOTA_ON_5ARGS, 1, - [quota_on needs 5 paramters]) - AC_MSG_RESULT([yes]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# 2.6.27 use 3th parameter in quota_off for remount. -AC_DEFUN([LC_QUOTA_OFF_3ARGS], -[AC_MSG_CHECKING([quota_off needs 3 parameters]) -LB_LINUX_TRY_COMPILE([ - #include - #include -],[ - struct quotactl_ops *qop = NULL; - qop->quota_off(NULL, 0, 0); -],[ - AC_DEFINE(HAVE_QUOTA_OFF_3ARGS, 1, - [quota_off needs 3 paramters]) - AC_MSG_RESULT([yes]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# 2.6.27 has vfs_dq_off inline function. -AC_DEFUN([LC_VFS_DQ_OFF], -[AC_MSG_CHECKING([vfs_dq_off is defined]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - vfs_dq_off(NULL, 0); -],[ - AC_DEFINE(HAVE_VFS_DQ_OFF, 1, [vfs_dq_off is defined]) - AC_MSG_RESULT([yes]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# LC_LOCK_MAP_ACQUIRE -# after 2.6.27 lock_map_acquire replaces lock_acquire -AC_DEFUN([LC_LOCK_MAP_ACQUIRE], -[AC_MSG_CHECKING([if lock_map_acquire is defined]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - lock_map_acquire(NULL); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_LOCK_MAP_ACQUIRE, 1, - [lock_map_acquire is defined]) -],[ - AC_MSG_RESULT(no) -]) -]) - -# 2.6.27.15-2 sles11 - -# 2.6.27 sles11 remove the bi_hw_segments -AC_DEFUN([LC_BI_HW_SEGMENTS], -[AC_MSG_CHECKING([struct bio has a bi_hw_segments field]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct bio io; - io.bi_hw_segments = sizeof(io); -],[ - AC_DEFINE(HAVE_BI_HW_SEGMENTS, 1, - [struct bio has a bi_hw_segments field]) - AC_MSG_RESULT([yes]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# -# 2.6.27 sles11 move the quotaio_v1{2}.h from include/linux to fs -# 2.6.32 move the quotaio_v1{2}.h from fs to fs/quota -AC_DEFUN([LC_HAVE_QUOTAIO_H], -[LB_CHECK_FILE([$LINUX/include/linux/quotaio_v2.h],[ - AC_DEFINE(HAVE_QUOTAIO_H, 1, - [kernel has include/linux/quotaio_v2.h]) -],[LB_CHECK_FILE([$LINUX/fs/quotaio_v2.h],[ - AC_DEFINE(HAVE_FS_QUOTAIO_H, 1, - [kernel has fs/quotaio_v1.h]) -],[LB_CHECK_FILE([$LINUX/fs/quota/quotaio_v2.h],[ - AC_DEFINE(HAVE_FS_QUOTA_QUOTAIO_H, 1, - [kernel has fs/quota/quotaio_v2.h]) -],[ - AC_MSG_RESULT([no]) -]) -]) -]) -]) - -# 2.6.27 sles11 has sb_any_quota_active -AC_DEFUN([LC_SB_ANY_QUOTA_ACTIVE], -[AC_MSG_CHECKING([Kernel has sb_any_quota_active]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - sb_any_quota_active(NULL); -],[ - AC_DEFINE(HAVE_SB_ANY_QUOTA_ACTIVE, 1, - [Kernel has a sb_any_quota_active]) - AC_MSG_RESULT([yes]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# 2.6.27 sles11 has sb_has_quota_active -AC_DEFUN([LC_SB_HAS_QUOTA_ACTIVE], -[AC_MSG_CHECKING([Kernel has sb_has_quota_active]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - sb_has_quota_active(NULL, 0); -],[ - AC_DEFINE(HAVE_SB_HAS_QUOTA_ACTIVE, 1, - [Kernel has a sb_has_quota_active]) - AC_MSG_RESULT([yes]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# 2.6.27 exported add_to_page_cache_lru. -AC_DEFUN([LC_EXPORT_ADD_TO_PAGE_CACHE_LRU], -[LB_CHECK_SYMBOL_EXPORT([add_to_page_cache_lru], -[mm/filemap.c],[ - AC_DEFINE(HAVE_ADD_TO_PAGE_CACHE_LRU, 1, - [add_to_page_cache_lru functions are present]) -],[ -]) -]) - -# -# 2.6.29 introduce sb_any_quota_loaded. -# -AC_DEFUN([LC_SB_ANY_QUOTA_LOADED], -[AC_MSG_CHECKING([Kernel has sb_any_quota_loaded]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - sb_any_quota_loaded(NULL); -],[ - AC_DEFINE(HAVE_SB_ANY_QUOTA_LOADED, 1, - [Kernel has a sb_any_quota_loaded]) - AC_MSG_RESULT([yes]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# 2.6.30 x86 node_to_cpumask has been removed. must use cpumask_of_node -AC_DEFUN([LC_EXPORT_CPUMASK_OF_NODE], - [LB_CHECK_SYMBOL_EXPORT([node_to_cpumask_map], - [arch/$LINUX_ARCH/mm/numa.c], - [AC_DEFINE(HAVE_CPUMASK_OF_NODE, 1, - [node_to_cpumask_map is exported by - the kernel])]) # x86_64 - ]) - - -# 2.6.31 replaces blk_queue_hardsect_size by blk_queue_logical_block_size function -AC_DEFUN([LC_BLK_QUEUE_LOG_BLK_SIZE], -[AC_MSG_CHECKING([if blk_queue_logical_block_size is defined]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - blk_queue_logical_block_size(NULL, 0); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_BLK_QUEUE_LOG_BLK_SIZE, 1, - [blk_queue_logical_block_size is defined]) -],[ - AC_MSG_RESULT(no) -]) -]) - -# 2.6.32 - -# 2.6.32 introduced inode_newsize_ok -AC_DEFUN([LC_VFS_INODE_NEWSIZE_OK], -[AC_MSG_CHECKING([if inode_newsize_ok is defined]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - return inode_newsize_ok(NULL, 0); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_VFS_INODE_NEWSIZE_OK, 1, - [inode_newsize_ok is defined]) -],[ - AC_MSG_RESULT(no) -]) -]) - -# 2.6.32 changes cache_detail's member cache_request to cache_upcall -# in kernel commit bc74b4f5e63a09fb78e245794a0de1e5a2716bbe -AC_DEFUN([LC_CACHE_UPCALL], -[AC_MSG_CHECKING([if cache_detail has cache_upcall field]) - LB_LINUX_TRY_COMPILE([ - #include - ],[ - struct cache_detail cd; - cd.cache_upcall = NULL; - ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_CACHE_UPCALL, 1, - [cache_detail has cache_upcall field]) - ],[ - AC_MSG_RESULT(no) - ]) -]) +# +# 2.6.27 +# -# 2.6.32 add a limits member in struct request_queue. -AC_DEFUN([LC_REQUEST_QUEUE_LIMITS], -[AC_MSG_CHECKING([if request_queue has a limits field]) +# up to v2.6.27 had a 3 arg version (inode, mask, nameidata) +# v2.6.27->v2.6.37 had a 2 arg version (inode, mask) +# v2.6.37->v3.0 had a 3 arg version (inode, mask, nameidata) +# v3.1 onward have a 2 arg version (inode, mask) +AC_DEFUN([LC_INODE_PERMISION_2ARGS], +[AC_MSG_CHECKING([inode_operations->permission has two args]) LB_LINUX_TRY_COMPILE([ - #include -],[ - struct request_queue rq; - rq.limits.io_min = 0; -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_REQUEST_QUEUE_LIMITS, 1, - [request_queue has a limits field]) + #include ],[ - AC_MSG_RESULT(no) -]) -]) + struct inode *inode __attribute__ ((unused)); -# 2.6.32 has bdi_register() functions. -AC_DEFUN([LC_EXPORT_BDI_REGISTER], -[LB_CHECK_SYMBOL_EXPORT([bdi_register], -[mm/backing-dev.c],[ - AC_DEFINE(HAVE_BDI_REGISTER, 1, - [bdi_register function is present]) + inode = NULL; + inode->i_op->permission(NULL, 0); +],[ + AC_DEFINE(HAVE_INODE_PERMISION_2ARGS, 1, + [inode_operations->permission has two args]) + AC_MSG_RESULT([yes]) ],[ + AC_MSG_RESULT([no]) ]) ]) -# 2.6.32 add s_bdi for super block -AC_DEFUN([LC_SB_BDI], -[AC_MSG_CHECKING([if super_block has s_bdi field]) +# 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" +[AC_MSG_CHECKING([if quotactl_ops.set_dqblk takes struct fs_disk_quota]) LB_LINUX_TRY_COMPILE([ - #include + #include + #include ],[ - struct super_block sb; - sb.s_bdi = NULL; + struct quotactl_ops qops = {}; + struct fs_disk_quota fdq; + qops.set_dqblk(NULL, 0, 0, &fdq); ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SB_BDI, 1, - [super_block has s_bdi field]) + AC_DEFINE(HAVE_DQUOT_FS_DISK_QUOTA, 1, [quotactl_ops.set_dqblk takes struct fs_disk_quota]) + AC_MSG_RESULT([yes]) ],[ - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) ]) +EXTRA_KCFLAGS="$tmp_flags" ]) -# 2.6.27.15-2 SuSE 11 sp0 kernels lack the name field for BDI -AC_DEFUN([LC_BDI_NAME], -[AC_MSG_CHECKING([if backing_device_info has name field]) +# 2.6.34 has renamed dquot options to dquot_*, check for dquot_suspend +AC_DEFUN([LC_HAVE_DQUOT_SUSPEND], +[AC_MSG_CHECKING([if dquot_suspend is defined]) LB_LINUX_TRY_COMPILE([ - #include + #include ],[ - struct backing_dev_info bdi; - bdi.name = NULL; + dquot_suspend(NULL, -1); ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_BDI_NAME, 1, - [backing_device_info has name field]) + AC_DEFINE(HAVE_DQUOT_SUSPEND, 1, [dquot_suspend is defined]) + AC_MSG_RESULT([yes]) ],[ - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) ]) ]) -# 2.6.32 removes blk_queue_max_sectors and add blk_queue_max_hw_sectors -# check blk_queue_max_sectors and use it until disappear. -AC_DEFUN([LC_BLK_QUEUE_MAX_SECTORS], -[AC_MSG_CHECKING([if blk_queue_max_sectors is defined]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - blk_queue_max_sectors(NULL, 0); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_BLK_QUEUE_MAX_SECTORS, 1, - [blk_queue_max_sectors is defined]) +# +# 2.6.27 sles11 move the quotaio_v1{2}.h from include/linux to fs +# 2.6.32 move the quotaio_v1{2}.h from fs to fs/quota +AC_DEFUN([LC_HAVE_QUOTAIO_H], +[LB_CHECK_FILE([$LINUX/include/linux/quotaio_v2.h],[ + AC_DEFINE(HAVE_QUOTAIO_H, 1, + [kernel has include/linux/quotaio_v2.h]) +],[LB_CHECK_FILE([$LINUX/fs/quotaio_v2.h],[ + AC_DEFINE(HAVE_FS_QUOTAIO_H, 1, + [kernel has fs/quotaio_v1.h]) +],[LB_CHECK_FILE([$LINUX/fs/quota/quotaio_v2.h],[ + AC_DEFINE(HAVE_FS_QUOTA_QUOTAIO_H, 1, + [kernel has fs/quota/quotaio_v2.h]) ],[ - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) +]) ]) ]) +]) + +# 2.6.32 # 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], @@ -1401,16 +507,9 @@ EXTRA_KCFLAGS="-I$LINUX/fs" LB_LINUX_TRY_COMPILE([ #include #include - #ifdef HAVE_QUOTAIO_H - # include - int versions[] = V2_INITQVERSIONS_R1; - struct v2_disk_dqblk_r1 dqblk_r1; - #elif defined(HAVE_FS_QUOTA_QUOTAIO_H) + #if defined(HAVE_FS_QUOTA_QUOTAIO_H) # include struct v2r1_disk_dqblk dqblk_r1; - #elif defined(HAVE_FS_QUOTAIO_H) - # include - struct v2r1_disk_dqblk dqblk_r1; #else #include int ver = QFMT_VFS_V1; @@ -1427,79 +526,6 @@ EXTRA_KCFLAGS="-I$LINUX/fs" EXTRA_KCFLAGS=$tmp_flags ]) -# 2.6.32 set_cpus_allowed is no more defined if CONFIG_CPUMASK_OFFSTACK=yes -AC_DEFUN([LC_SET_CPUS_ALLOWED], - [AC_MSG_CHECKING([if kernel defines set_cpus_allowed]) - LB_LINUX_TRY_COMPILE( - [#include ], - [struct task_struct *p = NULL; - cpumask_t mask = { { 0 } }; - (void) set_cpus_allowed(p, mask);], - [AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_SET_CPUS_ALLOWED, 1, - [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 -# d_obtain_alias() for getting anonymous dentries -# RHEL5(2.6.18) has d_obtain_alias but SLES11SP0(2.6.27) not -# -AC_DEFUN([LC_D_OBTAIN_ALIAS], -[AC_MSG_CHECKING([d_obtain_alias exist in kernel]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - d_obtain_alias(NULL); -],[ - AC_DEFINE(HAVE_D_OBTAIN_ALIAS, 1, - [d_obtain_alias exist in kernel]) - AC_MSG_RESULT([yes]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# -# LC_EXPORT_GENERIC_ERROR_REMOVE_PAGE -# -AC_DEFUN([LC_EXPORT_GENERIC_ERROR_REMOVE_PAGE], - [LB_CHECK_SYMBOL_EXPORT( - [generic_error_remove_page], - [mm/truncate.c], - [AC_DEFINE(HAS_GENERIC_ERROR_REMOVE_PAGE, 1, - [kernel 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. # @@ -1646,37 +672,35 @@ LB_LINUX_TRY_COMPILE([ ]) # -# 2.6.38 export blkdev_get_by_dev +# 2.6.38 inode.i_rcu added. # -AC_DEFUN([LC_BLKDEV_GET_BY_DEV], -[LB_CHECK_SYMBOL_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]) +AC_DEFUN([LC_INODE_I_RCU], +[AC_MSG_CHECKING([if inode.i_rcu exists]) +LB_LINUX_TRY_COMPILE([ + #include ],[ + struct inode ino; + struct rcu_head rcu = {}; + ino.i_rcu = rcu; +],[ + AC_DEFINE(HAVE_INODE_I_RCU, 1, + [inode.i_rcu exists]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) ]) ]) # -# 2.6.38 use path as 4th parameter in quota_on. +# 2.6.38 export blkdev_get_by_dev # -AC_DEFUN([LC_QUOTA_ON_USE_PATH], -[AC_MSG_CHECKING([quota_on use path as parameter]) -tmp_flags="$EXTRA_KCFLAGS" -EXTRA_KCFLAGS="-Werror" -LB_LINUX_TRY_COMPILE([ - #include - #include -],[ - ((struct quotactl_ops *)0)->quota_on(NULL, 0, 0, ((struct path*)0)); -],[ - AC_DEFINE(HAVE_QUOTA_ON_USE_PATH, 1, - [quota_on use path as 4th paramter]) - AC_MSG_RESULT([yes]) +AC_DEFUN([LC_BLKDEV_GET_BY_DEV], +[LB_CHECK_SYMBOL_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]) ],[ - AC_MSG_RESULT([no]) ]) -EXTRA_KCFLAGS="$tmp_flags" ]) # @@ -1729,6 +753,26 @@ LB_LINUX_TRY_COMPILE([ ]) # +# 3.0 dirty_inode() has a flag parameter +# see kernel commit aa38572954ade525817fe88c54faebf85e5a61c0 +# +AC_DEFUN([LC_DIRTY_INODE_WITH_FLAG], +[AC_MSG_CHECKING([if dirty_inode super_operation takes flag]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + struct inode *inode; + inode->i_sb->s_op->dirty_inode(NULL, 0); +],[ + AC_DEFINE(HAVE_DIRTY_INODE_HAS_FLAG, 1, + [dirty_inode super_operation takes flag]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# # 2.6.38 generic_permission taken 4 parameters. # in fact, it means rcu-walk aware permission bring. # @@ -2090,6 +1134,22 @@ LB_LINUX_TRY_COMPILE([ EXTRA_KCFLAGS="$tmp_flags" ]) +# 3.5 has generic_file_llseek_size with 5 args +AC_DEFUN([LC_FILE_LLSEEK_SIZE_5ARG], +[AC_MSG_CHECKING([if kernel has generic_file_llseek_size with 5 args]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + generic_file_llseek_size(NULL, 0, 0, 0, 0); +], [ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_FILE_LLSEEK_SIZE_5ARGS, 1, + [kernel has generic_file_llseek_size with 5 args]) +],[ + AC_MSG_RESULT([no]) +]) +]) + # # 3.6 switch i_dentry/d_alias from list to hlist # @@ -2161,6 +1221,70 @@ LB_LINUX_TRY_COMPILE([ ]) # +# 3.7 posix_acl_{to,from}_xattr take struct user_namespace +# +AC_DEFUN([LC_HAVE_POSIXACL_USER_NS], +[AC_MSG_CHECKING([if posix_acl_to_xattr takes struct user_namespace]) +LB_LINUX_TRY_COMPILE([ + #include + #include +],[ + posix_acl_to_xattr((struct user_namespace *)NULL, NULL, NULL, 0); +],[ + AC_DEFINE(HAVE_POSIXACL_USER_NS, 1, + [posix_acl_to_xattr takes struct user_namespace]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# +# 3.9 uses hlist_for_each_entry with 3 args +# b67bfe0d42cac56c512dd5da4b1b347a23f4b70a +# +AC_DEFUN([LC_HAVE_HLIST_FOR_EACH_3ARG], +[AC_MSG_CHECKING([if hlist_for_each_entry has 3 args]) +LB_LINUX_TRY_COMPILE([ + #include + #include +],[ + struct inode *inode; + struct dentry *dentry; + hlist_for_each_entry(dentry, &inode->i_dentry, d_alias) { + continue; + } +],[ + AC_DEFINE(HAVE_HLIST_FOR_EACH_3ARG, 1, [3 args]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# +# 3.9 killed f_vfsmnt by +# 182be684784334598eee1d90274e7f7aa0063616 +# replacement is f_path.mnt +# +AC_DEFUN([LC_HAVE_F_PATH_MNT], +[AC_MSG_CHECKING([if struct file has f_path.mnt]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + struct file *fp = NULL; + struct path path; + + path.mnt = fp->f_path.mnt; +],[ + AC_DEFINE(HAVE_F_PATH_MNT,1,[yes]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# # LC_PROG_LINUX # # Lustre linux kernel checks @@ -2174,113 +1298,28 @@ AC_DEFUN([LC_PROG_LINUX], LC_CONFIG_LRU_RESIZE LC_LLITE_LLOOP_MODULE - # RHEL4 patches - LC_EXPORT_TRUNCATE_COMPLETE - LC_EXPORT_D_REHASH_COND - LC_EXPORT___D_REHASH - LC_EXPORT_NODE_TO_CPUMASK - - LC_FILEMAP_POPULATE - LC_BIT_SPINLOCK_H - - LC_CONST_ACL_SIZE - LC_CAPA_CRYPTO LC_CONFIG_RMTCLIENT LC_CONFIG_GSS - LC_TASK_CLENV_STORE - - # 2.6.12 - LC_RW_TREE_LOCK - - # 2.6.18 - LC_UMOUNTBEGIN_HAS_VFSMOUNT - - #2.6.18 + RHEL5 (fc6) - LC_LINUX_FIEMAP_H - - # 2.6.19 - LC_FILE_WRITEV - LC_FILE_READV - - # 2.6.20 - LC_CANCEL_DIRTY_PAGE - - # raid5-zerocopy patch - LC_PAGE_CONSTANT - - # 2.6.22 - LC_INVALIDATE_BDEV_2ARG - LC_ASYNC_BLOCK_CIPHER - LC_STRUCT_HASH_DESC - LC_STRUCT_BLKCIPHER_DESC - LC_FS_RENAME_DOES_D_MOVE - - # 2.6.23 - LC_UNREGISTER_BLKDEV_RETURN_INT - LC_KERNEL_SPLICE_READ - LC_KERNEL_SENDFILE - LC_HAVE_EXPORTFS_H - LC_VM_OP_FAULT - LC_PROCFS_USERS - LC_EXPORTFS_DECODE_FH # 2.6.24 - LC_HAVE_MMTYPES_H LC_BIO_ENDIO_2ARG - LC_FH_TO_DENTRY LC_PROCFS_DELETED - LC_EXPORT_BDI_INIT - - # 2.6.26 - LC_FS_STRUCT_USE_PATH - - # 2.6.27 - LC_SECURITY_PLUG # for SLES10 SP2 - LC_PGMKWRITE_USE_VMFAULT - LC_PGMKWRITE_COMPACT - LC_INODE_PERMISION_2ARGS - LC_TRYLOCKPAGE - LC_READ_INODE_IN_SBOPS - LC_EXPORT_INODE_PERMISSION - LC_QUOTA_ON_5ARGS - LC_QUOTA_OFF_3ARGS - LC_VFS_DQ_OFF - LC_LOCK_MAP_ACQUIRE # 2.6.27.15-2 sles11 - LC_BI_HW_SEGMENTS LC_HAVE_QUOTAIO_H - LC_BDI_NAME - LC_SB_ANY_QUOTA_ACTIVE - LC_SB_HAS_QUOTA_ACTIVE - LC_EXPORT_ADD_TO_PAGE_CACHE_LRU - - # 2.6.29 - LC_SB_ANY_QUOTA_LOADED - - # 2.6.30 - LC_EXPORT_CPUMASK_OF_NODE - - # 2.6.31 - LC_BLK_QUEUE_LOG_BLK_SIZE # 2.6.32 - LC_REQUEST_QUEUE_LIMITS - LC_EXPORT_BDI_REGISTER - LC_SB_BDI - LC_BLK_QUEUE_MAX_SECTORS LC_BLK_QUEUE_MAX_SEGMENTS - LC_SET_CPUS_ALLOWED - LC_CACHE_UPCALL - LC_EXPORT_GENERIC_ERROR_REMOVE_PAGE - LC_SELINUX_IS_ENABLED - LC_EXPORT_ACCESS_PROCESS_VM - LC_VFS_INODE_NEWSIZE_OK + + # 2.6.34 + LC_HAVE_DQUOT_FS_DISK_QUOTA + LC_HAVE_DQUOT_SUSPEND # 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 @@ -2292,8 +1331,8 @@ AC_DEFUN([LC_PROG_LINUX], # 2.6.38 LC_BLKDEV_GET_BY_DEV LC_GENERIC_PERMISSION - LC_QUOTA_ON_USE_PATH LC_DCACHE_LOCK + LC_INODE_I_RCU LC_D_COMPARE_7ARGS LC_D_DELETE_CONST @@ -2301,11 +1340,15 @@ AC_DEFUN([LC_PROG_LINUX], LC_REQUEST_QUEUE_UNPLUG_FN LC_HAVE_FSTYPE_MOUNT + # 3.0 + LC_DIRTY_INODE_WITH_FLAG + # 3.1 LC_LM_XXX_LOCK_MANAGER_OPS LC_INODE_DIO_WAIT LC_IOP_GET_ACL LC_FILE_LLSEEK_SIZE + LC_INODE_PERMISION_2ARGS # 3.1.1 LC_BLOCKS_FOR_TRUNCATE @@ -2328,15 +1371,22 @@ AC_DEFUN([LC_PROG_LINUX], # 3.5 LC_HAVE_CLEAR_INODE LC_HAVE_ENCODE_FH_PARENT + LC_FILE_LLSEEK_SIZE_5ARG # 3.6 LC_HAVE_DENTRY_D_ALIAS_HLIST LC_DENTRY_OPEN_USE_PATH LC_HAVE_IOP_ATOMIC_OPEN + # 3.7 + LC_HAVE_POSIXACL_USER_NS + + # 3.9 + LC_HAVE_HLIST_FOR_EACH_3ARG + LC_HAVE_F_PATH_MNT + # - if test x$enable_server = xyes ; then - AC_DEFINE(HAVE_SERVER_SUPPORT, 1, [support server]) + if test x$enable_server != xno ; then LC_FUNC_DEV_SET_RDONLY LC_STACK_SIZE LC_QUOTA64 @@ -2345,24 +1395,18 @@ AC_DEFUN([LC_PROG_LINUX], ]) # -# LC_CONFIG_CLIENT_SERVER +# LC_CONFIG_CLIENT # -# Build client/server sides of Lustre +# Check whether to build the client side of Lustre # -AC_DEFUN([LC_CONFIG_CLIENT_SERVER], -[AC_MSG_CHECKING([whether to build Lustre server support]) -AC_ARG_ENABLE([server], - AC_HELP_STRING([--disable-server], - [disable Lustre server support]), - [],[enable_server='yes']) -AC_MSG_RESULT([$enable_server]) - -AC_MSG_CHECKING([whether to build Lustre client support]) +AC_DEFUN([LC_CONFIG_CLIENT], +[AC_MSG_CHECKING([whether to build Lustre client support]) AC_ARG_ENABLE([client], AC_HELP_STRING([--disable-client], [disable Lustre client support]), [],[enable_client='yes']) -AC_MSG_RESULT([$enable_client])]) +AC_MSG_RESULT([$enable_client]) +]) # # LC_CONFIG_LIBLUSTRE @@ -2399,83 +1443,6 @@ if test x$enable_liblustre_acl = xyes ; then AC_DEFINE(LIBLUSTRE_POSIX_ACL, 1, Liblustre Support ACL-enabled MDS) fi -# 2.6.29 change prepare/commit_write to write_begin/end -AC_DEFUN([LC_WRITE_BEGIN_END], -[AC_MSG_CHECKING([if kernel has .write_begin/end]) -LB_LINUX_TRY_COMPILE([ - #include - #include -#ifdef HAVE_LINUX_MMTYPES_H - #include -#endif -],[ - struct address_space_operations aops; - struct page *page; - - aops.write_begin = NULL; - aops.write_end = NULL; - page = grab_cache_page_write_begin(NULL, 0, 0); -], [ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_KERNEL_WRITE_BEGIN_END, 1, - [kernel has .write_begin/end]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# 2.6.29 blkdev_put has 2 arguments -AC_DEFUN([LC_BLKDEV_PUT_2ARGS], -[AC_MSG_CHECKING([blkdev_put needs 2 parameters]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - blkdev_put(NULL, 0); -],[ - AC_DEFINE(HAVE_BLKDEV_PUT_2ARGS, 1, - [blkdev_put needs 2 paramters]) - AC_MSG_RESULT([yes]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# 2.6.29 dentry_open has 4 arguments -AC_DEFUN([LC_DENTRY_OPEN_4ARGS], -[AC_MSG_CHECKING([dentry_open needs 4 parameters]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - dentry_open(NULL, NULL, 0, NULL); -],[ - AC_DEFINE(HAVE_DENTRY_OPEN_4ARGS, 1, - [dentry_open needs 4 paramters]) - AC_MSG_RESULT([yes]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# 2.6.29 split file and anonymous page queues -AC_DEFUN([LC_PAGEVEC_LRU_ADD_FILE], -[AC_MSG_CHECKING([if kernel has .pagevec_lru_add_file]) -LB_LINUX_TRY_COMPILE([ - #include - #include -],[ - struct pagevec lru_pagevec; - - pagevec_init(&lru_pagevec, 0); - pagevec_lru_add_file(&lru_pagevec); -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_PAGEVEC_LRU_ADD_FILE, 1, - [kernel has .pagevec_lru_add_file]) -],[ - AC_MSG_RESULT([no]) -]) -]) - # # --enable-mpitest # @@ -2546,9 +1513,11 @@ AC_DEFUN([LC_QUOTA], [#check global LC_CONFIG_QUOTA #check for utils +if test x$enable_quota != xno -a x$enable_utils != xno; then AC_CHECK_HEADER(sys/quota.h, [AC_DEFINE(HAVE_SYS_QUOTA_H, 1, [Define to 1 if you have .])], [AC_MSG_ERROR([don't find in your system])]) +fi ]) # @@ -2568,23 +1537,6 @@ if test x$enable_split != xno; then fi ]) -# RHEL5(2.6.18) has tux_info -AC_DEFUN([LC_TASK_CLENV_TUX_INFO], -[AC_MSG_CHECKING([tux_info]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct task_struct task; - &task.tux_info; -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(LL_TASK_CL_ENV, tux_info, [have tux_info]) - have_task_clenv_store='yes' -],[ - AC_MSG_RESULT([no]) -]) -]) - # # LC_LLITE_LLOOP_MODULE # lloop_llite.ko does not currently work with page sizes @@ -2702,6 +1654,21 @@ AC_CHECK_LIB([z], ) AC_SUBST(ZLIB) +SELINUX="" +AC_CHECK_LIB([selinux], + [is_selinux_enabled], + [AC_CHECK_HEADERS([selinux.h], + [SELINUX="-lselinux" + AC_DEFINE([HAVE_SELINUX], 1, + [support for selinux ])], + [AC_MSG_WARN([No selinux-devel package found, + unable to build selinux enabled + tools])])], + [AC_MSG_WARN([No selinux package found, unable to build selinux + enabled tools])] +) +AC_SUBST(SELINUX) + # Super safe df AC_ARG_ENABLE([mindf], AC_HELP_STRING([--enable-mindf], @@ -2728,7 +1695,7 @@ AC_ARG_ENABLE([invariants], AC_MSG_CHECKING([whether to check invariants (expensive cpu-wise)]) AC_MSG_RESULT([$enable_invariants]) if test x$enable_invariants = xyes ; then - AC_DEFINE([INVARIANT_CHECK], 1, [enable invariant checking]) + AC_DEFINE([CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK], 1, [enable invariant checking]) fi AC_ARG_ENABLE([lu_ref], @@ -2751,14 +1718,6 @@ if test x$enable_pgstat_track = xyes ; then AC_DEFINE([CONFIG_DEBUG_PAGESTATE_TRACKING], 1, [enable page state tracking code]) fi - - #2.6.29 - LC_WRITE_BEGIN_END - LC_D_OBTAIN_ALIAS - LC_BLKDEV_PUT_2ARGS - LC_DENTRY_OPEN_4ARGS - LC_PAGEVEC_LRU_ADD_FILE - ]) # @@ -2768,7 +1727,6 @@ fi # AC_DEFUN([LC_CONDITIONALS], [AM_CONDITIONAL(LIBLUSTRE, test x$enable_liblustre = xyes) -AM_CONDITIONAL(USE_QUILT, test x$QUILT != xno) 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) @@ -2803,13 +1761,13 @@ lustre/include/darwin/Makefile lustre/include/lustre/Makefile lustre/kernel_patches/targets/2.6-rhel6.target lustre/kernel_patches/targets/2.6-rhel5.target -lustre/kernel_patches/targets/2.6-sles10.target lustre/kernel_patches/targets/2.6-sles11.target lustre/kernel_patches/targets/3.0-sles11.target -lustre/kernel_patches/targets/2.6-oel5.target +lustre/kernel_patches/targets/3.0-sles11sp3.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 lustre/fid/autoMakefile @@ -2827,6 +1785,8 @@ lustre/mdc/Makefile lustre/mdc/autoMakefile lustre/lmv/Makefile lustre/lmv/autoMakefile +lustre/lfsck/Makefile +lustre/lfsck/autoMakefile lustre/mdt/Makefile lustre/mdt/autoMakefile lustre/mdd/Makefile