X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fautoconf%2Flustre-core.m4;h=d6c78439d833d54587f9976bcbfd5070474a6ea8;hp=4ead3cbf4847ebcf753d2733cc29b0e8d882db2c;hb=dc43a2ce9b00bcb15ddfa4c4358b12bfc5647af0;hpb=5f09419ff54dd5b09443130e941154935bf24303 diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 4ead3cb..d6c7843 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -48,195 +48,24 @@ esac ]) # -# LC_CONFIG_EXT3 +# Ensure stack size big than 8k in Lustre server (all kernels) # -# that ext3 is enabled in the kernel -# -AC_DEFUN([LC_CONFIG_EXT3], -[LB_LINUX_CONFIG([EXT3_FS],[],[ - LB_LINUX_CONFIG([EXT3_FS_MODULE],[],[$2]) -]) -LB_LINUX_CONFIG([EXT3_FS_XATTR],[$1],[$3]) -]) - -# -# LC_FSHOOKS -# -# If we have (and can build) fshooks.h -# -AC_DEFUN([LC_FSHOOKS], -[LB_CHECK_FILE([$LINUX/include/linux/fshooks.h],[ - AC_MSG_CHECKING([if fshooks.h can be compiled]) - LB_LINUX_TRY_COMPILE([ - #include - ],[],[ - AC_MSG_RESULT([yes]) - ],[ - AC_MSG_RESULT([no]) - AC_MSG_WARN([You might have better luck with gcc 3.3.x.]) - AC_MSG_WARN([You can set CC=gcc33 before running configure.]) - AC_MSG_ERROR([Your compiler cannot build fshooks.h.]) - ]) -$1 -],[ -$2 -]) -]) - -# -# LC_FUNC_RELEASEPAGE_WITH_INT -# -# if ->releasepage() takes an int arg in 2.6.9 -# 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_INT], -[AC_MSG_CHECKING([if releasepage has a int parameter]) -RELEASEPAGE_WITH_INT="`grep -c 'releasepage.*int' $LINUX/include/linux/fs.h`" -if test "$RELEASEPAGE_WITH_INT" != 0 ; then - AC_DEFINE(HAVE_RELEASEPAGE_WITH_INT, 1, - [releasepage with int parameter]) - AC_MSG_RESULT([yes]) -else - AC_MSG_RESULT([no]) -fi -]) - -# -# LC_FUNC_FILEMAP_FDATASYNC -# -# if filemap_fdatasync() exists -# -AC_DEFUN([LC_FUNC_FILEMAP_FDATAWRITE], -[AC_MSG_CHECKING([whether filemap_fdatawrite() is defined]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - int (*foo)(struct address_space *)= filemap_fdatawrite; -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_FILEMAP_FDATAWRITE, 1, [filemap_fdatawrite() found]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# -# LC_HEADER_MM_INLINE -# -# RHEL kernels define page_count in mm_inline.h -# -AC_DEFUN([LC_HEADER_MM_INLINE], -[AC_MSG_CHECKING([if kernel has mm_inline.h header]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - #ifndef page_count - #error mm_inline.h does not define page_count - #endif -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_MM_INLINE, 1, [mm_inline found]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# -# LC_STRUCT_INODE -# -# if inode->i_alloc_sem exists -# -AC_DEFUN([LC_STRUCT_INODE], -[AC_MSG_CHECKING([if struct inode has i_alloc_sem]) +AC_DEFUN([LC_STACK_SIZE], +[AC_MSG_CHECKING([stack size big than 8k]) LB_LINUX_TRY_COMPILE([ - #include - #include + #include ],[ - #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,24)) - #error "down_read_trylock broken before 2.4.24" - #endif - struct inode i; - return (char *)&i.i_alloc_sem - (char *)&i; + #if THREAD_SIZE < 8192 + #error "stack size < 8192" + #endif ],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_I_ALLOC_SEM, 1, [struct inode has i_alloc_sem]) + AC_MSG_RESULT(yes) ],[ - AC_MSG_RESULT([no]) + AC_MSG_ERROR([Lustre requires that Linux is configured with at least a 8KB stack.]) ]) ]) # -# LC_FUNC_REGISTER_CACHE -# -# if register_cache() is defined by kernel -# -# There are two ways to shrink one customized cache in linux kernels. For the -# kernels are prior than 2.6.5(?), register_cache() is used, and for latest -# kernels, set_shrinker() is used instead. -# -AC_DEFUN([LC_FUNC_REGISTER_CACHE], -[AC_MSG_CHECKING([if kernel defines cache pressure hook]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - shrinker_t shrinker; - - set_shrinker(1, shrinker); -],[ - AC_MSG_RESULT([set_shrinker]) - AC_DEFINE(HAVE_SHRINKER_CACHE, 1, [shrinker_cache found]) - AC_DEFINE(HAVE_CACHE_RETURN_INT, 1, [shrinkers should return int]) -],[ - LB_LINUX_TRY_COMPILE([ - #include - #include - ],[ - struct cache_definition cache; - ],[ - AC_MSG_RESULT([register_cache]) - AC_DEFINE(HAVE_REGISTER_CACHE, 1, [register_cache found]) - AC_MSG_CHECKING([if kernel expects return from cache shrink ]) - tmp_flags="$EXTRA_KCFLAGS" - EXTRA_KCFLAGS="-Werror" - LB_LINUX_TRY_COMPILE([ - #include - #include - ],[ - struct cache_definition c; - c.shrinker = (int (*)(int, unsigned int))1; - ],[ - AC_DEFINE(HAVE_CACHE_RETURN_INT, 1, - [kernel expects return from shrink_cache]) - AC_MSG_RESULT(yes) - ],[ - AC_MSG_RESULT(no) - ]) - EXTRA_KCFLAGS="$tmp_flags" - ],[ - AC_MSG_RESULT([no]) - ]) -]) -]) - -# -# LC_FUNC_GRAB_CACHE_PAGE_NOWAIT_GFP -# -# check for our patched grab_cache_page_nowait_gfp() function -# -AC_DEFUN([LC_FUNC_GRAB_CACHE_PAGE_NOWAIT_GFP], -[AC_MSG_CHECKING([if kernel defines grab_cache_page_nowait_gfp()]) -HAVE_GCPN_GFP="`grep -c 'grab_cache_page_nowait_gfp' $LINUX/include/linux/pagemap.h`" -if test "$HAVE_GCPN_GFP" != 0 ; then - AC_DEFINE(HAVE_GRAB_CACHE_PAGE_NOWAIT_GFP, 1, - [kernel has grab_cache_page_nowait_gfp()]) - AC_MSG_RESULT(yes) -else - AC_MSG_RESULT(no) -fi -]) - -# # LC_FUNC_DEV_SET_RDONLY # # check for the old-style dev_set_rdonly which took an extra "devno" param @@ -246,6 +75,7 @@ AC_DEFUN([LC_FUNC_DEV_SET_RDONLY], [AC_MSG_CHECKING([if kernel has new dev_set_rdonly]) LB_LINUX_TRY_COMPILE([ #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. @@ -254,7 +84,7 @@ LB_LINUX_TRY_COMPILE([ AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_DEV_SET_RDONLY, 1, [kernel has new dev_set_rdonly]) ],[ - AC_MSG_RESULT([no, Linux kernel source needs to be patches by lustre + AC_MSG_ERROR([no, Linux kernel source needs to be patches by lustre kernel patches from Lustre version 1.4.3 or above.]) ]) ]) @@ -269,19 +99,9 @@ AC_DEFUN([LC_CONFIG_BACKINGFS], BACKINGFS="ldiskfs" if test x$with_ldiskfs = xno ; then - BACKINGFS="ext3" - if test x$linux25$enable_server = xyesyes ; then AC_MSG_ERROR([ldiskfs is required for 2.6-based servers.]) fi - - # --- Check that ext3 and ext3 xattr are enabled in the kernel - LC_CONFIG_EXT3([],[ - AC_MSG_ERROR([Lustre requires that ext3 is enabled in the kernel]) - ],[ - AC_MSG_WARN([Lustre requires that extended attributes for ext3 are enabled in the kernel]) - AC_MSG_WARN([This build may fail.]) - ]) else # ldiskfs is enabled LB_DEFINE_LDISKFS_OPTIONS @@ -327,6 +147,30 @@ fi ]) # +# LC_HEADER_LDISKFS_XATTR +# +# CHAOS kernel-devel package will not include fs/ldiskfs/xattr.h +# +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" +]) + +# # LC_CONFIG_HEALTH_CHECK_WRITE # # Turn off the actual write to the disk @@ -414,35 +258,71 @@ AC_TRY_COMPILE([ ]) ]) -AC_DEFUN([LC_FUNC_PAGE_MAPPED], -[AC_MSG_CHECKING([if kernel offers page_mapped]) +# +# 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 + #include ],[ - page_mapped(NULL); + int flags = MS_FLOCK_LOCK; ],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_PAGE_MAPPED, 1, [page_mapped found]) + AC_DEFINE(HAVE_MS_FLOCK_LOCK, 1, + [kernel has MS_FLOCK_LOCK flag]) + AC_MSG_RESULT([yes]) ],[ - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) ]) ]) -AC_DEFUN([LC_STRUCT_FILE_OPS_UNLOCKED_IOCTL], -[AC_MSG_CHECKING([if struct file_operations has an unlocked_ioctl field]) +# +# 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 ],[ - struct file_operations fops; - &fops.unlocked_ioctl; + 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_DEFINE(HAVE_UNLOCKED_IOCTL, 1, [struct file_operations has an unlock ed_ioctl field]) ],[ AC_MSG_RESULT([no]) ]) ]) +# +# 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 +# AC_DEFUN([LC_FILEMAP_POPULATE], [AC_MSG_CHECKING([for exported filemap_populate]) LB_LINUX_TRY_COMPILE([ @@ -458,6 +338,9 @@ 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([ @@ -472,6 +355,9 @@ LB_LINUX_TRY_COMPILE([ ]) ]) +# +# added in 2.6.17 +# AC_DEFUN([LC_BIT_SPINLOCK_H], [LB_CHECK_FILE([$LINUX/include/linux/bit_spinlock.h],[ AC_MSG_CHECKING([if bit_spinlock.h can be compiled]) @@ -490,9 +376,7 @@ AC_DEFUN([LC_BIT_SPINLOCK_H], ]) # -# LC_POSIX_ACL_XATTR -# -# If we have xattr_acl.h +# After 2.6.26 we no longer have xattr_acl.h # AC_DEFUN([LC_XATTR_ACL], [LB_CHECK_FILE([$LINUX/include/linux/xattr_acl.h],[ @@ -509,28 +393,10 @@ AC_DEFUN([LC_XATTR_ACL], []) ]) + # -# LC_LINUX_FIEMAP_H -# -# If we have fiemap.h -# after 2.6.27 use fiemap.h in include/linux +# added in 2.6.16 # -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 - ],[],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_LINUX_FIEMAP_H, 1, [Kernel has fiemap.h]) - ],[ - AC_MSG_RESULT([no]) - ]) -], -[]) -]) - - AC_DEFUN([LC_STRUCT_INTENT_FILE], [AC_MSG_CHECKING([if struct open_intent has a file field]) LB_LINUX_TRY_COMPILE([ @@ -548,6 +414,9 @@ LB_LINUX_TRY_COMPILE([ ]) +# +# After 2.6.16 the xattr_acl API is removed, and posix_acl is used instead +# 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]) @@ -578,6 +447,9 @@ AC_DEFUN([LC_EXPORT___IGET], ]) ]) +# +# 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" @@ -703,109 +575,14 @@ AC_DEFUN([LC_CONFIG_GSS], fi ]) -# LC_FUNC_MS_FLOCK_LOCK -# -# SLES9 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; +# 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]) ],[ - AC_DEFINE(HAVE_MS_FLOCK_LOCK, 1, - [kernel has MS_FLOCK_LOCK flag]) - AC_MSG_RESULT([yes]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# -# LC_FUNC_HAVE_CAN_SLEEP_ARG -# -# SLES9 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]) -]) -]) - -# -# LC_TASK_PPTR -# -# task struct has p_pptr instead of parent -# -AC_DEFUN([LC_TASK_PPTR], -[AC_MSG_CHECKING([task p_pptr found]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct task_struct *p; - - p = p->p_pptr; -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_TASK_PPTR, 1, [task p_pptr found]) -],[ - 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]) ]) ]) @@ -912,8 +689,7 @@ LB_LINUX_TRY_COMPILE([ # # LC_INVALIDATEPAGE_RETURN_INT -# more 2.6 api changes. return type for the invalidatepage -# address_space_operation is 'void' in new kernels but 'int' in old +# 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]) @@ -931,7 +707,7 @@ LB_LINUX_TRY_COMPILE([ ]) # LC_UMOUNTBEGIN_HAS_VFSMOUNT -# more 2.6 API changes. 2.6.18 umount_begin has different parameters +# after 2.6.18 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" @@ -1085,6 +861,10 @@ LB_LINUX_TRY_COMPILE([ #include #include ],[ + /* tmp workaround for broken OFED 1.4.1 at SLES10 */ + #if defined(CONFIG_SLE_VERSION) && CONFIG_SLE_VERSION == 10 && defined(_BACKPORT_LINUX_MM_H_) + #error badly implementation of cancel_dirty_pages + #endif cancel_dirty_page(NULL, 0); ],[ AC_MSG_RESULT(yes) @@ -1119,8 +899,7 @@ LB_LINUX_TRY_COMPILE([ ]) ]) -# RHEL5 in FS-cache patch rename PG_checked flag -# into PG_fs_misc +# 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([ @@ -1383,6 +1162,26 @@ LB_LINUX_TRY_COMPILE([ ]) ]) +# +# 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.12 merge patch from oracle to convert tree_lock from spinlock to rwlock AC_DEFUN([LC_RW_TREE_LOCK], @@ -1455,9 +1254,11 @@ CFLAGS="$tmp_flags" AC_DEFUN([LC_ASYNC_BLOCK_CIPHER], [AC_MSG_CHECKING([if kernel has block cipher support]) LB_LINUX_TRY_COMPILE([ + #include #include ],[ - int v = CRYPTO_ALG_TYPE_BLKCIPHER; + struct crypto_blkcipher *tfm; + tfm = crypto_alloc_blkcipher("aes", 0, 0 ); ],[ AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_ASYNC_BLOCK_CIPHER, 1, [kernel has block cipher support]) @@ -1467,7 +1268,43 @@ LB_LINUX_TRY_COMPILE([ ]) # -# check for FS_RENAME_DOES_D_MOVE flag +# check for struct hash_desc +# +AC_DEFUN([LC_STRUCT_HASH_DESC], +[AC_MSG_CHECKING([if kernel has struct hash_desc]) +LB_LINUX_TRY_COMPILE([ + #include + #include +],[ + struct hash_desc foo; +],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_STRUCT_HASH_DESC, 1, [kernel has struct hash_desc]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# +# check for struct blkcipher_desc +# +AC_DEFUN([LC_STRUCT_BLKCIPHER_DESC], +[AC_MSG_CHECKING([if kernel has struct blkcipher_desc]) +LB_LINUX_TRY_COMPILE([ + #include + #include +],[ + struct blkcipher_desc foo; +],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_STRUCT_BLKCIPHER_DESC, 1, [kernel has struct blkcipher_desc]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# +# 2.6.19 check for FS_RENAME_DOES_D_MOVE flag # AC_DEFUN([LC_FS_RENAME_DOES_D_MOVE], [AC_MSG_CHECKING([if kernel has FS_RENAME_DOES_D_MOVE flag]) @@ -1484,6 +1321,98 @@ LB_LINUX_TRY_COMPILE([ ]) # +# 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]) +]) +]) + +# 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]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + struct inode *dir; + struct dentry *dentry; + const char *oldname = NULL; + int mode = 0; + + vfs_symlink(dir, dentry, oldname, mode); +],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_4ARGS_VFS_SYMLINK, 1, + [vfs_symlink wants 4 args]) +],[ + 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]) +],[ +]) +]) + +# +# LC_LINUX_FIEMAP_H +# +# If we have fiemap.h +# after 2.6.27 use fiemap.h in include/linux +# +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 + ],[],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_LINUX_FIEMAP_H, 1, [Kernel has fiemap.h]) + ],[ + AC_MSG_RESULT([no]) + ]) +], +[]) +]) + +# 2.6.17 super_block use s_vfs_rename_mutex instead of s_vfs_rename_sem +AC_DEFUN([LC_VFS_RENAME_MUTEX], +[AC_MSG_CHECKING([super_block has s_vfs_rename_mutex]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + struct super_block sb; + mutex_lock(&sb.s_vfs_rename_mutex); +],[ + AC_DEFINE(HAVE_VFS_RENAME_MUTEX, 1, + [super_block has s_vfs_rename_mutex]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# # LC_PROG_LINUX # # Lustre linux kernel checks @@ -1492,6 +1421,8 @@ 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 @@ -1501,7 +1432,6 @@ AC_DEFUN([LC_PROG_LINUX], LC_CONFIG_LRU_RESIZE LC_QUOTA_MODULE - LC_TASK_PPTR # RHEL4 patches LC_EXPORT_TRUNCATE_COMPLETE LC_EXPORT_TRUNCATE_RANGE @@ -1511,16 +1441,9 @@ AC_DEFUN([LC_PROG_LINUX], LC_EXPORT___D_MOVE LC_EXPORT_NODE_TO_CPUMASK - LC_FUNC_RELEASEPAGE_WITH_INT - LC_HEADER_MM_INLINE - LC_STRUCT_INODE - LC_FUNC_REGISTER_CACHE + LC_HEADER_LDISKFS_XATTR LC_FUNC_GRAB_CACHE_PAGE_NOWAIT_GFP - LC_FUNC_DEV_SET_RDONLY - LC_FUNC_FILEMAP_FDATAWRITE LC_STRUCT_STATFS - LC_FUNC_PAGE_MAPPED - LC_STRUCT_FILE_OPS_UNLOCKED_IOCTL LC_FILEMAP_POPULATE LC_D_ADD_UNIQUE LC_BIT_SPINLOCK_H @@ -1542,6 +1465,8 @@ AC_DEFUN([LC_PROG_LINUX], LC_FUNC_RCU LC_PERCPU_COUNTER LC_QUOTA64 + LC_4ARGS_VFS_SYMLINK + LC_NETLINK # does the kernel have VFS intent patches? LC_VFS_INTENT_PATCHES @@ -1552,6 +1477,7 @@ AC_DEFUN([LC_PROG_LINUX], # 2.6.12 LC_RW_TREE_LOCK + LC_EXPORT_SYNCHRONIZE_RCU # 2.6.15 LC_INODE_I_MUTEX @@ -1562,6 +1488,7 @@ AC_DEFUN([LC_PROG_LINUX], # 2.6.17 LC_INODE_IPRIVATE LC_DQUOTOFF_MUTEX + LC_VFS_RENAME_MUTEX # 2.6.18 LC_NR_PAGECACHE @@ -1594,6 +1521,8 @@ AC_DEFUN([LC_PROG_LINUX], # 2.6.22 LC_INVALIDATE_BDEV_2ARG LC_ASYNC_BLOCK_CIPHER + LC_STRUCT_HASH_DESC + LC_STRUCT_BLKCIPHER_DESC LC_FS_RENAME_DOES_D_MOVE # 2.6.23 LC_UNREGISTER_BLKDEV_RETURN_INT @@ -1660,46 +1589,48 @@ fi # --enable-mpitest # AC_ARG_ENABLE(mpitests, - AC_HELP_STRING([--enable-mpitest=yes|no|mpich directory], + AC_HELP_STRING([--enable-mpitests=yes|no|mpicc wrapper], [include mpi tests]), [ enable_mpitests=yes case $enableval in yes) - MPI_ROOT=/opt/mpich - LDFLAGS="$LDFLAGS -L$MPI_ROOT/ch-p4/lib -L$MPI_ROOT/ch-p4/lib64" - CFLAGS="$CFLAGS -I$MPI_ROOT/include" + MPICC_WRAPPER=mpicc ;; no) enable_mpitests=no ;; - [[\\/$]]* | ?:[[\\/]]* ) - MPI_ROOT=$enableval - LDFLAGS="$LDFLAGS -L$with_mpi/lib" - CFLAGS="$CFLAGS -I$MPI_ROOT/include" - ;; *) - AC_MSG_ERROR([expected absolute directory name for --enable-mpitests or yes or no]) + MPICC_WRAPPER=$enableval ;; esac ], [ - MPI_ROOT=/opt/mpich - LDFLAGS="$LDFLAGS -L$MPI_ROOT/ch-p4/lib -L$MPI_ROOT/ch-p4/lib64" - CFLAGS="$CFLAGS -I$MPI_ROOT/include" + MPICC_WRAPPER=mpicc enable_mpitests=yes ] ) -AC_SUBST(MPI_ROOT) if test x$enable_mpitests != xno; then - AC_MSG_CHECKING([whether to mpitests can be built]) - AC_CHECK_FILE([$MPI_ROOT/include/mpi.h], - [AC_CHECK_LIB([mpich],[MPI_Start],[enable_mpitests=yes],[enable_mpitests=no])], - [enable_mpitests=no]) + AC_MSG_CHECKING([whether mpitests can be built]) + oldcc=$CC + CC=$MPICC_WRAPPER + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[ + #include + ]],[[ + int flag; + MPI_Initialized(&flag); + ]])], + [ + AC_MSG_RESULT([yes]) + ],[ + AC_MSG_RESULT([no]) + enable_mpitests=no + ]) + CC=$oldcc fi -AC_MSG_RESULT([$enable_mpitests]) - +AC_SUBST(MPICC_WRAPPER) AC_MSG_NOTICE([Enabling Lustre configure options for libsysio]) ac_configure_args="$ac_configure_args --with-lustre-hack --with-sockets" @@ -1841,6 +1772,31 @@ LB_LINUX_TRY_COMPILE([ ]) ]) +# +# LC_QUOTA64 +# linux kernel have 64-bit limits support +# +AC_DEFUN([LC_QUOTA64], +[if test x$enable_quota_module = xyes -a x$enable_server = xyes ; then + AC_MSG_CHECKING([if kernel has 64-bit quota limits support]) + LB_LINUX_TRY_COMPILE([ + #include + #include + #include + int versions[] = V2_INITQVERSIONS_R1; + struct v2_disk_dqblk_r1 dqblk_r1; + ],[],[ + 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]) + ]) +fi +]) + # LC_SECURITY_PLUG # for SLES10 SP2 # check security plug in sles10 sp2 kernel AC_DEFUN([LC_SECURITY_PLUG], @@ -1889,30 +1845,32 @@ LB_LINUX_TRY_COMPILE([ ]) # -# LC_QUOTA64 -# linux kernel have 64-bit limits support +# LC_NETLINK # -AC_DEFUN([LC_QUOTA64], -[if test x$enable_quota_module = xyes; then - AC_MSG_CHECKING([if kernel has 64-bit quota limits support]) +# If we have netlink.h, and nlmsg_new takes 2 args +# +AC_DEFUN([LC_NETLINK], +[AC_MSG_CHECKING([if netlink.h can be compiled]) +LB_LINUX_TRY_COMPILE([ + #include +],[],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_NETLINK, 1, [net/netlink.h found]) + + AC_MSG_CHECKING([if nlmsg_new takes a 2nd argument]) LB_LINUX_TRY_COMPILE([ - #include - #include - #include - int versions[] = V2_INITQVERSIONS_R1; - struct v2_disk_dqblk_r1 dqblk_r1; - ],[],[ - AC_DEFINE(HAVE_QUOTA64, 1, [have quota64]) + #include + ],[ + nlmsg_new(100, GFP_KERNEL); + ],[ AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_NETLINK_NL2, 1, [nlmsg_new takes 2 args]) ],[ - LB_CHECK_FILE([$LINUX/include/linux/lustre_version.h],[ - if test x$enable_server = xyes ; then - AC_MSG_ERROR([You have got no 64-bit kernel quota support.]) - fi - ],[]) AC_MSG_RESULT([no]) ]) -fi +],[ + AC_MSG_RESULT([no]) +]) ]) # @@ -2052,11 +2010,13 @@ lustre/kernel_patches/targets/2.6-rhel5.target lustre/kernel_patches/targets/2.6-fc5.target lustre/kernel_patches/targets/2.6-patchless.target lustre/kernel_patches/targets/2.6-sles10.target +lustre/kernel_patches/targets/2.6-oel5.target lustre/ldlm/Makefile lustre/fid/Makefile lustre/fid/autoMakefile lustre/liblustre/Makefile lustre/liblustre/tests/Makefile +lustre/liblustre/tests/mpi/Makefile lustre/llite/Makefile lustre/llite/autoMakefile lustre/lclient/Makefile @@ -2102,8 +2062,8 @@ lustre/ptlrpc/gss/autoMakefile lustre/quota/Makefile lustre/quota/autoMakefile lustre/scripts/Makefile -lustre/scripts/version_tag.pl lustre/tests/Makefile +lustre/tests/mpi/Makefile lustre/utils/Makefile lustre/utils/gss/Makefile ])