X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fautoconf%2Flustre-core.m4;h=5d8c40224fb4837202f1f2c681ca6f4235754b3e;hp=4e00bf692f072153142b7676de14e4ea9ac6ff7f;hb=8fcf474eb1b6508b00ef1121d2ae5018d76d31c2;hpb=b26f39067bd87ad8a9840e03acbf75f3a47f6352 diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 4e00bf6..5d8c402 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -8,6 +8,7 @@ AC_DEFUN([LC_CONFIG_SRCDIR], [AC_CONFIG_SRCDIR([lustre/obdclass/obdo.c]) libcfs_is_module=yes +ldiskfs_is_ext4=no ]) # @@ -48,195 +49,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]) -LB_LINUX_TRY_COMPILE([ - #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; -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_I_ALLOC_SEM, 1, [struct inode has i_alloc_sem]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# -# 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]) +AC_DEFUN([LC_STACK_SIZE], +[AC_MSG_CHECKING([stack size big than 8k]) LB_LINUX_TRY_COMPILE([ - #include + #include ],[ - shrinker_t shrinker; - - set_shrinker(1, shrinker); + #if THREAD_SIZE < 8192 + #error "stack size < 8192" + #endif ],[ - 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]) + AC_MSG_RESULT(yes) ],[ - 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]) - ]) + AC_MSG_ERROR([Lustre requires that Linux is configured with at least a 8KB stack.]) ]) ]) # -# 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 +76,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 +85,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 +100,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 +148,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 +259,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 +339,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 +356,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 +377,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 +394,9 @@ AC_DEFUN([LC_XATTR_ACL], []) ]) -# -# 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]) - ]) -], -[]) -]) - +# 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([ @@ -548,10 +414,14 @@ 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]) LB_LINUX_TRY_COMPILE([ + #include #include ],[],[ AC_MSG_RESULT([yes]) @@ -562,22 +432,13 @@ AC_DEFUN([LC_POSIX_ACL_XATTR_H], ]) $1 ],[ -AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) ]) ]) # -# LC_EXPORT___IGET -# starting from 2.6.19 linux kernel exports __iget() +# only for Lustre-patched kernels # -AC_DEFUN([LC_EXPORT___IGET], -[LB_CHECK_SYMBOL_EXPORT([__iget], -[fs/inode.c],[ - AC_DEFINE(HAVE_EXPORT___IGET, 1, [kernel exports __iget]) -],[ -]) -]) - AC_DEFUN([LC_LUSTRE_VERSION_H], [LB_CHECK_FILE([$LINUX/include/linux/lustre_version.h],[ rm -f "$LUSTRE/include/linux/lustre_version.h" @@ -592,14 +453,6 @@ AC_DEFUN([LC_LUSTRE_VERSION_H], ]) ]) -AC_DEFUN([LC_FUNC_SET_FS_PWD], -[LB_CHECK_SYMBOL_EXPORT([set_fs_pwd], -[fs/namespace.c],[ - AC_DEFINE(HAVE_SET_FS_PWD, 1, [set_fs_pwd is exported]) -],[ -]) -]) - # # LC_CAPA_CRYPTO # @@ -623,7 +476,7 @@ dnl the AES symbol usually tied with arch, e.g. CRYPTO_AES_586 dnl FIXME AC_DEFUN([LC_CONFIG_RMTCLIENT], [LB_LINUX_CONFIG_IM([CRYPTO_AES],[],[ - AC_MSG_ERROR([Lustre remote client require that CONFIG_CRYPTO_AES is enabled in your kernel.]) + AC_MSG_WARN([Lustre remote client require that CONFIG_CRYPTO_AES is enabled in your kernel.]) ]) ]) @@ -654,19 +507,19 @@ AC_DEFUN([LC_CONFIG_SUNRPC], AC_DEFUN([LC_CONFIG_GSS_KEYRING], [AC_MSG_CHECKING([whether to enable gss keyring backend]) AC_ARG_ENABLE([gss_keyring], - [AC_HELP_STRING([--disable-gss-keyring], + [AC_HELP_STRING([--disable-gss-keyring], [disable gss keyring backend])], - [],[enable_gss_keyring='yes']) + [],[enable_gss_keyring='yes']) AC_MSG_RESULT([$enable_gss_keyring]) if test x$enable_gss_keyring != xno; then - LB_LINUX_CONFIG_IM([KEYS],[], + LB_LINUX_CONFIG_IM([KEYS],[], [AC_MSG_ERROR([GSS keyring backend require that CONFIG_KEYS be enabled in your kernel.])]) - AC_CHECK_LIB([keyutils], [keyctl_search], [], + AC_CHECK_LIB([keyutils], [keyctl_search], [], [AC_MSG_ERROR([libkeyutils is not found, which is required by gss keyring backend])],) - AC_DEFINE([HAVE_GSS_KEYRING], [1], + AC_DEFINE([HAVE_GSS_KEYRING], [1], [Define this if you enable gss keyring backend]) fi ]) @@ -685,177 +538,74 @@ AC_DEFUN([LC_CONFIG_GSS], AC_MSG_RESULT([$enable_gss]) if test x$enable_gss == xyes; then - LC_CONFIG_GSS_KEYRING + LC_CONFIG_GSS_KEYRING LC_CONFIG_SUNRPC + AC_DEFINE([HAVE_GSS], [1], [Define this if you enable gss]) + LB_LINUX_CONFIG_IM([CRYPTO_MD5],[], [AC_MSG_WARN([kernel MD5 support is recommended by using GSS.])]) - LB_LINUX_CONFIG_IM([CRYPTO_SHA1],[], + LB_LINUX_CONFIG_IM([CRYPTO_SHA1],[], [AC_MSG_WARN([kernel SHA1 support is recommended by using GSS.])]) - LB_LINUX_CONFIG_IM([CRYPTO_SHA256],[], + LB_LINUX_CONFIG_IM([CRYPTO_SHA256],[], [AC_MSG_WARN([kernel SHA256 support is recommended by using GSS.])]) - LB_LINUX_CONFIG_IM([CRYPTO_SHA512],[], + LB_LINUX_CONFIG_IM([CRYPTO_SHA512],[], [AC_MSG_WARN([kernel SHA512 support is recommended by using GSS.])]) - LB_LINUX_CONFIG_IM([CRYPTO_WP512],[], - [AC_MSG_WARN([kernel WP512 support is recommended by using GSS.])]) - LB_LINUX_CONFIG_IM([CRYPTO_ARC4],[], - [AC_MSG_WARN([kernel ARC4 support is recommended by using GSS.])]) - LB_LINUX_CONFIG_IM([CRYPTO_DES],[], - [AC_MSG_WARN([kernel DES support is recommended by using GSS.])]) - LB_LINUX_CONFIG_IM([CRYPTO_TWOFISH],[], - [AC_MSG_WARN([kernel TWOFISH support is recommended by using GSS.])]) - LB_LINUX_CONFIG_IM([CRYPTO_CAST6],[], - [AC_MSG_WARN([kernel CAST6 support is recommended by using GSS.])]) - - AC_CHECK_LIB([gssapi], [gss_init_sec_context], + + AC_CHECK_LIB([gssapi], [gss_init_sec_context], [GSSAPI_LIBS="$GSSAPI_LDFLAGS -lgssapi"], [AC_CHECK_LIB([gssglue], [gss_init_sec_context], [GSSAPI_LIBS="$GSSAPI_LDFLAGS -lgssglue"], [AC_MSG_ERROR([libgssapi or libgssglue is not found, which is required by GSS.])])],) - AC_SUBST(GSSAPI_LIBS) + AC_SUBST(GSSAPI_LIBS) - AC_KERBEROS_V5 + AC_KERBEROS_V5 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; -],[ - AC_DEFINE(HAVE_MS_FLOCK_LOCK, 1, - [kernel has MS_FLOCK_LOCK flag]) - AC_MSG_RESULT([yes]) +# 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_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()]) +# 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 + #include + #undef i_mutex ],[ - int cansleep; - struct file *file; - struct file_lock *file_lock; - flock_lock_file_wait(file, file_lock, cansleep); + struct inode i; + + mutex_unlock(&i.i_mutex); ],[ - 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(yes) + AC_DEFINE(HAVE_INODE_I_MUTEX, 1, + [after 2.6.15 inode have i_mutex intead of i_sem]) ],[ - AC_MSG_RESULT([no]) + 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]) +# 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 + #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]) -]) -]) - -# 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); + struct seq_file seq; + + mutex_unlock(&seq.lock); ],[ AC_MSG_RESULT(yes) AC_DEFINE(HAVE_SEQ_LOCK, 1, @@ -886,6 +636,29 @@ LB_LINUX_TRY_COMPILE([ ]) ]) +# 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_STATFS_DENTRY_PARAM # starting from 2.6.18 linux kernel uses dentry instead of @@ -927,9 +700,28 @@ LB_LINUX_TRY_COMPILE([ ]) # +# 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); +],[ + AC_DEFINE(HAVE_D_OBTAIN_ALIAS, 1, + [d_obtain_alias exist in kernel]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# # 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]) @@ -947,7 +739,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" @@ -976,6 +768,23 @@ 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.19 API changes # inode don't have i_blksize field AC_DEFUN([LC_INODE_BLKSIZE], @@ -1076,22 +885,28 @@ LB_LINUX_TRY_COMPILE([ ]) # LC_CANCEL_DIRTY_PAGE -# 2.6.20 introduse cancel_dirty_page instead of -# clear_page_dirty. +# 2.6.20 introduced cancel_dirty_page instead of clear_page_dirty. AC_DEFUN([LC_CANCEL_DIRTY_PAGE], -[AC_MSG_CHECKING([kernel has cancel_dirty_page]) -LB_LINUX_TRY_COMPILE([ - #include - #include + [AC_MSG_CHECKING([kernel has cancel_dirty_page]) + # the implementation of cancel_dirty_page in OFED 1.4.1's SLES10 SP2 + # backport is broken, so ignore it + if test -f $OFED_BACKPORT_PATH/linux/mm.h && + test "$(sed -ne '/^static inline void cancel_dirty_page(struct page \*page, unsigned int account_size)$/,/^}$/p' $OFED_BACKPORT_PATH/linux/mm.h | md5sum)" = "c518cb32d6394760c5bca14cb7538d3e -"; then + AC_MSG_RESULT(no) + else + LB_LINUX_TRY_COMPILE([ + #include + #include ],[ - cancel_dirty_page(NULL, 0); + cancel_dirty_page(NULL, 0); ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_CANCEL_DIRTY_PAGE, 1, - [kernel has cancel_dirty_page instead of clear_page_dirty]) + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_CANCEL_DIRTY_PAGE, 1, + [kernel has cancel_dirty_page instead of clear_page_dirty]) ],[ - AC_MSG_RESULT(no) + AC_MSG_RESULT(no) ]) + fi ]) # @@ -1118,8 +933,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([ @@ -1142,15 +956,20 @@ LB_LINUX_TRY_COMPILE([ AC_DEFUN([LC_PAGE_CHECKED], [AC_MSG_CHECKING([kernel has PageChecked and SetPageChecked]) LB_LINUX_TRY_COMPILE([ - #include - #include + #include +#ifdef HAVE_LINUX_MMTYPES_H + #include +#endif + #include ],[ - #ifndef PageChecked - #error PageChecked not defined in kernel - #endif - #ifndef SetPageChecked - #error SetPageChecked not defined in kernel - #endif + 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 ],[ AC_MSG_RESULT(yes) AC_DEFINE(HAVE_PAGE_CHECKED, 1, @@ -1169,6 +988,15 @@ AC_DEFINE(HAVE_TRUNCATE_COMPLETE_PAGE, 1, ]) ]) +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]) +],[ +]) +]) + AC_DEFUN([LC_EXPORT_D_REHASH_COND], [LB_CHECK_SYMBOL_EXPORT([d_rehash_cond], [fs/dcache.c],[ @@ -1259,217 +1087,776 @@ AC_DEFUN([LC_EXPORT_NODE_TO_CPUMASK], 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]) +# 2.6.22 lost second parameter for invalidate_bdev +AC_DEFUN([LC_INVALIDATE_BDEV_2ARG], +[AC_MSG_CHECKING([if invalidate_bdev has second argument]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + invalidate_bdev(NULL,0); +],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_INVALIDATE_BDEV_2ARG, 1, + [invalidate_bdev has second argument]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# 2.6.18 + + +# 2.6.23 have return type 'void' for unregister_blkdev +AC_DEFUN([LC_UNREGISTER_BLKDEV_RETURN_INT], +[AC_MSG_CHECKING([if unregister_blkdev return int]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + int i = unregister_blkdev(0,NULL); +],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_UNREGISTER_BLKDEV_RETURN_INT, 1, + [unregister_blkdev return int]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# 2.6.23 change .sendfile to .splice_read +# RHEL4 (-92 kernel) have both sendfile and .splice_read API +AC_DEFUN([LC_KERNEL_SENDFILE], +[AC_MSG_CHECKING([if kernel has .sendfile]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + struct file_operations file; + + file.sendfile = NULL; +], [ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_KERNEL_SENDFILE, 1, + [kernel has .sendfile]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# 2.6.23 change .sendfile to .splice_read +AC_DEFUN([LC_KERNEL_SPLICE_READ], +[AC_MSG_CHECKING([if kernel has .splice_read]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + struct file_operations file; + + file.splice_read = NULL; +], [ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_KERNEL_SPLICE_READ, 1, + [kernel has .slice_read]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# 2.6.23 extract nfs export related data into exportfs.h +AC_DEFUN([LC_HAVE_EXPORTFS_H], +[LB_CHECK_FILE([$LINUX/include/linux/exportfs.h], [ + AC_DEFINE(HAVE_LINUX_EXPORTFS_H, 1, + [kernel has include/exportfs.h]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# 2.6.23 has new page fault handling API +AC_DEFUN([LC_VM_OP_FAULT], +[AC_MSG_CHECKING([kernel has .fault in vm_operation_struct]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + struct vm_operations_struct op; + + op.fault = NULL; +], [ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_VM_OP_FAULT, 1, + [kernel has .fault in vm_operation_struct]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +#2.6.23 has new shrinker API +AC_DEFUN([LC_REGISTER_SHRINKER], +[AC_MSG_CHECKING([if kernel has register_shrinker]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + register_shrinker(NULL); +], [ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_REGISTER_SHRINKER, 1, + [kernel has register_shrinker]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# 2.6.24 has bio_endio with 2 args +AC_DEFUN([LC_BIO_ENDIO_2ARG], +[AC_MSG_CHECKING([if kernel has bio_endio with 2 args]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + bio_endio(NULL, 0); +], [ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_BIO_ENDIO_2ARG, 1, + [kernel has bio_endio with 2 args]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# 2.6.24 has new members in exports struct. +AC_DEFUN([LC_FH_TO_DENTRY], +[AC_MSG_CHECKING([if kernel has .fh_to_dentry member in export_operations struct]) +LB_LINUX_TRY_COMPILE([ +#ifdef HAVE_LINUX_EXPORTFS_H + #include +#else + #include +#endif +],[ + struct export_operations exp; + + exp.fh_to_dentry = NULL; +], [ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_FH_TO_DENTRY, 1, + [kernel has .fh_to_dentry member in export_operations struct]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# 2.6.24 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]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + struct proc_dir_entry pde; + + pde.deleted = NULL; +], [ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_PROCFS_DELETED, 1, + [kernel has deleted member in procfs entry struct]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# 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 isn't export set_fs_pwd and change paramter in fs struct +AC_DEFUN([LC_FS_STRUCT_USE_PATH], +[AC_MSG_CHECKING([fs_struct use path structure]) +LB_LINUX_TRY_COMPILE([ + #include + #include + #include +],[ + struct path path; + struct fs_struct fs; + + fs.pwd = path; +], [ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_FS_STRUCT_USE_PATH, 1, + [fs_struct use path structure]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# +# LC_VFS_INTENT_PATCHES +# +# 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]) +LB_LINUX_TRY_COMPILE([ + #include + #include +],[ + struct nameidata nd; + struct lookup_intent *it; + + it = &nd.intent; + intent_init(it, IT_OPEN); + it->d.lustre.it_disposition = 0; + it->d.lustre.it_data = NULL; +],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_VFS_INTENT_PATCHES, 1, [VFS intent patches are applied]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +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]) +]) +]) + +# +# 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], +[AC_MSG_CHECKING([if kernel has tree_lock as rwlock]) +tmp_flags="$EXTRA_KCFLAGS" +EXTRA_KCFLAGS="-Werror" +LB_LINUX_TRY_COMPILE([ + #include +],[ + struct address_space a; + + write_lock(&a.tree_lock); +],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_RW_TREE_LOCK, 1, [kernel has tree_lock as rw_lock]) +],[ + AC_MSG_RESULT([no]) +]) +EXTRA_KCFLAGS="$tmp_flags" +]) + +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 + +# ifdef CONFIG_FS_POSIX_ACL +# ifdef HAVE_XATTR_ACL +# include +# endif +# ifdef HAVE_LINUX_POSIX_ACL_XATTR_H +# include +# endif +# endif + +#include + +#include + +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); + + return 0; +} + +],[ + acl_size=`cat acl.size` + AC_MSG_RESULT([ACL size $acl_size]) + AC_DEFINE_UNQUOTED(XATTR_ACL_SIZE, AS_TR_SH([$acl_size]), [size of xattr acl]) +],[ + AC_ERROR([ACL size can't computed]) +]) +CFLAGS="$tmp_flags" +]) + +# +# check for crypto API +# +AC_DEFUN([LC_ASYNC_BLOCK_CIPHER], +[AC_MSG_CHECKING([if kernel has block cipher support]) +LB_LINUX_TRY_COMPILE([ + #include + #include +],[ + struct crypto_blkcipher *tfm; + tfm = crypto_alloc_blkcipher("aes", 0, 0 ); +],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_ASYNC_BLOCK_CIPHER, 1, [kernel has block cipher support]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# +# check for struct hash_desc +# +AC_DEFUN([LC_STRUCT_HASH_DESC], +[AC_MSG_CHECKING([if kernel has struct hash_desc]) +LB_LINUX_TRY_COMPILE([ + #include + #include +],[ + struct hash_desc foo; +],[ + 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]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + int v = FS_RENAME_DOES_D_MOVE; +],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_FS_RENAME_DOES_D_MOVE, 1, [kernel has FS_RENAME_DOES_D_MOVE flag]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# +# 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]) +],[ +]) +]) + +#2.6.27 +AC_DEFUN([LC_INODE_PERMISION_2ARGS], +[AC_MSG_CHECKING([inode_operations->permission has two args]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + struct inode *inode; + + inode->i_op->permission(NULL,0); +],[ + AC_DEFINE(HAVE_INODE_PERMISION_2ARGS, 1, + [inode_operations->permission has two args]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# 2.6.27 has file_remove_suid instead of remove_suid +AC_DEFUN([LC_FILE_REMOVE_SUID], +[AC_MSG_CHECKING([kernel has file_remove_suid]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + file_remove_suid(NULL); +],[ + AC_DEFINE(HAVE_FILE_REMOVE_SUID, 1, + [kernel have file_remove_suid]) + 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]) +]) +]) + +# 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.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 + #include ],[ - invalidate_bdev(NULL,0); + struct bio io; + io.bi_hw_segments = 0; ],[ + AC_DEFINE(HAVE_BI_HW_SEGMENTS, 1, + [struct bio has a bi_hw_segments field]) AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_INVALIDATE_BDEV_2ARG, 1, - [invalidate_bdev has second argument]) ],[ AC_MSG_RESULT([no]) ]) ]) -# 2.6.23 have return type 'void' for unregister_blkdev -AC_DEFUN([LC_UNREGISTER_BLKDEV_RETURN_INT], -[AC_MSG_CHECKING([if unregister_blkdev return int]) +# 2.6.27 sles11 move the quotaio_v1.h to fs +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]) +],[ + 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]) LB_LINUX_TRY_COMPILE([ #include ],[ - int i = unregister_blkdev(0,NULL); + 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_DEFINE(HAVE_UNREGISTER_BLKDEV_RETURN_INT, 1, - [unregister_blkdev return int]) ],[ AC_MSG_RESULT([no]) ]) ]) -# 2.6.23 change .sendfile to .splice_read -AC_DEFUN([LC_KERNEL_SPLICE_READ], -[AC_MSG_CHECKING([if kernel has .splice_read]) +# 2.6.27 removed the read_inode from super_operations. +AC_DEFUN([LC_READ_INODE_IN_SBOPS], +[AC_MSG_CHECKING([super_operations has a read_inode field]) LB_LINUX_TRY_COMPILE([ #include ],[ - struct file_operations file; - - file.splice_read = 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_KERNEL_SPLICE_READ, 1, - [kernel has .slice_read]) ],[ AC_MSG_RESULT([no]) ]) ]) -# 2.6.23 extract nfs export related data into exportfs.h -AC_DEFUN([LC_HAVE_EXPORTFS_H], -[ -tmpfl="$CFLAGS" -CFLAGS="$CFLAGS -I$LINUX_OBJ/include" -AC_CHECK_HEADERS([linux/exportfs.h]) -CFLAGS="$tmpfl" -]) - -# -# LC_VFS_INTENT_PATCHES -# -# 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]) +# 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 - #include + #include ],[ - struct nameidata nd; - struct lookup_intent *it; - - it = &nd.intent; - intent_init(it, IT_OPEN); - it->d.lustre.it_disposition = 0; - it->d.lustre.it_data = NULL; + 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_DEFINE(HAVE_VFS_INTENT_PATCHES, 1, [VFS intent patches are applied]) ],[ AC_MSG_RESULT([no]) ]) ]) -AC_DEFUN([LC_S_TIME_GRAN], -[AC_MSG_CHECKING([if super block has s_time_gran member]) +# 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 + #include ],[ - struct super_block sb; - - return sb.s_time_gran; + sb_has_quota_active(NULL, 0); ],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_S_TIME_GRAN, 1, [super block has s_time_gran member]) + AC_DEFINE(HAVE_SB_HAS_QUOTA_ACTIVE, 1, + [Kernel has a sb_has_quota_active]) + 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 has inode_permission instead of permisson +AC_DEFUN([LC_EXPORT_INODE_PERMISSION], +[LB_CHECK_SYMBOL_EXPORT([inode_permission], +[fs/namei.c],[ +AC_DEFINE(HAVE_EXPORT_INODE_PERMISSION, 1, + [inode_permission is exported by the kernel]) +],[ +]) +]) + +# 2.6.27 use 5th parameter in quota_on for remount. +AC_DEFUN([LC_QUOTA_ON_5ARGS], +[AC_MSG_CHECKING([quota_on needs 5 parameters]) LB_LINUX_TRY_COMPILE([ - #include + #include ],[ - return get_sb_time_gran(NULL); + struct quotactl_ops *qop; + 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_SB_TIME_GRAN, 1, [kernel has old get_sb_time_gran]) ],[ AC_MSG_RESULT([no]) ]) ]) - -# ~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 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 address_space a; - - write_lock(&a.tree_lock); + 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]) - 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 $EXTRA_KCFLAGS" -AC_TRY_RUN([ -#define __KERNEL__ -#include -#include -#undef __KERNEL__ -// block include -#define __LINUX_POSIX_ACL_H - -# ifdef CONFIG_FS_POSIX_ACL -# ifdef HAVE_XATTR_ACL -# include -# endif -# ifdef HAVE_LINUX_POSIX_ACL_XATTR_H -# include -# endif -# endif - -#include - -#include - -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); - - return 0; -} - +# 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 ],[ - 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]) + vfs_dq_off(NULL, 0); ],[ - AC_ERROR([ACL size can't computed]) + AC_DEFINE(HAVE_VFS_DQ_OFF, 1, [vfs_dq_off is defined]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) ]) -CFLAGS="$tmp_flags" ]) # -# check for crypto API +# LC_LINUX_FIEMAP_H # -AC_DEFUN([LC_ASYNC_BLOCK_CIPHER], -[AC_MSG_CHECKING([if kernel has block cipher support]) +# 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 + #include + ],[],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_LINUX_FIEMAP_H, 1, [Kernel has fiemap.h]) + ],[ + 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 + #include ],[ - int v = CRYPTO_ALG_TYPE_BLKCIPHER; + lock_map_acquire(NULL); ],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_ASYNC_BLOCK_CIPHER, 1, [kernel has block cipher support]) + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_LOCK_MAP_ACQUIRE, 1, + [lock_map_acquire is defined]) ],[ - AC_MSG_RESULT([no]) + AC_MSG_RESULT(no) ]) ]) -# -# 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]) +# 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 + #include ],[ - int v = FS_RENAME_DOES_D_MOVE; + blk_queue_logical_block_size(NULL, 0); ],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_FS_RENAME_DOES_D_MOVE, 1, [kernel has FS_RENAME_DOES_D_MOVE flag]) + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_BLK_QUEUE_LOG_BLK_SIZE, 1, + [blk_queue_logical_block_size is defined]) ],[ - AC_MSG_RESULT([no]) + AC_MSG_RESULT(no) ]) ]) @@ -1482,6 +1869,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 @@ -1491,25 +1880,18 @@ 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 LC_EXPORT_D_REHASH_COND LC_EXPORT___D_REHASH LC_EXPORT_D_MOVE_LOCKED 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 @@ -1520,7 +1902,6 @@ AC_DEFUN([LC_PROG_LINUX], LC_STRUCT_INTENT_FILE - LC_FUNC_SET_FS_PWD LC_CAPA_CRYPTO LC_CONFIG_RMTCLIENT LC_CONFIG_GSS @@ -1532,6 +1913,7 @@ AC_DEFUN([LC_PROG_LINUX], LC_FUNC_RCU LC_PERCPU_COUNTER LC_QUOTA64 + LC_4ARGS_VFS_SYMLINK # does the kernel have VFS intent patches? LC_VFS_INTENT_PATCHES @@ -1542,6 +1924,7 @@ AC_DEFUN([LC_PROG_LINUX], # 2.6.12 LC_RW_TREE_LOCK + LC_EXPORT_SYNCHRONIZE_RCU # 2.6.15 LC_INODE_I_MUTEX @@ -1550,6 +1933,7 @@ AC_DEFUN([LC_PROG_LINUX], LC_SECURITY_PLUG # for SLES10 SP2 # 2.6.17 + LC_INODE_IPRIVATE LC_DQUOTOFF_MUTEX # 2.6.18 @@ -1559,14 +1943,16 @@ AC_DEFUN([LC_PROG_LINUX], 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 - LC_EXPORT_FILEMAP_FDATAWRITE_RANGE fi #2.6.18 + RHEL5 (fc6) LC_PG_FS_MISC LC_PAGE_CHECKED + LC_LINUX_FIEMAP_H # 2.6.19 LC_INODE_BLKSIZE @@ -1583,11 +1969,49 @@ 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 LC_KERNEL_SPLICE_READ + LC_KERNEL_SENDFILE LC_HAVE_EXPORTFS_H + LC_VM_OP_FAULT + LC_REGISTER_SHRINKER + + # 2.6.24 + LC_HAVE_MMTYPES_H + LC_BIO_ENDIO_2ARG + LC_FH_TO_DENTRY + LC_PROCFS_DELETED + + #2.6.25 + LC_MAPPING_CAP_WRITEBACK_DIRTY + + # 2.6.26 + LC_FS_STRUCT_USE_PATH + + # 2.6.27 + LC_INODE_PERMISION_2ARGS + LC_FILE_REMOVE_SUID + LC_TRYLOCKPAGE + LC_READ_INODE_IN_SBOPS + LC_EXPORT_INODE_PERMISSION + LC_QUOTA_ON_5ARGS + LC_QUOTA_OFF_3ARGS + LC_VFS_DQ_OFF + LC_LOCK_MAP_ACQUIRE + + # 2.6.27.15-2 sles11 + LC_BI_HW_SEGMENTS + LC_HAVE_QUOTAIO_V1_H + LC_VFS_SYMLINK_5ARGS + LC_SB_ANY_QUOTA_ACTIVE + LC_SB_HAS_QUOTA_ACTIVE + + # 2.6.31 + LC_BLK_QUEUE_LOG_BLK_SIZE ]) # @@ -1645,50 +2069,109 @@ if test x$enable_liblustre_acl = xyes ; then AC_DEFINE(LIBLUSTRE_POSIX_ACL, 1, Liblustre Support ACL-enabled MDS) fi +# 2.6.29 change prepare/commit_write to write_begin/end +AC_DEFUN([LC_WRITE_BEGIN_END], +[AC_MSG_CHECKING([if kernel has .write_begin/end]) +LB_LINUX_TRY_COMPILE([ + #include + #include +#ifdef HAVE_LINUX_MMTYPES_H + #include +#endif +],[ + struct address_space_operations aops; + struct page *page; + + aops.write_begin = NULL; + aops.write_end = NULL; + page = grab_cache_page_write_begin(NULL, 0, 0); +], [ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_KERNEL_WRITE_BEGIN_END, 1, + [kernel has .write_begin/end]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# 2.6.29 blkdev_put has 2 arguments +AC_DEFUN([LC_BLKDEV_PUT_2ARGS], +[AC_MSG_CHECKING([blkdev_put needs 2 parameters]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + blkdev_put(NULL, 0); +],[ + AC_DEFINE(HAVE_BLKDEV_PUT_2ARGS, 1, + [blkdev_put needs 2 paramters]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# 2.6.29 dentry_open has 4 arguments +AC_DEFUN([LC_DENTRY_OPEN_4ARGS], +[AC_MSG_CHECKING([dentry_open needs 4 parameters]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + dentry_open(NULL, NULL, 0, NULL); +],[ + AC_DEFINE(HAVE_DENTRY_OPEN_4ARGS, 1, + [dentry_open needs 4 paramters]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) +]) + # # --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" @@ -1825,11 +2308,50 @@ LB_LINUX_TRY_COMPILE([ ],[ AC_MSG_RESULT([no]) ]) + ],[ AC_MSG_RESULT([no]) ]) ]) +# +# 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]) + ],[ + tmp_flags="$EXTRA_KCFLAGS" + EXTRA_KCFLAGS="-I $LINUX/fs" + LB_LINUX_TRY_COMPILE([ + #include + #include + #include + struct v2r1_disk_dqblk 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]) + ]) + EXTRA_KCFLAGS=$tmp_flags + ]) +fi +]) + # LC_SECURITY_PLUG # for SLES10 SP2 # check security plug in sles10 sp2 kernel AC_DEFUN([LC_SECURITY_PLUG], @@ -1878,33 +2400,6 @@ LB_LINUX_TRY_COMPILE([ ]) # -# LC_QUOTA64 -# linux kernel have 64-bit limits support -# -AC_DEFUN([LC_QUOTA64], -[if test x$enable_quota_module = 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],[ - 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 -]) - -# # LC_CONFIGURE # # other configure checks @@ -1995,6 +2490,12 @@ if test x$enable_lu_ref = xyes ; then AC_DEFINE([USE_LU_REF], 1, [enable lu_ref reference tracking code]) fi + #2.6.29 + LC_WRITE_BEGIN_END + LC_D_OBTAIN_ALIAS + LC_BLKDEV_PUT_2ARGS + LC_DENTRY_OPEN_4ARGS + ]) # @@ -2029,23 +2530,25 @@ AC_DEFUN([LC_CONFIG_FILES], lustre/Makefile lustre/autoMakefile lustre/autoconf/Makefile +lustre/conf/Makefile lustre/contrib/Makefile lustre/doc/Makefile lustre/include/Makefile lustre/include/lustre_ver.h lustre/include/linux/Makefile lustre/include/lustre/Makefile -lustre/kernel_patches/targets/2.6-vanilla.target -lustre/kernel_patches/targets/2.6-rhel4.target 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-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/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 @@ -2078,8 +2581,8 @@ lustre/osc/Makefile lustre/osc/autoMakefile lustre/ost/Makefile lustre/ost/autoMakefile -lustre/osd/Makefile -lustre/osd/autoMakefile +lustre/osd-ldiskfs/Makefile +lustre/osd-ldiskfs/autoMakefile lustre/mgc/Makefile lustre/mgc/autoMakefile lustre/mgs/Makefile @@ -2091,15 +2594,10 @@ 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 +lustre/obdclass/darwin/Makefile ]) -case $lb_target_os in - darwin) - AC_CONFIG_FILES([ lustre/obdclass/darwin/Makefile ]) - ;; -esac - ])