X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fautoconf%2Flustre-core.m4;h=77457677db14e6793ab663a542b848d7bcc432d2;hp=c632a48e92864c2c7fc9a47e7c903b013e85955d;hb=f8539c8d1031cb380516497a4e752d57470cde4b;hpb=8497769eae7a8f29c0056ed3342209ec25ae3c37 diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index c632a48..7745767 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 # @@ -49,68 +47,86 @@ esac ]) # -# Ensure stack size big than 8k in Lustre server (all kernels) +# LC_CONFIG_OBD_BUFFER_SIZE # -AC_DEFUN([LC_STACK_SIZE], -[AC_MSG_CHECKING([stack size big than 8k]) -LB_LINUX_TRY_COMPILE([ - #include +# the maximum buffer size of lctl ioctls +# +AC_DEFUN([LC_CONFIG_OBD_BUFFER_SIZE], +[AC_MSG_CHECKING([maximum OBD ioctl size]) +AC_ARG_WITH([obd-buffer-size], + AC_HELP_STRING([--with-obd-buffer-size=[size]], + [set lctl ioctl maximum bytes (default=8192)]), + [ + OBD_BUFFER_SIZE=$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]) +]) + +# +# LC_READLINK_SSIZE_T +# +AC_DEFUN([LC_READLINK_SSIZE_T], +[AC_MSG_CHECKING([if readlink returns ssize_t]) +AC_TRY_COMPILE([ + #include ],[ - #if THREAD_SIZE < 8192 - #error "stack size < 8192" - #endif + ssize_t readlink(const char *, char *, size_t); ],[ - AC_MSG_RESULT(yes) + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_POSIX_1003_READLINK, 1, [readlink returns ssize_t]) ],[ - AC_MSG_ERROR([Lustre requires that Linux is configured with at least a 8KB stack.]) + AC_MSG_RESULT([no]) ]) ]) # # LC_FUNC_DEV_SET_RDONLY # -# check for the old-style dev_set_rdonly which took an extra "devno" param -# and can only set a single device to discard writes at one time +# check whether dev_set_rdonly is exported. This is needed until we +# have another mechanism to fence IO from the underlying device. # AC_DEFUN([LC_FUNC_DEV_SET_RDONLY], -[AC_MSG_CHECKING([if kernel has new dev_set_rdonly]) +[LB_CHECK_SYMBOL_EXPORT([dev_set_rdonly], +[block/ll_rw_block.c,block/blk-core.c],[ + AC_DEFINE(HAVE_DEV_SET_RDONLY, 1, [kernel exports dev_set_rdonly]) +],[ + AC_MSG_WARN([kernel missing dev_set_rdonly patch for testing]) +]) +]) + +# +# Ensure stack size big than 8k in Lustre server (all kernels) +# +AC_DEFUN([LC_STACK_SIZE], +[AC_MSG_CHECKING([stack size big than 8k]) LB_LINUX_TRY_COMPILE([ - #include - #include + #include ],[ - #ifndef HAVE_CLEAR_RDONLY_ON_PUT - #error needs to be patched by lustre kernel patches from Lustre version 1.4.3 or above. + #if THREAD_SIZE < 8192 + #error "stack size < 8192" #endif ],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_DEV_SET_RDONLY, 1, [kernel has new dev_set_rdonly]) + AC_MSG_RESULT(yes) ],[ - AC_MSG_ERROR([no, Linux kernel source needs to be patches by lustre -kernel patches from Lustre version 1.4.3 or above.]) + AC_MSG_ERROR([Lustre requires that Linux is configured with at least a 8KB stack.]) ]) ]) # -# LC_CONFIG_BACKINGFS -# -# setup, check the backing filesystem +# Allow the user to set the MDS thread upper limit # -AC_DEFUN([LC_CONFIG_BACKINGFS], +AC_DEFUN([LC_MDS_MAX_THREADS], [ -BACKINGFS="ldiskfs" - -if test x$with_ldiskfs = xno ; then - if test x$linux25$enable_server = xyesyes ; then - AC_MSG_ERROR([ldiskfs is required for 2.6-based servers.]) - fi -else - # ldiskfs is enabled - LB_DEFINE_LDISKFS_OPTIONS -fi #ldiskfs - -AC_MSG_CHECKING([which backing filesystem to use]) -AC_MSG_RESULT([$BACKINGFS]) -AC_SUBST(BACKINGFS) + 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]) + ]) ]) # @@ -148,27 +164,18 @@ fi ]) # -# LC_HEADER_LDISKFS_XATTR -# -# CHAOS kernel-devel package will not include fs/ldiskfs/xattr.h +# LC_CONFIG_LIBLUSTRE_RECOVERY # -AC_DEFUN([LC_HEADER_LDISKFS_XATTR], -[AC_MSG_CHECKING([if ldiskfs has xattr.h header]) -tmp_flags="$EXTRA_KCFLAGS" -EXTRA_KCFLAGS="-I$LINUX/fs -I$LDISKFS_DIR -I$LDISKFS_DIR/ldiskfs" -LB_LINUX_TRY_COMPILE([ - #include -],[ - ldiskfs_xattr_get(NULL, 0, "", NULL, 0); - ldiskfs_xattr_set_handle(NULL, NULL, 0, "", NULL, 0, 0); - -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_LDISKFS_XATTR_H, 1, [ldiskfs/xattr.h found]) -],[ - AC_MSG_RESULT([no]) -]) -EXTRA_KCFLAGS="$tmp_flags" +AC_DEFUN([LC_CONFIG_LIBLUSTRE_RECOVERY], +[AC_MSG_CHECKING([whether to enable liblustre recovery support]) +AC_ARG_ENABLE([liblustre-recovery], + AC_HELP_STRING([--disable-liblustre-recovery], + [disable liblustre recovery support]), + [],[enable_liblustre_recovery='yes']) +AC_MSG_RESULT([$enable_liblustre_recovery]) +if test x$enable_liblustre_recovery != xno ; then + AC_DEFINE(ENABLE_LIBLUSTRE_RECOVERY, 1, Liblustre Can Recover) +fi ]) # @@ -188,139 +195,86 @@ if test x$enable_health_write != xno ; then fi ]) -# -# LC_CONFIG_LIBLUSTRE_RECOVERY -# -AC_DEFUN([LC_CONFIG_LIBLUSTRE_RECOVERY], -[AC_MSG_CHECKING([whether to enable liblustre recovery support]) -AC_ARG_ENABLE([liblustre-recovery], - AC_HELP_STRING([--disable-liblustre-recovery], - [disable liblustre recovery support]), - [],[enable_liblustre_recovery='yes']) -AC_MSG_RESULT([$enable_liblustre_recovery]) -if test x$enable_liblustre_recovery != xno ; then - AC_DEFINE(ENABLE_LIBLUSTRE_RECOVERY, 1, Liblustre Can Recover) +AC_DEFUN([LC_CONFIG_LRU_RESIZE], +[AC_MSG_CHECKING([whether to enable lru self-adjusting]) +AC_ARG_ENABLE([lru_resize], + AC_HELP_STRING([--enable-lru-resize], + [enable lru resize support]), + [],[enable_lru_resize='yes']) +AC_MSG_RESULT([$enable_lru_resize]) +if test x$enable_lru_resize != xno; then + AC_DEFINE(HAVE_LRU_RESIZE_SUPPORT, 1, [Enable lru resize support]) fi ]) # -# LC_CONFIG_OBD_BUFFER_SIZE -# -# the maximum buffer size of lctl ioctls +# Quota support. The kernel must support CONFIG_QUOTA. # -AC_DEFUN([LC_CONFIG_OBD_BUFFER_SIZE], -[AC_MSG_CHECKING([maximum OBD ioctl size]) -AC_ARG_WITH([obd-buffer-size], - AC_HELP_STRING([--with-obd-buffer-size=[size]], - [set lctl ioctl maximum bytes (default=8192)]), - [ - OBD_BUFFER_SIZE=$with_obd_buffer_size - ],[ - OBD_BUFFER_SIZE=8192 +AC_DEFUN([LC_QUOTA_CONFIG], +[LB_LINUX_CONFIG_IM([QUOTA],[],[ + AC_MSG_ERROR([Lustre quota requires that CONFIG_QUOTA is enabled in your kernel.]) ]) -AC_MSG_RESULT([$OBD_BUFFER_SIZE bytes]) -AC_DEFINE_UNQUOTED(OBD_MAX_IOCTL_BUFFER, $OBD_BUFFER_SIZE, [IOCTL Buffer Size]) ]) -# -# LC_STRUCT_STATFS -# -# AIX does not have statfs.f_namelen -# -AC_DEFUN([LC_STRUCT_STATFS], -[AC_MSG_CHECKING([if struct statfs has a f_namelen field]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct statfs sfs; - sfs.f_namelen = 1; -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_STATFS_NAMELEN, 1, [struct statfs has a namelen field]) -],[ - AC_MSG_RESULT([no]) -]) -]) +# truncate_complete_page() was exported from RHEL5/SLES10, but not in SLES11 SP0 (2.6.27) +# 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], + [LB_CHECK_SYMBOL_EXPORT([truncate_complete_page], + [mm/truncate.c], + [AC_DEFINE(HAVE_TRUNCATE_COMPLETE_PAGE, 1, + [kernel export truncate_complete_page])]) + LB_CHECK_SYMBOL_EXPORT([remove_from_page_cache], + [mm/filemap.c], + [AC_DEFINE(HAVE_REMOVE_FROM_PAGE_CACHE, 1, + [kernel export remove_from_page_cache])]) + LB_CHECK_SYMBOL_EXPORT([delete_from_page_cache], + [mm/filemap.c], + [AC_DEFINE(HAVE_DELETE_FROM_PAGE_CACHE, 1, + [kernel export delete_from_page_cache])]) + ]) -# -# LC_READLINK_SSIZE_T -# -AC_DEFUN([LC_READLINK_SSIZE_T], -[AC_MSG_CHECKING([if readlink returns ssize_t]) -AC_TRY_COMPILE([ - #include -],[ - ssize_t readlink(const char *, char *, size_t); -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_POSIX_1003_READLINK, 1, [readlink returns ssize_t]) +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_MSG_RESULT([no]) ]) ]) -# -# LC_FUNC_MS_FLOCK_LOCK -# -# 2.6.5 kernel has MS_FLOCK_LOCK sb flag -# -AC_DEFUN([LC_FUNC_MS_FLOCK_LOCK], -[AC_MSG_CHECKING([if kernel has MS_FLOCK_LOCK sb flag]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - int flags = MS_FLOCK_LOCK; -],[ - AC_DEFINE(HAVE_MS_FLOCK_LOCK, 1, - [kernel has MS_FLOCK_LOCK flag]) - AC_MSG_RESULT([yes]) +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]) ],[ - AC_MSG_RESULT([no]) ]) ]) -# -# 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]) -]) -]) +# 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 + ]) # -# LC_FUNC_RELEASEPAGE_WITH_GFP -# -# 2.6.9 ->releasepage() takes a gfp_t arg -# This kernel defines gfp_t (HAS_GFP_T) but doesn't use it for this function, -# while others either don't have gfp_t or pass gfp_t as the parameter. -# -AC_DEFUN([LC_FUNC_RELEASEPAGE_WITH_GFP], -[AC_MSG_CHECKING([if releasepage has a gfp_t parameter]) -RELEASEPAGE_WITH_GFP="$(grep -c 'releasepage.*gfp_t' $LINUX/include/linux/fs.h)" -if test "$RELEASEPAGE_WITH_GFP" != 0 ; then - AC_DEFINE(HAVE_RELEASEPAGE_WITH_GFP, 1, - [releasepage with gfp_t parameter]) - AC_MSG_RESULT([yes]) -else - AC_MSG_RESULT([no]) -fi -]) - # # between 2.6.5 - 2.6.22 filemap_populate is exported in some kernels # @@ -340,23 +294,6 @@ LB_LINUX_TRY_COMPILE([ ]) # -# added in 2.6.15 -# -AC_DEFUN([LC_D_ADD_UNIQUE], -[AC_MSG_CHECKING([for d_add_unique]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - d_add_unique(NULL, NULL); -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_D_ADD_UNIQUE, 1, [Kernel has d_add_unique]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# # added in 2.6.17 # AC_DEFUN([LC_BIT_SPINLOCK_H], @@ -377,88 +314,54 @@ AC_DEFUN([LC_BIT_SPINLOCK_H], ]) # -# After 2.6.26 we no longer have xattr_acl.h +# LC_CONST_ACL_SIZE # -AC_DEFUN([LC_XATTR_ACL], -[LB_CHECK_FILE([$LINUX/include/linux/xattr_acl.h],[ - AC_MSG_CHECKING([if xattr_acl.h can be compiled]) - LB_LINUX_TRY_COMPILE([ - #include - ],[],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_XATTR_ACL, 1, [Kernel has xattr_acl]) - ],[ - AC_MSG_RESULT([no]) - ]) -], -[]) -]) +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 -# 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 + 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; + } ],[ - struct open_intent intent; - &intent.file; + 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_MSG_RESULT([yes]) - AC_DEFINE(HAVE_FILE_IN_STRUCT_INTENT, 1, [struct open_intent has a file field]) + AC_ERROR([ACL size can't be computed]) ],[ - AC_MSG_RESULT([no]) + AC_MSG_RESULT([can't check ACL size, make it 260]) + AC_DEFINE_UNQUOTED(XATTR_ACL_SIZE,260) ]) +CFLAGS="$tmp_flags" ]) - # -# After 2.6.16 the xattr_acl API is removed, and posix_acl is used instead +# LC_CAPA_CRYPTO # -AC_DEFUN([LC_POSIX_ACL_XATTR_H], -[LB_CHECK_FILE([$LINUX/include/linux/posix_acl_xattr.h],[ - AC_MSG_CHECKING([if linux/posix_acl_xattr.h can be compiled]) - LB_LINUX_TRY_COMPILE([ - #include - #include - ],[],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_LINUX_POSIX_ACL_XATTR_H, 1, [linux/posix_acl_xattr.h found]) - - ],[ - AC_MSG_RESULT([no]) - ]) -$1 -],[ - AC_MSG_RESULT([no]) -]) -]) - -# -# 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_CAPA_CRYPTO -# -AC_DEFUN([LC_CAPA_CRYPTO], -[LB_LINUX_CONFIG_IM([CRYPTO],[],[ - AC_MSG_ERROR([Lustre capability require that CONFIG_CRYPTO is enabled in your kernel.]) +AC_DEFUN([LC_CAPA_CRYPTO], +[LB_LINUX_CONFIG_IM([CRYPTO],[],[ + AC_MSG_ERROR([Lustre capability require that CONFIG_CRYPTO is enabled in your kernel.]) ]) LB_LINUX_CONFIG_IM([CRYPTO_HMAC],[],[ AC_MSG_ERROR([Lustre capability require that CONFIG_CRYPTO_HMAC is enabled in your kernel.]) @@ -480,27 +383,6 @@ AC_DEFUN([LC_CONFIG_RMTCLIENT], ]) ]) -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 -]) - # # LC_CONFIG_GSS_KEYRING (default enabled, if gss is enabled) # @@ -524,6 +406,11 @@ AC_DEFUN([LC_CONFIG_GSS_KEYRING], fi ]) +AC_DEFUN([LC_CONFIG_SUNRPC], +[LB_LINUX_CONFIG_IM([SUNRPC],[], + [AC_MSG_ERROR([kernel SUNRPC support is required by using GSS.])]) +]) + # # LC_CONFIG_GSS (default disabled) # @@ -564,182 +451,41 @@ AC_DEFUN([LC_CONFIG_GSS], fi ]) -# LC_EXPORT_SYNCHRONIZE_RCU -# after 2.6.12 synchronize_rcu is preferred over synchronize_kernel -AC_DEFUN([LC_EXPORT_SYNCHRONIZE_RCU], -[LB_CHECK_SYMBOL_EXPORT([synchronize_rcu], -[kernel/rcupdate.c],[ - AC_DEFINE(HAVE_SYNCHRONIZE_RCU, 1, - [in 2.6.12 synchronize_rcu preferred over synchronize_kernel]) -],[ -]) -]) - -# LC_INODE_I_MUTEX -# after 2.6.15 inode have i_mutex intead of i_sem -AC_DEFUN([LC_INODE_I_MUTEX], -[AC_MSG_CHECKING([if inode has i_mutex ]) -LB_LINUX_TRY_COMPILE([ - #include - #include - #undef i_mutex -],[ - struct inode i; - - mutex_unlock(&i.i_mutex); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_INODE_I_MUTEX, 1, - [after 2.6.15 inode have i_mutex intead of i_sem]) -],[ - AC_MSG_RESULT(no) -]) -]) - -# 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_DQUOTOFF_MUTEX -# after 2.6.17 dquote use mutex instead if semaphore -AC_DEFUN([LC_DQUOTOFF_MUTEX], -[AC_MSG_CHECKING([use dqonoff_mutex]) -LB_LINUX_TRY_COMPILE([ - #include - #include - #include -],[ - struct quota_info dq; - - mutex_unlock(&dq.dqonoff_mutex); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_DQUOTOFF_MUTEX, 1, - [after 2.6.17 dquote use mutex instead if semaphore]) -],[ - AC_MSG_RESULT(no) -]) +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 ]) -# LC_FLUSH_OWNER_ID -# starting from 2.6.18 the file_operations .flush -# method has a new "fl_owner_t id" parameter -# -AC_DEFUN([LC_FLUSH_OWNER_ID], -[AC_MSG_CHECKING([if file_operations .flush has an fl_owner_t id]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct file_operations *fops = NULL; - fl_owner_t id; - int i; - - i = fops->flush(NULL, id); -],[ - AC_DEFINE(HAVE_FLUSH_OWNER_ID, 1, - [file_operations .flush method has an fl_owner_t id]) - AC_MSG_RESULT([yes]) -],[ - AC_MSG_RESULT([no]) -]) -]) +# 2.6.12 -# -# LC_STATFS_DENTRY_PARAM -# starting from 2.6.18 linux kernel uses dentry instead of -# super_block for first vfs_statfs argument -# -AC_DEFUN([LC_STATFS_DENTRY_PARAM], -[AC_MSG_CHECKING([first vfs_statfs parameter is dentry]) +# ~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 ],[ - int vfs_statfs(struct dentry *, struct kstatfs *); -],[ - AC_DEFINE(HAVE_STATFS_DENTRY_PARAM, 1, - [first parameter of vfs_statfs is dentry]) - AC_MSG_RESULT([yes]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# -# 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]) -]) -]) + struct address_space a; -# -# LC_D_OBTAIN_ALIAS -# starting from 2.6.18 kernel don't export do_kern_mount -# and want to use vfs_kern_mount instead. -# -AC_DEFUN([LC_D_OBTAIN_ALIAS], -[AC_MSG_CHECKING([d_obtain_alias exist in kernel]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - d_obtain_alias(NULL); + write_lock(&a.tree_lock); ],[ - AC_DEFINE(HAVE_D_OBTAIN_ALIAS, 1, - [d_obtain_alias exist in kernel]) 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" ]) -# -# 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) -]) -]) +# 2.6.18 # 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" @@ -768,68 +514,31 @@ LB_LINUX_TRY_COMPILE([ EXTRA_KCFLAGS="$tmp_flags" ]) -# inode have i_private field since 2.6.17 -AC_DEFUN([LC_INODE_IPRIVATE], -[AC_MSG_CHECKING([if inode has a i_private field]) -LB_LINUX_TRY_COMPILE([ -#include -],[ - struct inode i; - i.i_private = NULL; -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_INODE_IPRIVATE, 1, - [struct inode has i_private field]) -],[ - AC_MSG_RESULT(no) -]) -]) +#2.6.18 + RHEL5 (fc6) -# 2.6.19 API changes -# inode don't have i_blksize field -AC_DEFUN([LC_INODE_BLKSIZE], -[AC_MSG_CHECKING([inode has i_blksize field]) -LB_LINUX_TRY_COMPILE([ -#include -],[ - struct inode i; - i.i_blksize = 0; -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_INODE_BLKSIZE, 1, - [struct inode has i_blksize field]) -],[ - AC_MSG_RESULT(no) -]) +# +# 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]) + ]) +], +[]) ]) -# LC_VFS_READDIR_U64_INO -# 2.6.19 use u64 for inode number instead of inode_t -AC_DEFUN([LC_VFS_READDIR_U64_INO], -[AC_MSG_CHECKING([check vfs_readdir need 64bit inode number]) -tmp_flags="$EXTRA_KCFLAGS" -EXTRA_KCFLAGS="-Werror" -LB_LINUX_TRY_COMPILE([ -#include - int fillonedir(void * __buf, const char * name, int namlen, loff_t offset, - u64 ino, unsigned int d_type) - { - return 0; - } -],[ - filldir_t filter; - - filter = fillonedir; - return 1; -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_VFS_READDIR_U64_INO, 1, - [if vfs_readdir need 64bit inode number]) -],[ - AC_MSG_RESULT(no) -]) -EXTRA_KCFLAGS="$tmp_flags" -]) +# 2.6.19 # LC_FILE_WRITEV # 2.6.19 replaced writev with aio_write @@ -849,7 +558,7 @@ LB_LINUX_TRY_COMPILE([ ]) ]) -# LC_GENERIC_FILE_READ +# LC_FILE_READV # 2.6.19 replaced readv with aio_read AC_DEFUN([LC_FILE_READV], [AC_MSG_CHECKING([readv in fops]) @@ -867,22 +576,7 @@ LB_LINUX_TRY_COMPILE([ ]) ]) -# LC_NR_PAGECACHE -# 2.6.18 don't export nr_pagecahe -AC_DEFUN([LC_NR_PAGECACHE], -[AC_MSG_CHECKING([kernel export nr_pagecache]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - return atomic_read(&nr_pagecache); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_NR_PAGECACHE, 1, - [is kernel export nr_pagecache]) -],[ - AC_MSG_RESULT(no) -]) -]) +# 2.6.20 # LC_CANCEL_DIRTY_PAGE # 2.6.20 introduced cancel_dirty_page instead of clear_page_dirty. @@ -909,6 +603,8 @@ AC_DEFUN([LC_CANCEL_DIRTY_PAGE], fi ]) +# raid5-zerocopy patch + # # LC_PAGE_CONSTANT # @@ -933,178 +629,98 @@ LB_LINUX_TRY_COMPILE([ ]) ]) -# RHEL5 in FS-cache patch rename PG_checked flag into PG_fs_misc -AC_DEFUN([LC_PG_FS_MISC], -[AC_MSG_CHECKING([kernel has PG_fs_misc]) +# 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 - #include + #include ],[ - #ifndef PG_fs_misc - #error PG_fs_misc not defined in kernel - #endif + invalidate_bdev(NULL,0); ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_PG_FS_MISC, 1, - [is kernel have PG_fs_misc]) + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_INVALIDATE_BDEV_2ARG, 1, + [invalidate_bdev has second argument]) ],[ - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) ]) ]) -# RHEL5 PageChecked and SetPageChecked defined -AC_DEFUN([LC_PAGE_CHECKED], -[AC_MSG_CHECKING([kernel has PageChecked and SetPageChecked]) +# +# check for crypto API +# +AC_DEFUN([LC_ASYNC_BLOCK_CIPHER], +[AC_MSG_CHECKING([if kernel has block cipher support]) LB_LINUX_TRY_COMPILE([ - #include -#ifdef HAVE_LINUX_MMTYPES_H - #include -#endif - #include + #include + #include ],[ - struct page *p; - - /* before 2.6.26 this define*/ - #ifndef PageChecked - /* 2.6.26 use function instead of define for it */ - SetPageChecked(p); - PageChecked(p); - #endif + struct crypto_blkcipher *tfm; + tfm = crypto_alloc_blkcipher("aes", 0, sizeof(tfm) ); ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_PAGE_CHECKED, 1, - [does kernel have PageChecked and SetPageChecked]) + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_ASYNC_BLOCK_CIPHER, 1, [kernel has block cipher support]) ],[ - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) ]) ]) -AC_DEFUN([LC_EXPORT_TRUNCATE_COMPLETE], -[LB_CHECK_SYMBOL_EXPORT([truncate_complete_page], -[mm/truncate.c],[ -AC_DEFINE(HAVE_TRUNCATE_COMPLETE_PAGE, 1, - [kernel export truncate_complete_page]) +# +# 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 ],[ -]) -]) - -AC_DEFUN([LC_EXPORT_TRUNCATE_RANGE], -[LB_CHECK_SYMBOL_EXPORT([truncate_inode_pages_range], -[mm/truncate.c],[ -AC_DEFINE(HAVE_TRUNCATE_RANGE, 1, - [kernel export truncate_inode_pages_range]) + struct hash_desc foo __attribute__ ((unused)); ],[ -]) -]) - -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_MSG_RESULT([yes]) + AC_DEFINE(HAVE_STRUCT_HASH_DESC, 1, [kernel has struct hash_desc]) ],[ + AC_MSG_RESULT([no]) ]) ]) -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]) +# +# 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 ],[ -]) -]) - -AC_DEFUN([LC_EXPORT_D_MOVE_LOCKED], -[LB_CHECK_SYMBOL_EXPORT([d_move_locked], -[fs/dcache.c],[ -AC_DEFINE(HAVE_D_MOVE_LOCKED, 1, - [d_move_locked is exported by the kernel]) + struct blkcipher_desc foo __attribute__ ((unused)); ],[ -]) -]) - -AC_DEFUN([LC_EXPORT___D_MOVE], -[LB_CHECK_SYMBOL_EXPORT([__d_move], -[fs/dcache.c],[ -AC_DEFINE(HAVE___D_MOVE, 1, - [__d_move is exported by the kernel]) + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_STRUCT_BLKCIPHER_DESC, 1, [kernel has struct blkcipher_desc]) ],[ + AC_MSG_RESULT([no]) ]) ]) # -# LC_EXPORT_INVALIDATE_MAPPING_PAGES -# -# SLES9, RHEL4, RHEL5, vanilla 2.6.24 export invalidate_mapping_pages() but -# SLES10 2.6.16 does not, for some reason. For filter cache invalidation. -# -AC_DEFUN([LC_EXPORT_INVALIDATE_MAPPING_PAGES], - [LB_CHECK_SYMBOL_EXPORT([invalidate_mapping_pages], [mm/truncate.c], [ - AC_DEFINE(HAVE_INVALIDATE_MAPPING_PAGES, 1, - [exported invalidate_mapping_pages])], - [LB_CHECK_SYMBOL_EXPORT([invalidate_inode_pages], [mm/truncate.c], [ - AC_DEFINE(HAVE_INVALIDATE_INODE_PAGES, 1, - [exported invalidate_inode_pages])], [ - AC_MSG_ERROR([no way to invalidate pages]) - ]) - ],[]) -]) - -# -# LC_EXPORT_FILEMAP_FDATASYNC_RANGE -# -# No standard kernels export this +# 2.6.19 check for FS_RENAME_DOES_D_MOVE flag # -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]) -],[ -]) -]) - -# 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 - ]) - -# 2.6.22 lost second parameter for invalidate_bdev -AC_DEFUN([LC_INVALIDATE_BDEV_2ARG], -[AC_MSG_CHECKING([if invalidate_bdev has second argument]) +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 + #include ],[ - invalidate_bdev(NULL,0); + int v __attribute__ ((unused)); + v = FS_RENAME_DOES_D_MOVE; ],[ AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_INVALIDATE_BDEV_2ARG, 1, - [invalidate_bdev has second argument]) + AC_DEFINE(HAVE_FS_RENAME_DOES_D_MOVE, 1, [kernel has FS_RENAME_DOES_D_MOVE flag]) ],[ AC_MSG_RESULT([no]) ]) ]) -# 2.6.18 - +# 2.6.23 # 2.6.23 have return type 'void' for unregister_blkdev AC_DEFUN([LC_UNREGISTER_BLKDEV_RETURN_INT], @@ -1112,7 +728,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, @@ -1123,37 +740,37 @@ LB_LINUX_TRY_COMPILE([ ]) # 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]) +AC_DEFUN([LC_KERNEL_SPLICE_READ], +[AC_MSG_CHECKING([if kernel has .splice_read]) LB_LINUX_TRY_COMPILE([ #include ],[ struct file_operations file; - file.sendfile = NULL; + file.splice_read = NULL; ], [ AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_KERNEL_SENDFILE, 1, - [kernel has .sendfile]) + AC_DEFINE(HAVE_KERNEL_SPLICE_READ, 1, + [kernel has .slice_read]) ],[ 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]) +# 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.splice_read = NULL; + file.sendfile = NULL; ], [ AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_KERNEL_SPLICE_READ, 1, - [kernel has .slice_read]) + AC_DEFINE(HAVE_KERNEL_SENDFILE, 1, + [kernel has .sendfile]) ],[ AC_MSG_RESULT([no]) ]) @@ -1187,17 +804,53 @@ LB_LINUX_TRY_COMPILE([ ]) ]) -#2.6.23 has new shrinker API -AC_DEFUN([LC_REGISTER_SHRINKER], -[AC_MSG_CHECKING([if kernel has register_shrinker]) +# 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 + #include +],[ + struct proc_dir_entry pde; + + pde.pde_users = 0; ],[ - register_shrinker(NULL); -], [ AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_REGISTER_SHRINKER, 1, - [kernel has register_shrinker]) + 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]) ]) @@ -1223,15 +876,12 @@ LB_LINUX_TRY_COMPILE([ 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 -#else - #include #endif ],[ - struct export_operations exp; - - exp.fh_to_dentry = NULL; + do{ }while(sizeof(((struct export_operations *)0)->fh_to_dentry)); ], [ AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_FH_TO_DENTRY, 1, @@ -1241,16 +891,6 @@ LB_LINUX_TRY_COMPILE([ ]) ]) -# 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 removes long aged procfs entry -> deleted member AC_DEFUN([LC_PROCFS_DELETED], [AC_MSG_CHECKING([if kernel has deleted member in procfs entry struct]) @@ -1259,7 +899,7 @@ LB_LINUX_TRY_COMPILE([ ],[ struct proc_dir_entry pde; - pde.deleted = NULL; + pde.deleted = sizeof(pde); ], [ AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_PROCFS_DELETED, 1, @@ -1269,25 +909,17 @@ LB_LINUX_TRY_COMPILE([ ]) ]) -# 2.6.25 change define to inline -AC_DEFUN([LC_MAPPING_CAP_WRITEBACK_DIRTY], -[AC_MSG_CHECKING([if kernel have mapping_cap_writeback_dirty]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - #ifndef mapping_cap_writeback_dirty - mapping_cap_writeback_dirty(NULL); - #endif -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_MAPPING_CAP_WRITEBACK_DIRTY, 1, - [kernel have mapping_cap_writeback_dirty]) +# 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]) ],[ - AC_MSG_RESULT([no]) ]) ]) - +# 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], @@ -1297,10 +929,9 @@ LB_LINUX_TRY_COMPILE([ #include #include ],[ - struct path path; struct fs_struct fs; - fs.pwd = path; + fs.pwd = *((struct path *)sizeof(fs)); ], [ AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_FS_STRUCT_USE_PATH, 1, @@ -1311,619 +942,1175 @@ LB_LINUX_TRY_COMPILE([ ]) # -# LC_VFS_INTENT_PATCHES +# 2.6.27 # -# check if the kernel has the VFS intent patches -AC_DEFUN([LC_VFS_INTENT_PATCHES], -[AC_MSG_CHECKING([if the kernel has the VFS intent patches]) + +# 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 + #include + #include +],[ + notify_change(NULL, NULL, NULL); +],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_SECURITY_PLUG, 1, + [SLES10 SP2 use extra parameter in vfs]) ],[ - struct nameidata nd; - struct lookup_intent *it; + AC_MSG_RESULT(no) +]) +]) - it = &nd.intent; - intent_init(it, IT_OPEN); - it->d.lustre.it_disposition = 0; - it->d.lustre.it_data = NULL; +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_VFS_INTENT_PATCHES, 1, [VFS intent patches are applied]) + 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_S_TIME_GRAN], -[AC_MSG_CHECKING([if super block has s_time_gran member]) +AC_DEFUN([LC_INODE_PERMISION_2ARGS], +[AC_MSG_CHECKING([inode_operations->permission has two args]) LB_LINUX_TRY_COMPILE([ #include ],[ - struct super_block sb; + struct inode *inode __attribute__ ((unused)); - return sb.s_time_gran; + inode = NULL; + inode->i_op->permission(NULL, 0); ],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_S_TIME_GRAN, 1, [super block has s_time_gran member]) + 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]) ]) ]) -AC_DEFUN([LC_SB_TIME_GRAN], -[AC_MSG_CHECKING([if kernel has old get_sb_time_gran]) +# 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 ],[ - return get_sb_time_gran(NULL); + 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_DEFINE(HAVE_SB_TIME_GRAN, 1, [kernel has old get_sb_time_gran]) ],[ AC_MSG_RESULT([no]) ]) ]) -# -# LC_FUNC_GRAB_CACHE_PAGE_NOWAIT_GFP -# -# Check for our patched grab_cache_page_nowait_gfp() function -# after 2.6.29 we can emulate this using add_to_page_cache_lru() -# -AC_DEFUN([LC_FUNC_GRAB_CACHE_PAGE_NOWAIT_GFP], -[LB_CHECK_SYMBOL_EXPORT([grab_cache_page_nowait_gfp], -[mm/filemap.c],[ - AC_DEFINE(HAVE_GRAB_CACHE_PAGE_NOWAIT_GFP, 1, - [kernel exports grab_cache_page_nowait_gfp]) - ], - [LB_CHECK_SYMBOL_EXPORT([add_to_page_cache_lru], - [mm/filemap.c],[ - AC_DEFINE(HAVE_ADD_TO_PAGE_CACHE_LRU, 1, - [kernel exports add_to_page_cache_lru]) - ],[ - ]) - ]) +# 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.12 merge patch from oracle to convert tree_lock from spinlock to rwlock -AC_DEFUN([LC_RW_TREE_LOCK], -[AC_MSG_CHECKING([if kernel has tree_lock as rwlock]) -tmp_flags="$EXTRA_KCFLAGS" -EXTRA_KCFLAGS="-Werror" +# 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 address_space a; - - write_lock(&a.tree_lock); + 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_DEFINE(HAVE_RW_TREE_LOCK, 1, [kernel has tree_lock as rw_lock]) ],[ AC_MSG_RESULT([no]) ]) -EXTRA_KCFLAGS="$tmp_flags" ]) -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/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include $EXTRA_KCFLAGS" -AC_TRY_RUN([ -#define __KERNEL__ -#include -#include -#undef __KERNEL__ -// block include -#define __LINUX_POSIX_ACL_H +# 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]) +]) +]) -# ifdef CONFIG_FS_POSIX_ACL -# ifdef HAVE_XATTR_ACL -# include -# endif -# ifdef HAVE_LINUX_POSIX_ACL_XATTR_H -# include -# endif -# endif +# 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) +]) +]) -#include +# 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) + ]) +]) -#include +# 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]) +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]) +],[ + AC_MSG_RESULT(no) +]) +]) -int main(void) -{ - int size = mds_xattr_acl_size(LUSTRE_POSIX_ACL_MAX_ENTRIES); - FILE *f = fopen("acl.size","w+"); - fprintf(f,"%d", size); - fclose(f); +# 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]) +],[ +]) +]) - return 0; -} +# 2.6.32 add s_bdi for super block +AC_DEFUN([LC_SB_BDI], +[AC_MSG_CHECKING([if super_block has s_bdi field]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + struct super_block sb; + sb.s_bdi = NULL; +],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_SB_BDI, 1, + [super_block has s_bdi field]) +],[ + AC_MSG_RESULT(no) +]) +]) + +# 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]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + struct backing_dev_info bdi; + bdi.name = NULL; +],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_BDI_NAME, 1, + [backing_device_info has name field]) +],[ + 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]) +],[ + AC_MSG_RESULT(no) +]) +]) +# 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], +[AC_MSG_CHECKING([if blk_queue_max_segments is defined]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + blk_queue_max_segments(NULL, 0); +],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_BLK_QUEUE_MAX_SEGMENTS, 1, + [blk_queue_max_segments is defined]) +],[ + AC_MSG_RESULT(no) +]) +]) + +# +# 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],[ + AC_MSG_CHECKING([if kernel has 64-bit quota limits support]) +tmp_flags="$EXTRA_KCFLAGS" +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) + # 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; + #endif + ],[],[ + AC_DEFINE(HAVE_QUOTA64, 1, [have quota64]) + AC_MSG_RESULT([yes]) + ],[ + LB_CHECK_FILE([$LINUX/include/linux/lustre_version.h],[ + AC_MSG_ERROR([You have got no 64-bit kernel quota support.]) + ],[]) + AC_MSG_RESULT([no]) + ]) +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. +# +AC_DEFUN([LC_FS_STRUCT_RWLOCK], +[AC_MSG_CHECKING([if fs_struct.lock use rwlock]) +LB_LINUX_TRY_COMPILE([ + #include + #include + #include +],[ + ((struct fs_struct *)0)->lock = (rwlock_t){ 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_DEFINE(HAVE_FS_STRUCT_RWLOCK, 1, + [fs_struct.lock use rwlock]) + AC_MSG_RESULT([yes]) ],[ - AC_ERROR([ACL size can't computed]) + AC_MSG_RESULT([no]) ]) -CFLAGS="$tmp_flags" ]) # -# check for crypto API +# 2.6.36 super_operations add evict_inode method. it hybird of +# delete_inode & clear_inode. # -AC_DEFUN([LC_ASYNC_BLOCK_CIPHER], -[AC_MSG_CHECKING([if kernel has block cipher support]) +AC_DEFUN([LC_SBOPS_EVICT_INODE], +[AC_MSG_CHECKING([if super_operations.evict_inode exist]) LB_LINUX_TRY_COMPILE([ - #include - #include + #include ],[ - struct crypto_blkcipher *tfm; - tfm = crypto_alloc_blkcipher("aes", 0, 0 ); + ((struct super_operations *)0)->evict_inode(NULL); ],[ + AC_DEFINE(HAVE_SBOPS_EVICT_INODE, 1, + [super_operations.evict_inode() is exist in kernel]) 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 +# 2.6.35 file_operations.fsync taken 2 arguments. +# 3.0.0 file_operations.fsync takes 4 arguments. # -AC_DEFUN([LC_STRUCT_HASH_DESC], -[AC_MSG_CHECKING([if kernel has struct hash_desc]) +AC_DEFUN([LC_FILE_FSYNC], +[AC_MSG_CHECKING([if file_operations.fsync takes 4 or 2 arguments]) LB_LINUX_TRY_COMPILE([ - #include - #include + #include ],[ - struct hash_desc foo; + ((struct file_operations *)0)->fsync(NULL, 0, 0, 0); ],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_STRUCT_HASH_DESC, 1, [kernel has struct hash_desc]) + AC_DEFINE(HAVE_FILE_FSYNC_4ARGS, 1, + [file_operations.fsync takes 4 arguments]) + AC_MSG_RESULT([yes, 4 args]) ],[ - AC_MSG_RESULT([no]) + LB_LINUX_TRY_COMPILE([ + #include + ],[ + ((struct file_operations *)0)->fsync(NULL, 0); + ],[ + AC_DEFINE(HAVE_FILE_FSYNC_2ARGS, 1, + [file_operations.fsync takes 2 arguments]) + AC_MSG_RESULT([yes, 2 args]) + ],[ + AC_MSG_RESULT([no]) + ]) ]) ]) # -# check for struct blkcipher_desc +# 2.6.37 remove kernel_locked # -AC_DEFUN([LC_STRUCT_BLKCIPHER_DESC], -[AC_MSG_CHECKING([if kernel has struct blkcipher_desc]) +AC_DEFUN([LC_KERNEL_LOCKED], +[AC_MSG_CHECKING([if kernel_locked is defined]) LB_LINUX_TRY_COMPILE([ - #include - #include + #include ],[ - struct blkcipher_desc foo; + kernel_locked(); ],[ AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_STRUCT_BLKCIPHER_DESC, 1, [kernel has struct blkcipher_desc]) + AC_DEFINE(HAVE_KERNEL_LOCKED, 1, + [kernel_locked is defined]) ],[ AC_MSG_RESULT([no]) ]) ]) # -# 2.6.19 check for FS_RENAME_DOES_D_MOVE flag +# 2.6.38 dentry_operations.d_compare() taken 7 arguments. # -AC_DEFUN([LC_FS_RENAME_DOES_D_MOVE], -[AC_MSG_CHECKING([if kernel has FS_RENAME_DOES_D_MOVE flag]) +AC_DEFUN([LC_D_COMPARE_7ARGS], +[AC_MSG_CHECKING([if d_compare taken 7 arguments]) LB_LINUX_TRY_COMPILE([ - #include + #include ],[ - int v = FS_RENAME_DOES_D_MOVE; + ((struct dentry_operations*)0)->d_compare(NULL,NULL,NULL,NULL,0,NULL,NULL); ],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_FS_RENAME_DOES_D_MOVE, 1, [kernel has FS_RENAME_DOES_D_MOVE flag]) + AC_DEFINE(HAVE_D_COMPARE_7ARGS, 1, + [d_compare need 7 arguments]) + AC_MSG_RESULT([yes]) ],[ - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) ]) ]) # -# LC_FUNC_F_OP_FLOCK -# -# rhel4.2 kernel has f_op->flock field +# 2.6.38 dentry_operations.d_delete() defined 'const' for 1st parameter. # -AC_DEFUN([LC_FUNC_F_OP_FLOCK], -[AC_MSG_CHECKING([if struct file_operations has flock field]) +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 + #include ],[ - struct file_operations ll_file_operations_flock; - ll_file_operations_flock.flock = NULL; + const struct dentry *d = NULL; + ((struct dentry_operations*)0)->d_delete(d); ],[ - AC_DEFINE(HAVE_F_OP_FLOCK, 1, - [struct file_operations has flock field]) - AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_D_DELETE_CONST, const, + [d_delete first parameter declared const]) + AC_MSG_RESULT([yes]) ],[ - AC_MSG_RESULT([no]) + AC_DEFINE(HAVE_D_DELETE_CONST, , []) + AC_MSG_RESULT([no]) ]) +EXTRA_KCFLAGS="$tmp_flags" ]) -# vfs_symlink seems to have started out with 3 args until 2.6.7 where a -# "mode" argument was added, but then again, in some later version it was -# removed -AC_DEFUN([LC_4ARGS_VFS_SYMLINK], -[AC_MSG_CHECKING([if vfs_symlink wants 4 args]) +# +# 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 + #include ],[ - struct inode *dir; - struct dentry *dentry; - const char *oldname = NULL; - int mode = 0; - - vfs_symlink(dir, dentry, oldname, mode); + spin_lock(&dcache_lock); ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_4ARGS_VFS_SYMLINK, 1, - [vfs_symlink wants 4 args]) + AC_DEFINE(HAVE_DCACHE_LOCK, 1, + [dcache_lock is exist]) + AC_MSG_RESULT([yes]) ],[ - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) ]) ]) -# 2.6.23 has new shrinker API -AC_DEFUN([LC_REGISTER_SHRINKER], -[LB_CHECK_SYMBOL_EXPORT([register_shrinker], -[mm/vmscan.c],[ - AC_DEFINE(HAVE_REGISTER_SHRINKER, 1, - [kernel exports register_shrinker]) +# +# 2.6.38 export blkdev_get_by_dev +# +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]) ],[ ]) ]) -#2.6.27 -AC_DEFUN([LC_INODE_PERMISION_2ARGS], -[AC_MSG_CHECKING([inode_operations->permission has two args]) +# +# 2.6.38 vfsmount.mnt_count doesn't use atomic_t +# +# 3.3 starts hiding vfsmount guts series (move from include/linux/mount.h to +# fs/mount.h, see kernel commit 7d6fec45a5131918b51dcd76da52f2ec86a85be6) +# +AC_DEFUN([LC_ATOMIC_MNT_COUNT], +[AC_MSG_CHECKING([if vfsmount guts is hidden, or vfsmount.mnt_count is atomic_t.]) LB_LINUX_TRY_COMPILE([ - #include + #include + #include <../fs/mount.h> ],[ - struct inode *inode; - - inode->i_op->permission(NULL,0); + struct mount *mnt = real_mount((struct vfsmount *)0); ],[ - AC_DEFINE(HAVE_INODE_PERMISION_2ARGS, 1, - [inode_operations->permission has two args]) - AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_HIDE_VFSMOUNT_GUTS, 1, + [hide vfsmount guts in fs/mount.h]) + AC_MSG_RESULT([yes, hide vfsmount guts in fs/mount.h]) ],[ - AC_MSG_RESULT([no]) + LB_LINUX_TRY_COMPILE([ + #include + #include + #include + ],[ + ((struct vfsmount *)0)->mnt_count = ((atomic_t) { 0 }); + ],[ + AC_DEFINE(HAVE_ATOMIC_MNT_COUNT, 1, + [vfsmount.mnt_count is atomic_t]) + AC_MSG_RESULT([yes, vfsmount.mnt_count is atomic_t]) + ],[ + AC_MSG_RESULT([no]) + ]) ]) ]) -# 2.6.27 has file_remove_suid instead of remove_suid -AC_DEFUN([LC_FILE_REMOVE_SUID], -[AC_MSG_CHECKING([kernel has file_remove_suid]) +# +# 2.6.38 use path as 4th parameter in quota_on. +# +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 ],[ - file_remove_suid(NULL); + ((struct quotactl_ops *)0)->quota_on(NULL, 0, 0, ((struct path*)0)); ],[ - AC_DEFINE(HAVE_FILE_REMOVE_SUID, 1, - [kernel have file_remove_suid]) + AC_DEFINE(HAVE_QUOTA_ON_USE_PATH, 1, + [quota_on use path as 4th paramter]) AC_MSG_RESULT([yes]) ],[ AC_MSG_RESULT([no]) ]) +EXTRA_KCFLAGS="$tmp_flags" ]) -# 2.6.27 have new page locking API -AC_DEFUN([LC_TRYLOCKPAGE], -[AC_MSG_CHECKING([kernel uses trylock_page for page lock]) +# +# 2.6.38 export simple_setattr +# +AC_DEFUN([LC_EXPORT_SIMPLE_SETATTR], +[LB_CHECK_SYMBOL_EXPORT([simple_setattr], +[fs/libfs.c],[ +AC_DEFINE(HAVE_SIMPLE_SETATTR, 1, + [simple_setattr is exported by the kernel]) +],[ +]) +]) + +# +# 2.6.39 remove unplug_fn from request_queue. +# +AC_DEFUN([LC_REQUEST_QUEUE_UNPLUG_FN], +[AC_MSG_CHECKING([if request_queue has unplug_fn field]) LB_LINUX_TRY_COMPILE([ - #include + #include ],[ - trylock_page(NULL); + do{ }while(sizeof(((struct request_queue *)0)->unplug_fn)); ],[ - AC_DEFINE(HAVE_TRYLOCK_PAGE, 1, - [kernel uses trylock_page for page lock]) + AC_DEFINE(HAVE_REQUEST_QUEUE_UNPLUG_FN, 1, + [request_queue has unplug_fn field]) AC_MSG_RESULT([yes]) ],[ AC_MSG_RESULT([no]) ]) ]) -# vfs_symlink seems to have started out with 3 args until 2.6.7 where a -# "mode" argument was added, but then again, in some later version it was -# removed -AC_DEFUN([LC_4ARGS_VFS_SYMLINK], -[AC_MSG_CHECKING([if vfs_symlink wants 4 args]) +# +# 2.6.39 replace get_sb with mount in struct file_system_type +# +AC_DEFUN([LC_HAVE_FSTYPE_MOUNT], +[AC_MSG_CHECKING([if file_system_type has mount field]) LB_LINUX_TRY_COMPILE([ #include ],[ - struct inode *dir; - struct dentry *dentry; - const char *oldname = NULL; - int mode = 0; - - vfs_symlink(dir, dentry, oldname, mode); + struct file_system_type fst; + void *i = (void *) fst.mount; ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_4ARGS_VFS_SYMLINK, 1, - [vfs_symlink wants 4 args]) + AC_DEFINE(HAVE_FSTYPE_MOUNT, 1, + [struct file_system_type has mount field]) + AC_MSG_RESULT([yes]) ],[ - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) ]) ]) -# 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]) +# +# 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], +[AC_MSG_CHECKING([if generic_permission take 2 or 4 arguments]) LB_LINUX_TRY_COMPILE([ - #include + #include ],[ - struct bio io; - io.bi_hw_segments = 0; + generic_permission(NULL, 0); ],[ - AC_DEFINE(HAVE_BI_HW_SEGMENTS, 1, - [struct bio has a bi_hw_segments field]) - AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_GENERIC_PERMISSION_2ARGS, 1, + [generic_permission taken 2 arguments]) + AC_MSG_RESULT([yes, 2 args]) ],[ - AC_MSG_RESULT([no]) + LB_LINUX_TRY_COMPILE([ + #include + ],[ + generic_permission(NULL, 0, 0, NULL); + ],[ + AC_DEFINE(HAVE_GENERIC_PERMISSION_4ARGS, 1, + [generic_permission taken 4 arguments]) + AC_MSG_RESULT([yes, 4 args]) + ],[ + 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_V1_H], -[LB_CHECK_FILE([$LINUX/include/linux/quotaio_v1.h],[ - AC_DEFINE(HAVE_QUOTAIO_V1_H, 1, - [kernel has include/linux/quotaio_v1.h]) -],[LB_CHECK_FILE([$LINUX/fs/quota/quotaio_v1.h],[ - AC_DEFINE(HAVE_FS_QUOTA_QUOTAIO_V1_H, 1, - [kernel has fs/quota/quotaio_v1.h]) +# 3.1 renames lock-manager ops(lock_manager_operations) from fl_xxx to lm_xxx +# see kernel commit 8fb47a4fbf858a164e973b8ea8ef5e83e61f2e50 +# +AC_DEFUN([LC_LM_XXX_LOCK_MANAGER_OPS], +[AC_MSG_CHECKING([if lock-manager ops renamed to lm_xxx]) +LB_LINUX_TRY_COMPILE([ + #include ],[ - AC_MSG_RESULT([no]) -]) + struct lock_manager_operations lm_ops; + lm_ops.lm_compare_owner = NULL; +],[ + AC_DEFINE(HAVE_LM_XXX_LOCK_MANAGER_OPS, 1, + [lock-manager ops renamed to lm_xxx]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) ]) ]) -# sles10 sp2 need 5 parameter for vfs_symlink -AC_DEFUN([LC_VFS_SYMLINK_5ARGS], -[AC_MSG_CHECKING([vfs_symlink need 5 parameter]) +# +# 3.1 kills inode->i_alloc_sem, use i_dio_count and inode_dio_wait/ +# inode_dio_done instead. +# see kernel commit bd5fe6c5eb9c548d7f07fe8f89a150bb6705e8e3 +# +AC_DEFUN([LC_INODE_DIO_WAIT], +[AC_MSG_CHECKING([if inode->i_alloc_sem is killed and use inode_dio_wait/done.]) LB_LINUX_TRY_COMPILE([ - #include + #include ],[ - struct inode *dir = NULL; - struct dentry *dentry = NULL; - struct vfsmount *mnt = NULL; - const char * path = NULL; - vfs_symlink(dir, dentry, mnt, path, 0); + inode_dio_wait((struct inode *)0); + inode_dio_done((struct inode *)0); ],[ - AC_DEFINE(HAVE_VFS_SYMLINK_5ARGS, 1, - [vfs_symlink need 5 parameteres]) - AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_INODE_DIO_WAIT, 1, + [inode->i_alloc_sem is killed and use inode_dio_wait/done]) + AC_MSG_RESULT([yes]) ],[ - AC_MSG_RESULT([no]) + 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]) +# +# 3.1 adds get_acl method to inode_operations to read ACL from disk. +# see kernel commit 4e34e719e457f2e031297175410fc0bd4016a085 +# +AC_DEFUN([LC_IOP_GET_ACL], +[AC_MSG_CHECKING([inode_operations has .get_acl member function]) LB_LINUX_TRY_COMPILE([ #include ],[ - struct super_operations *sop; - sop->read_inode(NULL); + struct inode_operations iop; + iop.get_acl = NULL; ],[ - AC_DEFINE(HAVE_READ_INODE_IN_SBOPS, 1, - [super_operations has a read_inode]) + AC_DEFINE(HAVE_IOP_GET_ACL, 1, + [inode_operations has .get_acl member function]) AC_MSG_RESULT([yes]) ],[ 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]) +# +# 3.1.1 has ext4_blocks_for_truncate +# +AC_DEFUN([LC_BLOCKS_FOR_TRUNCATE], +[AC_MSG_CHECKING([if kernel has ext4_blocks_for_truncate]) LB_LINUX_TRY_COMPILE([ - #include + #include + #include "$LINUX/fs/ext4/ext4_jbd2.h" + #include "$LINUX/fs/ext4/truncate.h" ],[ - sb_any_quota_active(NULL); + ext4_blocks_for_truncate(NULL); ],[ - AC_DEFINE(HAVE_SB_ANY_QUOTA_ACTIVE, 1, - [Kernel has a sb_any_quota_active]) - AC_MSG_RESULT([yes]) + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_BLOCKS_FOR_TRUNCATE, 1, + [kernel has ext4_blocks_for_truncate]) ],[ - AC_MSG_RESULT([no]) + 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]) +# +# 3.2 request_queue.make_request_fn defined as function returns with void +# see kernel commit 5a7bbad27a410350e64a2d7f5ec18fc73836c14f +# +AC_DEFUN([LC_HAVE_VOID_MAKE_REQUEST_FN], +[AC_MSG_CHECKING([if request_queue.make_request_fn returns void but not int]) LB_LINUX_TRY_COMPILE([ - #include -],[ - sb_has_quota_active(NULL, 0); + #include ],[ - AC_DEFINE(HAVE_SB_HAS_QUOTA_ACTIVE, 1, - [Kernel has a sb_has_quota_active]) - AC_MSG_RESULT([yes]) + int ret; + make_request_fn *mrf; + ret = mrf(NULL, NULL); ],[ - 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]) + AC_MSG_RESULT([no]) ],[ + AC_DEFINE(HAVE_VOID_MAKE_REQUEST_FN, 1, + [request_queue.make_request_fn returns void but not int]) + AC_MSG_RESULT([yes]) ]) ]) -# 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]) +# +# 3.2 protects inode->i_nlink from direct modification +# see kernel commit a78ef704a8dd430225955f0709b22d4a6ba21deb +# at the same time adds set_nlink(), so checks set_nlink() for it. +# +AC_DEFUN([LC_HAVE_PROTECT_I_NLINK], +[AC_MSG_CHECKING([if inode->i_nlink is protected from direct modification]) LB_LINUX_TRY_COMPILE([ - #include + #include ],[ - struct quotactl_ops *qop; - qop->quota_on(NULL, 0, 0, NULL, 0); + struct inode i; + set_nlink(&i, 1); ],[ - AC_DEFINE(HAVE_QUOTA_ON_5ARGS, 1, - [quota_on needs 5 paramters]) - AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_PROTECT_I_NLINK, 1, + [inode->i_nlink is protected from direct modification]) + AC_MSG_RESULT([yes]) ],[ - AC_MSG_RESULT([no]) + 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 -],[ - struct quotactl_ops *qop; - qop->quota_off(NULL, 0, 0); -],[ - AC_DEFINE(HAVE_QUOTA_OFF_3ARGS, 1, - [quota_off needs 3 paramters]) - AC_MSG_RESULT([yes]) +# +# 3.3 introduces migrate_mode.h and migratepage has 4 args +# +AC_DEFUN([LC_HAVE_MIGRATE_HEADER], +[LB_CHECK_FILE([$LINUX/include/linux/migrate.h],[ + AC_DEFINE(HAVE_MIGRATE_H, 1, + [kernel has include/linux/migrate.h]) +],[LB_CHECK_FILE([$LINUX/include/linux/migrate_mode.h],[ + AC_DEFINE(HAVE_MIGRATE_MODE_H, 1, + [kernel has include/linux/migrate_mode.h]) ],[ - AC_MSG_RESULT([no]) + 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]) +AC_DEFUN([LC_MIGRATEPAGE_4ARGS], +[AC_MSG_CHECKING([if address_space_operations.migratepage has 4 args]) LB_LINUX_TRY_COMPILE([ - #include + #include +#ifdef HAVE_MIGRATE_H + #include +#elif defined(HAVE_MIGRATE_MODE_H) + #include +#endif ],[ - vfs_dq_off(NULL, 0); + struct address_space_operations aops; + + aops.migratepage(NULL, NULL, NULL, MIGRATE_ASYNC); ],[ - AC_DEFINE(HAVE_VFS_DQ_OFF, 1, [vfs_dq_off is defined]) - AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_MIGRATEPAGE_4ARGS, 1, + [address_space_operations.migratepage has 4 args]) + AC_MSG_RESULT([yes]) ],[ - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) ]) ]) # -# LC_LINUX_FIEMAP_H -# -# If we have fiemap.h -# after 2.6.27 use fiemap.h in include/linux +# 3.3 switchs super_operations to use dentry as parameter (but not vfsmount) +# see kernel commit 34c80b1d93e6e20ca9dea0baf583a5b5510d92d4 # -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]) - ]) -], -[]) +AC_DEFUN([LC_SUPEROPS_USE_DENTRY], +[AC_MSG_CHECKING([if super_operations use dentry as parameter]) +tmp_flags="$EXTRA_KCFLAGS" +EXTRA_KCFLAGS="-Werror" +LB_LINUX_TRY_COMPILE([ + #include + int show_options(struct seq_file *seq, struct dentry *root){ + return 0; + } +],[ + struct super_operations ops; + ops.show_options = show_options; +],[ + AC_DEFINE(HAVE_SUPEROPS_USE_DENTRY, 1, + [super_operations use dentry as parameter]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) +EXTRA_KCFLAGS="$tmp_flags" ]) -# 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]) +# +# 3.3 switchs inode_operations to use umode_t as parameter (but not int) +# see kernel commit 1a67aafb5f72a436ca044293309fa7e6351d6a35 +# +AC_DEFUN([LC_INODEOPS_USE_UMODE_T], +[AC_MSG_CHECKING([if inode_operations use umode_t as parameter]) +tmp_flags="$EXTRA_KCFLAGS" +EXTRA_KCFLAGS="-Werror" LB_LINUX_TRY_COMPILE([ - #include + #include + #include + int my_mknod(struct inode *dir, struct dentry *dchild, + umode_t mode, dev_t dev) + { + return 0; + } ],[ - lock_map_acquire(NULL); + struct inode_operations ops; + ops.mknod = my_mknod; ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_LOCK_MAP_ACQUIRE, 1, - [lock_map_acquire is defined]) + AC_DEFINE(HAVE_INODEOPS_USE_UMODE_T, 1, + [inode_operations use umode_t as parameter]) + AC_MSG_RESULT([yes]) ],[ - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) ]) +EXTRA_KCFLAGS="$tmp_flags" ]) -# 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]) +# 3.4 kmap_atomic removes second argument +# see kernel commit 1ec9c5ddc17aa398f05646abfcbaf315b544e62f +# +AC_DEFUN([LC_KMAP_ATOMIC_HAS_1ARG], +[AC_MSG_CHECKING([if kmap_atomic has only 1 argument]) LB_LINUX_TRY_COMPILE([ - #include + #include ],[ - blk_queue_logical_block_size(NULL, 0); + kmap_atomic(NULL); ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_BLK_QUEUE_LOG_BLK_SIZE, 1, - [blk_queue_logical_block_size is defined]) + AC_DEFINE(HAVE_KMAP_ATOMIC_HAS_1ARG, 1, + [have kmap_atomic has only 1 argument]) + AC_MSG_RESULT([yes]) ],[ - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) ]) ]) -# 2.6.32 without DQUOT_INIT defined. -AC_DEFUN([LC_DQUOT_INIT], -[AC_MSG_CHECKING([if DQUOT_INIT is defined]) +# +# 3.4 switchs touch_atime to struct path +# see kernel commit 68ac1234fb949b66941d94dce4157742799fc581 +# +AC_DEFUN([LC_TOUCH_ATIME_1ARG], +[AC_MSG_CHECKING([if touch_atime use one argument]) LB_LINUX_TRY_COMPILE([ - #include + #include ],[ - DQUOT_INIT(NULL); + touch_atime((struct path *)NULL); ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_DQUOT_INIT, 1, - [DQUOT_INIT is defined]) + AC_DEFINE(HAVE_TOUCH_ATIME_1ARG, 1, + [touch_atime use one argument]) + AC_MSG_RESULT([yes]) ],[ - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) ]) ]) -# 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]) +# +# 3.4 converts d_alloc_root to d_make_root +# see kernel commit 32991ab305ace7017c62f8eecbe5eb36dc32e13b +# +AC_DEFUN([LC_HAVE_D_MAKE_ROOT], +[AC_MSG_CHECKING([if have d_make_root]) LB_LINUX_TRY_COMPILE([ - #include + #include ],[ - struct request_queue rq; - rq.limits.io_min = 0; + d_make_root((struct inode *)NULL); ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_REQUEST_QUEUE_LIMITS, 1, - [request_queue has a limits field]) + AC_DEFINE(HAVE_D_MAKE_ROOT, 1, + [have d_make_root]) + AC_MSG_RESULT([yes]) ],[ - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) ]) ]) -# 2.6.32 has new BDI interface. -AC_DEFUN([LC_NEW_BACKING_DEV_INFO], -[AC_MSG_CHECKING([if backing_dev_info has a wb_cnt field]) +# +# 3.5 renames end_writeback() back to clear_inode()... +# see kernel commit dbd5768f87ff6fb0a4fe09c4d7b6c4a24de99430 +# +AC_DEFUN([LC_HAVE_CLEAR_INODE], +[AC_MSG_CHECKING([if have clear_inode]) LB_LINUX_TRY_COMPILE([ - #include + #include ],[ - struct backing_dev_info bdi; - bdi.wb_cnt = 0; + clear_inode((struct inode *)NULL); ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_NEW_BACKING_DEV_INFO, 1, - [backing_dev_info has a wb_cnt field]) + AC_DEFINE(HAVE_CLEAR_INODE, 1, + [have clear_inode]) + AC_MSG_RESULT([yes]) ],[ - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) ]) ]) -# 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]) +# +# 3.5 encode_fh has parent inode passed in directly +# see kernel commit b0b0382b +# +AC_DEFUN([LC_HAVE_ENCODE_FH_PARENT], +[AC_MSG_CHECKING([if encode_fh have parent inode as parameter]) +tmp_flags="$EXTRA_KCFLAGS" +EXTRA_KCFLAGS="-Werror" +LB_LINUX_TRY_COMPILE([ + #include + #include + #include + int ll_encode_fh(struct inode *i, __u32 *a, int *b, struct inode *p) + { + return 0; + } +],[ + struct export_operations exp_op; + exp_op.encode_fh = ll_encode_fh; +],[ + AC_DEFINE(HAVE_ENCODE_FH_PARENT, 1, + [have parent inode as parameter]) + AC_MSG_RESULT([yes]) ],[ + AC_MSG_RESULT([no]) ]) +EXTRA_KCFLAGS="$tmp_flags" ]) # @@ -1932,97 +2119,40 @@ AC_DEFUN([LC_EXPORT_BDI_INIT], # Lustre linux kernel checks # AC_DEFUN([LC_PROG_LINUX], - [LC_LUSTRE_VERSION_H - if test x$enable_server = xyes ; then - AC_DEFINE(HAVE_SERVER_SUPPORT, 1, [support server]) - LC_FUNC_DEV_SET_RDONLY - LC_STACK_SIZE - LC_CONFIG_BACKINGFS - fi + [ 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 LC_EXPORT_TRUNCATE_COMPLETE - LC_EXPORT_TRUNCATE_RANGE LC_EXPORT_D_REHASH_COND LC_EXPORT___D_REHASH - LC_EXPORT_D_MOVE_LOCKED - LC_EXPORT___D_MOVE LC_EXPORT_NODE_TO_CPUMASK - LC_HEADER_LDISKFS_XATTR - LC_FUNC_GRAB_CACHE_PAGE_NOWAIT_GFP - LC_STRUCT_STATFS LC_FILEMAP_POPULATE - LC_D_ADD_UNIQUE LC_BIT_SPINLOCK_H - LC_XATTR_ACL - LC_POSIX_ACL_XATTR_H LC_CONST_ACL_SIZE - LC_STRUCT_INTENT_FILE - LC_CAPA_CRYPTO LC_CONFIG_RMTCLIENT LC_CONFIG_GSS - LC_FUNC_MS_FLOCK_LOCK - LC_FUNC_HAVE_CAN_SLEEP_ARG - LC_FUNC_F_OP_FLOCK - LC_QUOTA_READ - LC_COOKIE_FOLLOW_LINK - LC_FUNC_RCU - LC_PERCPU_COUNTER LC_TASK_CLENV_STORE - LC_4ARGS_VFS_SYMLINK - - # does the kernel have VFS intent patches? - LC_VFS_INTENT_PATCHES - - # ~2.6.11 - LC_S_TIME_GRAN - LC_SB_TIME_GRAN # 2.6.12 LC_RW_TREE_LOCK - LC_EXPORT_SYNCHRONIZE_RCU - - # 2.6.15 - LC_INODE_I_MUTEX - - # 2.6.16 - LC_SECURITY_PLUG # for SLES10 SP2 - - # 2.6.17 - LC_INODE_IPRIVATE - LC_DQUOTOFF_MUTEX # 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 - fi #2.6.18 + RHEL5 (fc6) - LC_PG_FS_MISC - LC_PAGE_CHECKED LC_LINUX_FIEMAP_H # 2.6.19 - LC_INODE_BLKSIZE - LC_VFS_READDIR_U64_INO LC_FILE_WRITEV LC_FILE_READV @@ -2045,24 +2175,24 @@ AC_DEFUN([LC_PROG_LINUX], LC_KERNEL_SENDFILE LC_HAVE_EXPORTFS_H LC_VM_OP_FAULT - LC_REGISTER_SHRINKER - - # 2.6.24 - LC_HAVE_MMTYPES_H + 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.25 - LC_MAPPING_CAP_WRITEBACK_DIRTY - # 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_FILE_REMOVE_SUID LC_TRYLOCKPAGE LC_READ_INODE_IN_SBOPS LC_EXPORT_INODE_PERMISSION @@ -2073,25 +2203,93 @@ AC_DEFUN([LC_PROG_LINUX], # 2.6.27.15-2 sles11 LC_BI_HW_SEGMENTS - LC_HAVE_QUOTAIO_V1_H - LC_VFS_SYMLINK_5ARGS + 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_DQUOT_INIT LC_REQUEST_QUEUE_LIMITS - LC_NEW_BACKING_DEV_INFO - - # - if test x$enable_server = xyes ; then - if test x$enable_quota_module = xyes ; then - LC_QUOTA64 # must after LC_HAVE_QUOTAIO_V1_H - fi - fi + 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.35, 3.0.0 + LC_FILE_FSYNC + LC_EXPORT_SIMPLE_SETATTR + + # 2.6.36 + 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 + LC_HAVE_FSTYPE_MOUNT + + # 3.1 + LC_LM_XXX_LOCK_MANAGER_OPS + LC_INODE_DIO_WAIT + LC_IOP_GET_ACL + + # 3.1.1 + LC_BLOCKS_FOR_TRUNCATE + + # 3.2 + LC_HAVE_VOID_MAKE_REQUEST_FN + LC_HAVE_PROTECT_I_NLINK + + # 3.3 + LC_HAVE_MIGRATE_HEADER + LC_MIGRATEPAGE_4ARGS + LC_SUPEROPS_USE_DENTRY + LC_INODEOPS_USE_UMODE_T + + # 3.4 + LC_TOUCH_ATIME_1ARG + LC_HAVE_D_MAKE_ROOT + LC_KMAP_ATOMIC_HAS_1ARG + + # 3.5 + LC_HAVE_CLEAR_INODE + LC_HAVE_ENCODE_FH_PARENT + + # + if test x$enable_server = xyes ; then + AC_DEFINE(HAVE_SERVER_SUPPORT, 1, [support server]) + LC_FUNC_DEV_SET_RDONLY + LC_STACK_SIZE + LC_QUOTA64 + LC_QUOTA_CONFIG + fi ]) # @@ -2206,6 +2404,26 @@ LB_LINUX_TRY_COMPILE([ ]) ]) +# 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 # @@ -2260,18 +2478,6 @@ LC_CONFIG_PINGER LC_CONFIG_LIBLUSTRE_RECOVERY ]) -AC_DEFUN([LC_CONFIG_LRU_RESIZE], -[AC_MSG_CHECKING([whether to enable lru self-adjusting]) -AC_ARG_ENABLE([lru_resize], - AC_HELP_STRING([--enable-lru-resize], - [enable lru resize support]), - [],[enable_lru_resize='yes']) -AC_MSG_RESULT([$enable_lru_resize]) -if test x$enable_lru_resize != xno; then - AC_DEFINE(HAVE_LRU_RESIZE_SUPPORT, 1, [Enable lru resize support]) -fi -]) - # # LC_CONFIG_QUOTA # @@ -2284,19 +2490,6 @@ AC_DEFUN([LC_CONFIG_QUOTA], [],[enable_quota='yes']) ]) -# 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 -]) - AC_DEFUN([LC_QUOTA], [#check global LC_CONFIG_QUOTA @@ -2306,21 +2499,6 @@ AC_CHECK_HEADER(sys/quota.h, [AC_MSG_ERROR([don't find in your system])]) ]) -AC_DEFUN([LC_QUOTA_READ], -[AC_MSG_CHECKING([if kernel supports quota_read]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct super_operations sp; - void *i = (void *)sp.quota_read; -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(KERNEL_SUPPORTS_QUOTA_READ, 1, [quota_read found]) -],[ - AC_MSG_RESULT([no]) -]) -]) - # # LC_CONFIG_SPLIT # @@ -2338,166 +2516,83 @@ if test x$enable_split != xno; then fi ]) -# -# LC_COOKIE_FOLLOW_LINK -# -# 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]) +# RHEL5(2.6.18) has tux_info +AC_DEFUN([LC_TASK_CLENV_TUX_INFO], +[AC_MSG_CHECKING([tux_info]) LB_LINUX_TRY_COMPILE([ - #include - #include -],[ - struct dentry dentry; - struct nameidata nd; - - dentry.d_inode->i_op->put_link(&dentry, &nd, NULL); + #include ],[ - AC_DEFINE(HAVE_COOKIE_FOLLOW_LINK, 1, [inode_operations->follow_link returns a cookie]) - AC_MSG_RESULT([yes]) + struct task_struct task; + &task.tux_info; ],[ - AC_MSG_RESULT([no]) -]) -]) - -# -# LC_FUNC_RCU -# -# kernels prior than 2.6.0(?) have no RCU supported; in kernel 2.6.5(SUSE), -# call_rcu takes three parameters. -# -AC_DEFUN([LC_FUNC_RCU], -[AC_MSG_CHECKING([if kernel have RCU supported]) -LB_LINUX_TRY_COMPILE([ - #include -],[],[ - AC_DEFINE(HAVE_RCU, 1, [have RCU defined]) AC_MSG_RESULT([yes]) - - AC_MSG_CHECKING([if call_rcu takes three parameters]) - LB_LINUX_TRY_COMPILE([ - #include - ],[ - struct rcu_head rh; - call_rcu(&rh, (void (*)(struct rcu_head *))1, NULL); - ],[ - AC_DEFINE(HAVE_CALL_RCU_PARAM, 1, [call_rcu takes three parameters]) - AC_MSG_RESULT([yes]) - ],[ - AC_MSG_RESULT([no]) - ]) - + AC_DEFINE(LL_TASK_CL_ENV, tux_info, [have tux_info]) + have_task_clenv_store='yes' ],[ AC_MSG_RESULT([no]) ]) ]) # -# LC_QUOTA64 -# linux kernel have 64-bit limits support +# LC_LLITE_LLOOP_MODULE +# lloop_llite.ko does not currently work with page sizes +# of 64k or larger. # -AC_DEFUN([LC_QUOTA64],[ - AC_MSG_CHECKING([if kernel has 64-bit quota limits support]) -tmp_flags="$EXTRA_KCFLAGS" -EXTRA_KCFLAGS="-I$LINUX/fs" - LB_LINUX_TRY_COMPILE([ - #include - #include - #ifdef HAVE_QUOTAIO_V1_H - # include - int versions[] = V2_INITQVERSIONS_R1; - struct v2_disk_dqblk_r1 dqblk_r1; - #else - # ifdef HAVE_FS_QUOTA_QUOTAIO_V1_H - # include - # else - # include - # endif - struct v2r1_disk_dqblk dqblk_r1; - #endif - ],[],[ - AC_DEFINE(HAVE_QUOTA64, 1, [have quota64]) - AC_MSG_RESULT([yes]) - ],[ - LB_CHECK_FILE([$LINUX/include/linux/lustre_version.h],[ - AC_MSG_ERROR([You have got no 64-bit kernel quota support.]) - ],[]) - AC_MSG_RESULT([no]) - ]) -EXTRA_KCFLAGS=$tmp_flags -]) - -# LC_SECURITY_PLUG # for SLES10 SP2 -# 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 -],[ - struct dentry *dentry; - struct vfsmount *mnt; - struct iattr *iattr; - - notify_change(dentry, mnt, iattr); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SECURITY_PLUG, 1, - [SLES10 SP2 use extra parameter in vfs]) -],[ - AC_MSG_RESULT(no) -]) -]) - -AC_DEFUN([LC_PERCPU_COUNTER], -[AC_MSG_CHECKING([if have struct percpu_counter defined]) -LB_LINUX_TRY_COMPILE([ - #include -],[],[ - AC_DEFINE(HAVE_PERCPU_COUNTER, 1, [percpu_counter found]) - AC_MSG_RESULT([yes]) - - AC_MSG_CHECKING([if percpu_counter_inc takes the 2nd argument]) - LB_LINUX_TRY_COMPILE([ - #include - ],[ - struct percpu_counter c; - percpu_counter_init(&c, 0); - ],[ - AC_DEFINE(HAVE_PERCPU_2ND_ARG, 1, [percpu_counter_init has two - arguments]) - AC_MSG_RESULT([yes]) - ],[ - AC_MSG_RESULT([no]) - ]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -AC_DEFUN([LC_TASK_CLENV_TUX_INFO], -[AC_MSG_CHECKING([tux_info]) +AC_DEFUN([LC_LLITE_LLOOP_MODULE], +[AC_MSG_CHECKING([whether to enable llite_lloop module]) LB_LINUX_TRY_COMPILE([ - #include + #include ],[ - struct task_struct task; - &task.tux_info; + #if PAGE_SIZE >= 65536 + #error "PAGE_SIZE >= 65536" + #endif ],[ + enable_llite_lloop_module='yes' AC_MSG_RESULT([yes]) - AC_DEFINE(LL_TASK_CL_ENV, tux_info, [have tux_info]) - have_task_clenv_store='yes' ],[ + enable_llite_lloop_module='no' AC_MSG_RESULT([no]) ]) ]) -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 +# +# LC_OSD_ADDON +# +# configure support for optional OSD implementation +# +AC_DEFUN([LC_OSD_ADDON], +[AC_MSG_CHECKING([for osd]) +AC_ARG_WITH([osd], + AC_HELP_STRING([--with-osd=path], + [set path to optional osd]), + [ + case $with_osd in + no) ENABLEOSDADDON=0 + ;; + *) OSDADDON="${with_osd}" + ENABLEOSDADDON=1 + ;; + esac + ], [ + ENABLEOSDADDON=0 + ]) +if test $ENABLEOSDADDON -eq 0; then + AC_MSG_RESULT([no]) + OSDADDON= +else + OSDMODNAME=`basename $OSDADDON` + if test -e $LUSTRE/$OSDMODNAME; then + AC_MSG_RESULT([can't link]) + OSDADDON= + elif ln -s $OSDADDON $LUSTRE/$OSDMODNAME; then + AC_MSG_RESULT([$OSDMODNAME]) + OSDADDON="subdir-m += $OSDMODNAME" + else + AC_MSG_RESULT([can't link]) + OSDADDON= + fi +fi +AC_SUBST(OSDADDON) ]) # @@ -2512,6 +2607,9 @@ if test $target_cpu == "i686" -o $target_cpu == "x86_64"; then CFLAGS="$CFLAGS -Werror" fi +# maximum MDS thread count +LC_MDS_MAX_THREADS + # include/liblustre.h AC_CHECK_HEADERS([sys/user.h sys/vfs.h stdint.h blkid/blkid.h]) @@ -2598,7 +2696,7 @@ AC_ARG_ENABLE([pgstate-track], AC_MSG_CHECKING([whether to enable page state tracking]) AC_MSG_RESULT([$enable_pgstat_track]) if test x$enable_pgstat_track = xyes ; then - AC_DEFINE([LUSTRE_PAGESTATE_TRACKING], 1, + AC_DEFINE([CONFIG_DEBUG_PAGESTATE_TRACKING], 1, [enable page state tracking code]) fi @@ -2607,6 +2705,7 @@ fi LC_D_OBTAIN_ALIAS LC_BLKDEV_PUT_2ARGS LC_DENTRY_OPEN_4ARGS + LC_PAGEVEC_LRU_ADD_FILE ]) @@ -2622,7 +2721,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) @@ -2630,6 +2728,7 @@ AM_CONDITIONAL(GSS, test x$enable_gss = xyes) AM_CONDITIONAL(GSS_KEYRING, test x$enable_gss_keyring = xyes) AM_CONDITIONAL(GSS_PIPEFS, test x$enable_gss_pipefs = xyes) AM_CONDITIONAL(LIBPTHREAD, test x$enable_libpthread = xyes) +AM_CONDITIONAL(LLITE_LLOOP, test x$enable_llite_lloop_module = xyes) ]) # @@ -2648,13 +2747,17 @@ lustre/doc/Makefile lustre/include/Makefile lustre/include/lustre_ver.h lustre/include/linux/Makefile +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/2.6-fc11.target lustre/kernel_patches/targets/2.6-fc12.target +lustre/kernel_patches/targets/2.6-fc15.target lustre/ldlm/Makefile lustre/fid/Makefile lustre/fid/autoMakefile @@ -2672,12 +2775,8 @@ lustre/mdc/Makefile lustre/mdc/autoMakefile lustre/lmv/Makefile lustre/lmv/autoMakefile -lustre/mds/Makefile -lustre/mds/autoMakefile lustre/mdt/Makefile lustre/mdt/autoMakefile -lustre/cmm/Makefile -lustre/cmm/autoMakefile lustre/mdd/Makefile lustre/mdd/autoMakefile lustre/fld/Makefile @@ -2687,18 +2786,21 @@ lustre/obdclass/autoMakefile lustre/obdclass/linux/Makefile 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 lustre/mgs/autoMakefile +lustre/target/Makefile lustre/ptlrpc/Makefile lustre/ptlrpc/autoMakefile lustre/ptlrpc/gss/Makefile @@ -2710,6 +2812,10 @@ lustre/tests/Makefile lustre/tests/mpi/Makefile lustre/utils/Makefile lustre/utils/gss/Makefile +lustre/osp/Makefile +lustre/osp/autoMakefile +lustre/lod/Makefile +lustre/lod/autoMakefile lustre/obdclass/darwin/Makefile ]) ])