X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fautoconf%2Flustre-core.m4;h=b3193122c6714060974b99072f401744d40c6c2d;hp=9b2635c2deecd6f694d6f74032baaad60d94a0b8;hb=b141d6e1607173a33d083f1cff472a92831064bb;hpb=67076c3c7e2b11023b943db2f5031d9b9a11329c diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 9b2635c..b319312 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -1,5 +1,3 @@ -#* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- -#* vim:expandtab:shiftwidth=8:tabstop=8: # # LC_CONFIG_SRCDIR # @@ -85,43 +83,17 @@ AC_TRY_COMPILE([ ]) # -# only for Lustre-patched kernels -# -AC_DEFUN([LC_LUSTRE_VERSION_H], -[LB_CHECK_FILE([$LINUX/include/linux/lustre_version.h],[ - rm -f "$LUSTRE/include/linux/lustre_version.h" -],[ - touch "$LUSTRE/include/linux/lustre_version.h" - if test x$enable_server = xyes ; then - AC_MSG_WARN([Unpatched kernel detected.]) - AC_MSG_WARN([Lustre servers cannot be built with an unpatched kernel;]) - AC_MSG_WARN([disabling server build]) - enable_server='no' - fi -]) -]) - -# # LC_FUNC_DEV_SET_RDONLY # -# check 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_LINUX_TRY_COMPILE([ - #include - #include +[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]) ],[ - #ifndef HAVE_CLEAR_RDONLY_ON_PUT - #error needs to be patched by lustre kernel patches from Lustre version 1.4.3 or above. - #endif -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_DEV_SET_RDONLY, 1, [kernel has new dev_set_rdonly]) -],[ - 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_WARN([kernel missing dev_set_rdonly patch for testing]) ]) ]) @@ -235,17 +207,13 @@ if test x$enable_lru_resize != xno; then fi ]) -# whether to enable quota support(kernel modules) -AC_DEFUN([LC_QUOTA_MODULE], -[if test x$enable_quota != xno; then - LB_LINUX_CONFIG([QUOTA],[ - enable_quota_module='yes' - AC_DEFINE(HAVE_QUOTA_SUPPORT, 1, [Enable quota support]) - ],[ - enable_quota_module='no' - AC_MSG_WARN([quota is not enabled because the kernel - lacks quota support]) - ]) -fi +# +# Quota support. The kernel must support CONFIG_QUOTA. +# +AC_DEFUN([LC_QUOTA_CONFIG], +[LB_LINUX_CONFIG_IM([QUOTA],[],[ + AC_MSG_ERROR([Lustre quota requires that CONFIG_QUOTA is enabled in your kernel.]) + ]) ]) # truncate_complete_page() was exported from RHEL5/SLES10, but not in SLES11 SP0 (2.6.27) @@ -307,27 +275,6 @@ AC_DEFUN([LC_EXPORT_NODE_TO_CPUMASK], ]) # -# 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]) - ],[ - ]) - ]) -]) - -# # # between 2.6.5 - 2.6.22 filemap_populate is exported in some kernels # @@ -372,7 +319,7 @@ AC_DEFUN([LC_BIT_SPINLOCK_H], 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 -include $AUTOCONF_HDIR/autoconf.h $EXTRA_KCFLAGS" +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 @@ -409,24 +356,6 @@ AC_TRY_RUN([ CFLAGS="$tmp_flags" ]) -# added in 2.6.16 -# -AC_DEFUN([LC_STRUCT_INTENT_FILE], -[AC_MSG_CHECKING([if struct open_intent has a file field]) -LB_LINUX_TRY_COMPILE([ - #include - #include -],[ - struct open_intent intent; - &intent.file; -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_FILE_IN_STRUCT_INTENT, 1, [struct open_intent has a file field]) -],[ - AC_MSG_RESULT([no]) -]) -]) - # # LC_CAPA_CRYPTO # @@ -477,25 +406,9 @@ AC_DEFUN([LC_CONFIG_GSS_KEYRING], fi ]) -AC_DEFUN([LC_SUNRPC_CACHE], -[AC_MSG_CHECKING([if sunrpc struct cache_head uses kref]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct cache_head ch; - &ch.ref.refcount; -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_SUNRPC_CACHE_V2, 1, [sunrpc cache facility v2]) -],[ - AC_MSG_RESULT([no]) -]) -]) - AC_DEFUN([LC_CONFIG_SUNRPC], [LB_LINUX_CONFIG_IM([SUNRPC],[], [AC_MSG_ERROR([kernel SUNRPC support is required by using GSS.])]) - LC_SUNRPC_CACHE ]) # @@ -538,147 +451,6 @@ AC_DEFUN([LC_CONFIG_GSS], fi ]) -# -# LC_FUNC_HAVE_CAN_SLEEP_ARG -# -# 2.6.5 kernel has third arg can_sleep in fs/locks.c: flock_lock_file_wait() -# -AC_DEFUN([LC_FUNC_HAVE_CAN_SLEEP_ARG], -[AC_MSG_CHECKING([if kernel has third arg can_sleep in fs/locks.c: flock_lock_file_wait()]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - int cansleep; - struct file *file; - struct file_lock *file_lock; - flock_lock_file_wait(file, file_lock, cansleep); -],[ - AC_DEFINE(HAVE_CAN_SLEEP_ARG, 1, - [kernel has third arg can_sleep in fs/locks.c: flock_lock_file_wait()]) - AC_MSG_RESULT([yes]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# -# LC_FUNC_F_OP_FLOCK -# -# rhel4.2 kernel has f_op->flock field -# -AC_DEFUN([LC_FUNC_F_OP_FLOCK], -[AC_MSG_CHECKING([if struct file_operations has flock field]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct file_operations ll_file_operations_flock; - ll_file_operations_flock.flock = NULL; -],[ - AC_DEFINE(HAVE_F_OP_FLOCK, 1, - [struct file_operations has flock field]) - AC_MSG_RESULT([yes]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -AC_DEFUN([LC_QUOTA_READ], -[AC_MSG_CHECKING([if kernel supports quota_read]) -LB_LINUX_TRY_COMPILE([ - #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_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]) -LB_LINUX_TRY_COMPILE([ - #include - #include -],[ - struct dentry dentry; - struct nameidata nd; - - dentry.d_inode->i_op->put_link(&dentry, &nd, NULL); -],[ - AC_DEFINE(HAVE_COOKIE_FOLLOW_LINK, 1, [inode_operations->follow_link returns a cookie]) - AC_MSG_RESULT([yes]) -],[ - 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_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_STORE], [ AC_MSG_CHECKING([if we can store cl_env in task_struct]) @@ -687,41 +459,10 @@ AC_DEFUN([LC_TASK_CLENV_STORE], fi ]) -# ~2.6.11 - -AC_DEFUN([LC_S_TIME_GRAN], -[AC_MSG_CHECKING([if super block has s_time_gran member]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct super_block sb; - - return sb.s_time_gran; -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_S_TIME_GRAN, 1, [super block has s_time_gran member]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -AC_DEFUN([LC_SB_TIME_GRAN], -[AC_MSG_CHECKING([if kernel has old get_sb_time_gran]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - return get_sb_time_gran(NULL); -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_SB_TIME_GRAN, 1, [kernel has old get_sb_time_gran]) -],[ - AC_MSG_RESULT([no]) -]) -]) - # 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" @@ -741,176 +482,10 @@ LB_LINUX_TRY_COMPILE([ EXTRA_KCFLAGS="$tmp_flags" ]) -# 2.6.15 - -# 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) -]) -]) - -# 2.6.16 - -# 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) -]) -]) - -# 2.6.17 - -# 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) -]) -]) - -# 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) -]) -]) - # 2.6.18 -# 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) -]) -]) - -# -# LC_STATFS_DENTRY_PARAM -# starting from 2.6.18 linux kernel uses dentry instead of super_block -# for the first parameter of the super_operations->statfs() callback. -# -# -AC_DEFUN([LC_STATFS_DENTRY_PARAM], -[AC_MSG_CHECKING([if super_ops.statfs() first parameter is dentry]) -tmp_flags="$EXTRA_KCFLAGS" -EXTRA_KCFLAGS="-Werror" -LB_LINUX_TRY_COMPILE([ - #include -],[ - ((struct super_operations *)0)->statfs((struct dentry *)0, (struct kstatfs*)0); -],[ - AC_DEFINE(HAVE_STATFS_DENTRY_PARAM, 1, - [super_ops.statfs() first parameter is dentry]) - AC_MSG_RESULT([yes]) -],[ - AC_MSG_RESULT([no]) -]) -EXTRA_KCFLAGS="$tmp_flags" -]) - -# -# LC_VFS_KERN_MOUNT -# starting from 2.6.18 kernel don't export do_kern_mount -# and want to use vfs_kern_mount instead. -# -AC_DEFUN([LC_VFS_KERN_MOUNT], -[AC_MSG_CHECKING([vfs_kern_mount exist in kernel]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - vfs_kern_mount(NULL, 0, NULL, NULL); -],[ - AC_DEFINE(HAVE_VFS_KERN_MOUNT, 1, - [vfs_kern_mount exist in kernel]) - AC_MSG_RESULT([yes]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# -# LC_INVALIDATEPAGE_RETURN_INT -# 2.6.17 changes return type for invalidatepage to 'void' from 'int' -# -AC_DEFUN([LC_INVALIDATEPAGE_RETURN_INT], -[AC_MSG_CHECKING([invalidatepage has return int]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - int rc = block_invalidatepage(NULL, 0); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_INVALIDATEPAGE_RETURN_INT, 1, - [Define if return type of invalidatepage should be int]) -],[ - AC_MSG_RESULT(no) -]) -]) - # LC_UMOUNTBEGIN_HAS_VFSMOUNT -# after 2.6.18 umount_begin has different parameters +# 2.6.18~2.6.25 umount_begin has different parameters AC_DEFUN([LC_UMOUNTBEGIN_HAS_VFSMOUNT], [AC_MSG_CHECKING([if umount_begin needs vfsmount parameter instead of super_block]) tmp_flags="$EXTRA_KCFLAGS" @@ -934,138 +509,18 @@ LB_LINUX_TRY_COMPILE([ AC_DEFINE(HAVE_UMOUNTBEGIN_VFSMOUNT, 1, [Define umount_begin need second argument]) ],[ - AC_MSG_RESULT(no) -]) -EXTRA_KCFLAGS="$tmp_flags" -]) - -# LC_SEQ_LOCK -# after 2.6.18 seq_file has lock intead of sem -AC_DEFUN([LC_SEQ_LOCK], -[AC_MSG_CHECKING([if struct seq_file has lock field]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct seq_file seq; - - mutex_unlock(&seq.lock); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SEQ_LOCK, 1, - [after 2.6.18 seq_file has lock intead of sem]) -],[ - AC_MSG_RESULT(NO) -]) -]) - -# -# LC_EXPORT_FILEMAP_FDATAWRITE_RANGE -# -# No standard kernels export this -# -AC_DEFUN([LC_EXPORT_FILEMAP_FDATAWRITE_RANGE], -[LB_CHECK_SYMBOL_EXPORT([filemap_fdatawrite_range], -[mm/filemap.c],[ -AC_DEFINE(HAVE_FILEMAP_FDATAWRITE_RANGE, 1, - [filemap_fdatawrite_range is exported by the kernel]) -],[ -]) -]) - -# LC_FLUSH_OWNER_ID -# starting from 2.6.18 the file_operations .flush -# method has a new "fl_owner_t id" parameter -# -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]) -]) -]) - -# -# 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]) - ]) - ],[]) -]) - -#2.6.18 + RHEL5 (fc6) - -# 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]) -LB_LINUX_TRY_COMPILE([ - #include - #include -],[ - #ifndef PG_fs_misc - #error PG_fs_misc not defined in kernel - #endif -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_PG_FS_MISC, 1, - [is kernel have PG_fs_misc]) -],[ - AC_MSG_RESULT(no) -]) -]) - -# RHEL5 PageChecked and SetPageChecked defined -AC_DEFUN([LC_PAGE_CHECKED], -[AC_MSG_CHECKING([kernel has PageChecked and SetPageChecked]) -LB_LINUX_TRY_COMPILE([ - #include -#ifdef HAVE_LINUX_MMTYPES_H - #include -#endif - #include -],[ - struct page *p = NULL; - - /* before 2.6.26 this define*/ - #ifndef PageChecked - /* 2.6.26 use function instead of define for it */ - SetPageChecked(p); - PageChecked(p); - #endif -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_PAGE_CHECKED, 1, - [does kernel have PageChecked and SetPageChecked]) -],[ - AC_MSG_RESULT(no) + AC_MSG_RESULT(no) ]) +EXTRA_KCFLAGS="$tmp_flags" ]) +#2.6.18 + RHEL5 (fc6) + # # LC_LINUX_FIEMAP_H # -# If we have fiemap.h -# after 2.6.27 use fiemap.h in include/linux +# 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],[ @@ -1085,24 +540,6 @@ AC_DEFUN([LC_LINUX_FIEMAP_H], # 2.6.19 -# 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_FILE_WRITEV # 2.6.19 replaced writev with aio_write AC_DEFUN([LC_FILE_WRITEV], @@ -1238,7 +675,7 @@ LB_LINUX_TRY_COMPILE([ #include #include ],[ - struct hash_desc foo; + struct hash_desc foo __attribute__ ((unused)); ],[ AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_STRUCT_HASH_DESC, 1, [kernel has struct hash_desc]) @@ -1256,7 +693,7 @@ LB_LINUX_TRY_COMPILE([ #include #include ],[ - struct blkcipher_desc foo; + struct blkcipher_desc foo __attribute__ ((unused)); ],[ AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_STRUCT_BLKCIPHER_DESC, 1, [kernel has struct blkcipher_desc]) @@ -1273,7 +710,8 @@ AC_DEFUN([LC_FS_RENAME_DOES_D_MOVE], LB_LINUX_TRY_COMPILE([ #include ],[ - int v = FS_RENAME_DOES_D_MOVE; + int v __attribute__ ((unused)); + v = FS_RENAME_DOES_D_MOVE; ],[ AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_FS_RENAME_DOES_D_MOVE, 1, [kernel has FS_RENAME_DOES_D_MOVE flag]) @@ -1290,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, @@ -1379,7 +818,19 @@ LB_LINUX_TRY_COMPILE([ AC_DEFINE(HAVE_PROCFS_USERS, 1, [kernel has pde_users member in procfs entry struct]) ],[ - AC_MSG_RESULT([no]) + 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]) + ]) ]) ]) @@ -1430,8 +881,7 @@ LB_LINUX_TRY_COMPILE([ #include #endif ],[ - struct export_operations exp; - memset(exp.fh_to_dentry, 0, sizeof(exp.fh_to_dentry)); + do{ }while(sizeof(((struct export_operations *)0)->fh_to_dentry)); ], [ AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_FH_TO_DENTRY, 1, @@ -1469,26 +919,6 @@ AC_DEFUN([LC_EXPORT_BDI_INIT], ]) ]) -# 2.6.25 - -# 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]) -],[ - AC_MSG_RESULT([no]) -]) -]) - # 2.6.26 # 2.6.26 isn't export set_fs_pwd and change paramter in fs struct @@ -1499,11 +929,9 @@ LB_LINUX_TRY_COMPILE([ #include #include ],[ - struct path path; struct fs_struct fs; - fs.pwd = path; - memset(&fs, 0, sizeof(fs)); + fs.pwd = *((struct path *)sizeof(fs)); ], [ AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_FS_STRUCT_USE_PATH, 1, @@ -1513,36 +941,79 @@ LB_LINUX_TRY_COMPILE([ ]) ]) - # # 2.6.27 # -AC_DEFUN([LC_INODE_PERMISION_2ARGS], -[AC_MSG_CHECKING([inode_operations->permission has two args]) + +# 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 ],[ - struct inode *inode; - inode->i_op->permission(NULL, 0); + notify_change(NULL, NULL, NULL); ],[ - AC_DEFINE(HAVE_INODE_PERMISION_2ARGS, 1, - [inode_operations->permission has two args]) + 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" ]) -# 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]) +AC_DEFUN([LC_INODE_PERMISION_2ARGS], +[AC_MSG_CHECKING([inode_operations->permission has two args]) LB_LINUX_TRY_COMPILE([ #include ],[ - file_remove_suid(NULL); + struct inode *inode __attribute__ ((unused)); + + inode = NULL; + inode->i_op->permission(NULL, 0); ],[ - AC_DEFINE(HAVE_FILE_REMOVE_SUID, 1, - [kernel have file_remove_suid]) + AC_DEFINE(HAVE_INODE_PERMISION_2ARGS, 1, + [inode_operations->permission has two args]) AC_MSG_RESULT([yes]) ],[ AC_MSG_RESULT([no]) @@ -1596,9 +1067,10 @@ AC_DEFINE(HAVE_EXPORT_INODE_PERMISSION, 1, AC_DEFUN([LC_QUOTA_ON_5ARGS], [AC_MSG_CHECKING([quota_on needs 5 parameters]) LB_LINUX_TRY_COMPILE([ + #include #include ],[ - struct quotactl_ops *qop; + struct quotactl_ops *qop = NULL; qop->quota_on(NULL, 0, 0, NULL, 0); ],[ AC_DEFINE(HAVE_QUOTA_ON_5ARGS, 1, @@ -1613,9 +1085,10 @@ LB_LINUX_TRY_COMPILE([ AC_DEFUN([LC_QUOTA_OFF_3ARGS], [AC_MSG_CHECKING([quota_off needs 3 parameters]) LB_LINUX_TRY_COMPILE([ + #include #include ],[ - struct quotactl_ops *qop; + struct quotactl_ops *qop = NULL; qop->quota_off(NULL, 0, 0); ],[ AC_DEFINE(HAVE_QUOTA_OFF_3ARGS, 1, @@ -1697,26 +1170,6 @@ AC_DEFUN([LC_HAVE_QUOTAIO_H], ]) ]) -# sles10 sp2 need 5 parameter for vfs_symlink -AC_DEFUN([LC_VFS_SYMLINK_5ARGS], -[AC_MSG_CHECKING([vfs_symlink need 5 parameter]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct inode *dir = NULL; - struct dentry *dentry = NULL; - struct vfsmount *mnt = NULL; - const char * path = NULL; - vfs_symlink(dir, dentry, mnt, path, 0); -],[ - AC_DEFINE(HAVE_VFS_SYMLINK_5ARGS, 1, - [vfs_symlink need 5 parameteres]) - 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]) @@ -1804,6 +1257,22 @@ LB_LINUX_TRY_COMPILE([ # 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], @@ -1870,7 +1339,7 @@ LB_LINUX_TRY_COMPILE([ AC_DEFUN([LC_BDI_NAME], [AC_MSG_CHECKING([if backing_device_info has name field]) LB_LINUX_TRY_COMPILE([ - #include + #include ],[ struct backing_dev_info bdi; bdi.name = NULL; @@ -1970,10 +1439,27 @@ AC_DEFUN([LC_SET_CPUS_ALLOWED], [set_cpus_allowed is exported by the kernel])], [AC_MSG_RESULT([no])] )]) +# 2.6.32 introduces selinux_is_enabled() +AC_DEFUN([LC_SELINUX_IS_ENABLED], +[AC_MSG_CHECKING([if selinux_is_enabled is available]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + selinux_is_enabled(); +],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_SELINUX_IS_ENABLED, 1, + [selinux_is_enabled is defined]) +],[ + AC_MSG_RESULT([no]) +]) +]) + # # LC_D_OBTAIN_ALIAS # starting from 2.6.28 kernel replaces d_alloc_anon() with # 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]) @@ -2003,6 +1489,16 @@ AC_DEFUN([LC_EXPORT_GENERIC_ERROR_REMOVE_PAGE], ] ) +# 2.6.32 if kernel export access_process_vm(). +AC_DEFUN([LC_EXPORT_ACCESS_PROCESS_VM], + [LB_CHECK_SYMBOL_EXPORT([access_process_vm], + [mm/memory.c], + [AC_DEFINE(HAVE_ACCESS_PROCESS_VM, 1, + [access_process_vm function is present])], + []) + ] +) + # # 2.6.36 fs_struct.lock use spinlock instead of rwlock. # @@ -2044,23 +1540,111 @@ LB_LINUX_TRY_COMPILE([ # # 2.6.35 file_operations.fsync taken 2 arguments. +# 3.0.0 file_operations.fsync takes 4 arguments. # AC_DEFUN([LC_FILE_FSYNC], -[AC_MSG_CHECKING([if file_operations.fsync taken 2 arguments]) +[AC_MSG_CHECKING([if file_operations.fsync takes 4 or 2 arguments]) LB_LINUX_TRY_COMPILE([ #include ],[ - ((struct file_operations *)0)->fsync(NULL, 0); + ((struct file_operations *)0)->fsync(NULL, 0, 0, 0); +],[ + AC_DEFINE(HAVE_FILE_FSYNC_4ARGS, 1, + [file_operations.fsync takes 4 arguments]) + AC_MSG_RESULT([yes, 4 args]) +],[ + 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]) + ]) +]) +]) + +# +# 2.6.37 remove kernel_locked +# +AC_DEFUN([LC_KERNEL_LOCKED], +[AC_MSG_CHECKING([if kernel_locked is defined]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + kernel_locked(); ],[ - AC_DEFINE(HAVE_FILE_FSYNC_2ARGS, 1, - [file_operations.fsync taken 2 arguments]) AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_KERNEL_LOCKED, 1, + [kernel_locked is defined]) ],[ AC_MSG_RESULT([no]) ]) ]) # +# 2.6.38 dentry_operations.d_compare() taken 7 arguments. +# +AC_DEFUN([LC_D_COMPARE_7ARGS], +[AC_MSG_CHECKING([if d_compare taken 7 arguments]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + ((struct dentry_operations*)0)->d_compare(NULL,NULL,NULL,NULL,0,NULL,NULL); +],[ + AC_DEFINE(HAVE_D_COMPARE_7ARGS, 1, + [d_compare need 7 arguments]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# +# 2.6.38 dentry_operations.d_delete() defined 'const' for 1st parameter. +# +AC_DEFUN([LC_D_DELETE_CONST], +[AC_MSG_CHECKING([if d_delete has const declare on first parameter]) +tmp_flags="$EXTRA_KCFLAGS" +EXTRA_KCFLAGS="-Werror" +LB_LINUX_TRY_COMPILE([ + #include +],[ + const struct dentry *d = NULL; + ((struct dentry_operations*)0)->d_delete(d); +],[ + AC_DEFINE(HAVE_D_DELETE_CONST, const, + [d_delete first parameter declared const]) + AC_MSG_RESULT([yes]) +],[ + AC_DEFINE(HAVE_D_DELETE_CONST, , []) + AC_MSG_RESULT([no]) +]) +EXTRA_KCFLAGS="$tmp_flags" +]) + +# +# 2.6.38 dcache_lock removed. rcu-walk commited. +# +AC_DEFUN([LC_DCACHE_LOCK], +[AC_MSG_CHECKING([if dcache_lock is exist]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + spin_lock(&dcache_lock); +],[ + AC_DEFINE(HAVE_DCACHE_LOCK, 1, + [dcache_lock is exist]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# # 2.6.38 export blkdev_get_by_dev # AC_DEFUN([LC_BLKDEV_GET_BY_DEV], @@ -2075,20 +1659,34 @@ AC_DEFINE(HAVE_BLKDEV_GET_BY_DEV, 1, # # 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.mnt_count is atomic_t]) +[AC_MSG_CHECKING([if vfsmount guts is hidden, or vfsmount.mnt_count is atomic_t.]) LB_LINUX_TRY_COMPILE([ - #include - #include - #include + #include + #include <../fs/mount.h> ],[ - ((struct vfsmount *)0)->mnt_count = ((atomic_t) { 0 }); + struct mount *mnt = real_mount((struct vfsmount *)0); ],[ - AC_DEFINE(HAVE_ATOMIC_MNT_COUNT, 1, - [vfsmount.mnt_count is atomic_t]) - 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]) + ]) ]) ]) @@ -2122,8 +1720,7 @@ AC_DEFUN([LC_REQUEST_QUEUE_UNPLUG_FN], LB_LINUX_TRY_COMPILE([ #include ],[ - struct request_queue rq; - memset(rq.unplug_fn, 0, sizeof(rq.unplug_fn)); + do{ }while(sizeof(((struct request_queue *)0)->unplug_fn)); ],[ AC_DEFINE(HAVE_REQUEST_QUEUE_UNPLUG_FN, 1, [request_queue has unplug_fn field]) @@ -2134,21 +1731,53 @@ LB_LINUX_TRY_COMPILE([ ]) # -# 2.6.38 generic_permission taken 4 paremater. +# 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 file_system_type fst; + void *i = (void *) fst.mount; +],[ + AC_DEFINE(HAVE_FSTYPE_MOUNT, 1, + [struct file_system_type has mount field]) + 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. # +# 3.1 generic_permission taken 2 parameters. +# see kernel commit 2830ba7f34ebb27c4e5b8b6ef408cd6d74860890 +# AC_DEFUN([LC_GENERIC_PERMISSION], -[AC_MSG_CHECKING([if generic_permission take 4 arguments]) +[AC_MSG_CHECKING([if generic_permission take 2 or 4 arguments]) LB_LINUX_TRY_COMPILE([ - #include + #include ],[ - generic_permission(NULL, 0, 0, NULL); + generic_permission(NULL, 0); ],[ - AC_DEFINE(HAVE_GENERIC_PERMISSION_4ARGS, 1, - [generic_permission taken 4 arguments]) - 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]) + ]) ]) ]) @@ -2165,18 +1794,75 @@ AC_DEFINE(HAVE_SIMPLE_SETATTR, 1, ]) # +# 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_DEFUN([LC_MIGRATEPAGE_4ARGS], +[AC_MSG_CHECKING([if address_space_operations.migratepage has 4 args]) +LB_LINUX_TRY_COMPILE([ + #include +#ifdef HAVE_MIGRATE_H + #include +#elif defined(HAVE_MIGRATE_MODE_H) + #include +#endif +],[ + struct address_space_operations aops; + + aops.migratepage(NULL, NULL, NULL, MIGRATE_ASYNC); +],[ + AC_DEFINE(HAVE_MIGRATEPAGE_4ARGS, 1, + [address_space_operations.migratepage has 4 args]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# +# 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 "$LINUX/fs/ext4/ext4_jbd2.h" + #include "$LINUX/fs/ext4/truncate.h" +],[ + ext4_blocks_for_truncate(NULL); +],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_BLOCKS_FOR_TRUNCATE, 1, + [kernel has ext4_blocks_for_truncate]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# # LC_PROG_LINUX # # Lustre linux kernel checks # AC_DEFUN([LC_PROG_LINUX], - [LC_LUSTRE_VERSION_H + [ LC_CONFIG_PINGER LC_CONFIG_CHECKSUM LC_CONFIG_LIBLUSTRE_RECOVERY LC_CONFIG_HEALTH_CHECK_WRITE LC_CONFIG_LRU_RESIZE - LC_QUOTA_MODULE LC_LLITE_LLOOP_MODULE # RHEL4 patches @@ -2185,63 +1871,26 @@ AC_DEFUN([LC_PROG_LINUX], LC_EXPORT___D_REHASH LC_EXPORT_NODE_TO_CPUMASK - LC_FUNC_GRAB_CACHE_PAGE_NOWAIT_GFP LC_FILEMAP_POPULATE LC_BIT_SPINLOCK_H LC_CONST_ACL_SIZE - LC_STRUCT_INTENT_FILE - LC_CAPA_CRYPTO LC_CONFIG_RMTCLIENT LC_CONFIG_GSS - LC_FUNC_HAVE_CAN_SLEEP_ARG - LC_FUNC_F_OP_FLOCK - LC_QUOTA_READ - LC_COOKIE_FOLLOW_LINK - LC_FUNC_RCU - LC_PERCPU_COUNTER LC_TASK_CLENV_STORE - # ~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_FILE_WRITEV LC_FILE_READV @@ -2274,15 +1923,14 @@ AC_DEFUN([LC_PROG_LINUX], 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 @@ -2294,7 +1942,6 @@ AC_DEFUN([LC_PROG_LINUX], # 2.6.27.15-2 sles11 LC_BI_HW_SEGMENTS LC_HAVE_QUOTAIO_H - LC_VFS_SYMLINK_5ARGS LC_BDI_NAME LC_SB_ANY_QUOTA_ACTIVE LC_SB_HAS_QUOTA_ACTIVE @@ -2318,8 +1965,11 @@ AC_DEFUN([LC_PROG_LINUX], LC_SET_CPUS_ALLOWED LC_CACHE_UPCALL LC_EXPORT_GENERIC_ERROR_REMOVE_PAGE + LC_SELINUX_IS_ENABLED + LC_EXPORT_ACCESS_PROCESS_VM + LC_VFS_INODE_NEWSIZE_OK - # 2.6.35 + # 2.6.35, 3.0.0 LC_FILE_FSYNC LC_EXPORT_SIMPLE_SETATTR @@ -2327,14 +1977,28 @@ AC_DEFUN([LC_PROG_LINUX], LC_FS_STRUCT_RWLOCK LC_SBOPS_EVICT_INODE + # 2.6.37 + LC_KERNEL_LOCKED + # 2.6.38 LC_ATOMIC_MNT_COUNT LC_BLKDEV_GET_BY_DEV LC_GENERIC_PERMISSION LC_QUOTA_ON_USE_PATH + LC_DCACHE_LOCK + LC_D_COMPARE_7ARGS + LC_D_DELETE_CONST # 2.6.39 LC_REQUEST_QUEUE_UNPLUG_FN + LC_HAVE_FSTYPE_MOUNT + + # 3.3 + LC_HAVE_MIGRATE_HEADER + LC_MIGRATEPAGE_4ARGS + + # 3.1.1 + LC_BLOCKS_FOR_TRUNCATE # if test x$enable_server = xyes ; then @@ -2342,6 +2006,7 @@ AC_DEFUN([LC_PROG_LINUX], LC_FUNC_DEV_SET_RDONLY LC_STACK_SIZE LC_QUOTA64 + LC_QUOTA_CONFIG fi ]) @@ -2569,6 +2234,7 @@ 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([ @@ -2608,6 +2274,46 @@ LB_LINUX_TRY_COMPILE([ ]) # +# 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) +]) + +# # LC_CONFIGURE # # other configure checks @@ -2733,7 +2439,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) @@ -2760,6 +2465,7 @@ 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 @@ -2768,6 +2474,7 @@ lustre/kernel_patches/targets/2.6-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 @@ -2802,12 +2509,16 @@ lustre/obdecho/Makefile lustre/obdecho/autoMakefile lustre/obdfilter/Makefile lustre/obdfilter/autoMakefile +lustre/ofd/Makefile +lustre/ofd/autoMakefile lustre/osc/Makefile lustre/osc/autoMakefile lustre/ost/Makefile lustre/ost/autoMakefile lustre/osd-ldiskfs/Makefile lustre/osd-ldiskfs/autoMakefile +lustre/osd-zfs/Makefile +lustre/osd-zfs/autoMakefile lustre/mgc/Makefile lustre/mgc/autoMakefile lustre/mgs/Makefile @@ -2823,6 +2534,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 ]) ])