X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fautoconf%2Flustre-core.m4;h=d6c78439d833d54587f9976bcbfd5070474a6ea8;hp=c0e3a41f7653099cd5ca52760a48bbdb7e3834fc;hb=dc43a2ce9b00bcb15ddfa4c4358b12bfc5647af0;hpb=6fc61eea18e7fb48734ffef8aee4faa283f05e36 diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index c0e3a41..d6c7843 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -48,260 +48,21 @@ 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_STRUCT_KIOBUF -# -# rh 2.4.18 has iobuf->dovary, but other kernels do not -# -AC_DEFUN([LC_STRUCT_KIOBUF], -[AC_MSG_CHECKING([if struct kiobuf has a dovary field]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct kiobuf iobuf; - iobuf.dovary = 1; -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_KIOBUF_DOVARY, 1, [struct kiobuf has a dovary field]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# -# LC_FUNC_COND_RESCHED -# -# cond_resched() was introduced in 2.4.20 -# -AC_DEFUN([LC_FUNC_COND_RESCHED], -[AC_MSG_CHECKING([if kernel offers cond_resched]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - cond_resched(); -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_COND_RESCHED, 1, [cond_resched found]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# -# LC_FUNC_ZAP_PAGE_RANGE -# -# if zap_page_range() takes a vma arg -# -AC_DEFUN([LC_FUNC_ZAP_PAGE_RANGE], -[AC_MSG_CHECKING([if zap_page_range with vma parameter]) -ZAP_PAGE_RANGE_VMA="`grep -c 'zap_page_range.*struct vm_area_struct' $LINUX/include/linux/mm.h`" -if test "$ZAP_PAGE_RANGE_VMA" != 0 ; then - AC_DEFINE(ZAP_PAGE_RANGE_VMA, 1, [zap_page_range with vma parameter]) - AC_MSG_RESULT([yes]) -else - AC_MSG_RESULT([no]) -fi -]) - -# -# LC_FUNC_PDE -# -# if proc_fs.h defines PDE() -# -AC_DEFUN([LC_FUNC_PDE], -[AC_MSG_CHECKING([if kernel defines PDE]) -HAVE_PDE="`grep -c 'proc_dir_entry..PDE' $LINUX/include/linux/proc_fs.h`" -if test "$HAVE_PDE" != 0 ; then - AC_DEFINE(HAVE_PDE, 1, [the kernel defines PDE]) - 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_FUNC_DIRECT_IO -# -# if direct_IO takes a struct file argument -# -AC_DEFUN([LC_FUNC_DIRECT_IO], -[AC_MSG_CHECKING([if kernel passes struct file to direct_IO]) -HAVE_DIO_FILE="`grep -c 'direct_IO.*struct file' $LINUX/include/linux/fs.h`" -if test "$HAVE_DIO_FILE" != 0 ; then - AC_DEFINE(HAVE_DIO_FILE, 1, [the kernel passes struct file to direct_IO]) - AC_MSG_RESULT(yes) -else - AC_MSG_RESULT(no) -fi -]) - -# -# 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]) +AC_DEFUN([LC_STACK_SIZE], +[AC_MSG_CHECKING([stack size big than 8k]) LB_LINUX_TRY_COMPILE([ - #include + #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]) -LB_LINUX_TRY_COMPILE([ - #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 ]) # @@ -314,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. @@ -322,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.]) ]) ]) @@ -337,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 @@ -395,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 @@ -482,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([ @@ -526,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([ @@ -540,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]) @@ -558,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],[ @@ -577,6 +393,10 @@ AC_DEFUN([LC_XATTR_ACL], []) ]) + +# +# 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([ @@ -594,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]) @@ -624,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" @@ -638,14 +464,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 # @@ -661,6 +479,18 @@ LB_LINUX_CONFIG_IM([CRYPTO_SHA1],[],[ ]) ]) +# +# LC_CONFIG_RMTCLIENT +# +dnl FIXME +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_WARN([Lustre remote client require that CONFIG_CRYPTO_AES is enabled in your kernel.]) +]) +]) + AC_DEFUN([LC_SUNRPC_CACHE], [AC_MSG_CHECKING([if sunrpc struct cache_head uses kref]) LB_LINUX_TRY_COMPILE([ @@ -687,26 +517,24 @@ 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_ARG_ENABLE([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 ]) -m4_pattern_allow(AC_KERBEROS_V5) - # # LC_CONFIG_GSS (default disabled) # @@ -715,161 +543,53 @@ m4_pattern_allow(AC_KERBEROS_V5) # AC_DEFUN([LC_CONFIG_GSS], [AC_MSG_CHECKING([whether to enable gss/krb5 support]) - AC_ARG_ENABLE([gss], + AC_ARG_ENABLE([gss], [AC_HELP_STRING([--enable-gss], [enable gss/krb5 support])], [],[enable_gss='no']) 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.])]) - dnl FIXME - dnl the AES symbol usually tied with arch, e.g. CRYPTO_AES_586 - dnl FIXME - LB_LINUX_CONFIG_IM([CRYPTO_AES],[], - [AC_MSG_WARN([kernel AES support is recommended by using GSS.])]) - - AC_CHECK_LIB([gssapi], [gss_init_sec_context], - [GSSAPI_LIBS="$GSSAPI_LDFLAGS -lgssapi"], - [AC_CHECK_LIB([gssglue], [gss_init_sec_context], - [GSSAPI_LIBS="$GSSAPI_LDFLAGS -lgssglue"], - [AC_MSG_ERROR([libgssapi or libgssglue is not found, which is required by GSS.])])],) - - AC_SUBST(GSSAPI_LIBS) - - 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]) -],[ - 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]) -]) + 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_KERBEROS_V5 + fi ]) -# -# 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]) +# 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_INODE_I_MUTEX # after 2.6.15 inode have i_mutex intead of i_sem AC_DEFUN([LC_INODE_I_MUTEX], -[AC_MSG_CHECKING([use inode have i_mutex ]) +[AC_MSG_CHECKING([if inode has i_mutex ]) LB_LINUX_TRY_COMPILE([ #include #include @@ -883,6 +603,25 @@ LB_LINUX_TRY_COMPILE([ AC_DEFINE(HAVE_INODE_I_MUTEX, 1, [after 2.6.15 inode have i_mutex intead of i_sem]) ],[ + AC_MSG_RESULT(no) +]) +]) + +# LC_SEQ_LOCK +# after 2.6.18 seq_file has lock intead of sem +AC_DEFUN([LC_SEQ_LOCK], +[AC_MSG_CHECKING([if struct seq_file has lock field]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + struct seq_file seq; + + mutex_unlock(&seq.lock); +],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_SEQ_LOCK, 1, + [after 2.6.18 seq_file has lock intead of sem]) +],[ AC_MSG_RESULT(NO) ]) ]) @@ -904,10 +643,10 @@ LB_LINUX_TRY_COMPILE([ AC_DEFINE(HAVE_DQUOTOFF_MUTEX, 1, [after 2.6.17 dquote use mutex instead if semaphore]) ],[ - AC_MSG_RESULT(NO) + AC_MSG_RESULT(no) ]) ]) - + # # LC_STATFS_DENTRY_PARAM # starting from 2.6.18 linux kernel uses dentry instead of @@ -948,10 +687,9 @@ 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]) @@ -964,12 +702,12 @@ LB_LINUX_TRY_COMPILE([ AC_DEFINE(HAVE_INVALIDATEPAGE_RETURN_INT, 1, [Define if return type of invalidatepage should be int]) ],[ - AC_MSG_RESULT(NO) + AC_MSG_RESULT(no) ]) ]) # 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" @@ -993,11 +731,28 @@ LB_LINUX_TRY_COMPILE([ AC_DEFINE(HAVE_UMOUNTBEGIN_VFSMOUNT, 1, [Define umount_begin need second argument]) ],[ - AC_MSG_RESULT(NO) + AC_MSG_RESULT(no) ]) 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], @@ -1006,13 +761,13 @@ LB_LINUX_TRY_COMPILE([ #include ],[ struct inode i; - i.i_blksize = 0; + i.i_blksize = 0; ],[ AC_MSG_RESULT(yes) AC_DEFINE(HAVE_INODE_BLKSIZE, 1, [struct inode has i_blksize field]) ],[ - AC_MSG_RESULT(NO) + AC_MSG_RESULT(no) ]) ]) @@ -1039,44 +794,44 @@ LB_LINUX_TRY_COMPILE([ AC_DEFINE(HAVE_VFS_READDIR_U64_INO, 1, [if vfs_readdir need 64bit inode number]) ],[ - AC_MSG_RESULT(NO) + AC_MSG_RESULT(no) ]) EXTRA_KCFLAGS="$tmp_flags" ]) -# LC_GENERIC_FILE_WRITE -# 2.6.19 introduce do_sync_write instead of -# generic_file_write -AC_DEFUN([LC_GENERIC_FILE_WRITE], -[AC_MSG_CHECKING([use generic_file_write]) +# LC_FILE_WRITEV +# 2.6.19 replaced writev with aio_write +AC_DEFUN([LC_FILE_WRITEV], +[AC_MSG_CHECKING([writev in fops]) LB_LINUX_TRY_COMPILE([ #include ],[ - int result = generic_file_read(NULL, NULL, 0, 0); + struct file_operations *fops = NULL; + fops->writev = NULL; ],[ AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_GENERIC_FILE_WRITE, 1, - [use generic_file_write]) + AC_DEFINE(HAVE_FILE_WRITEV, 1, + [use fops->writev]) ],[ - AC_MSG_RESULT(NO) + AC_MSG_RESULT(no) ]) ]) # LC_GENERIC_FILE_READ -# 2.6.19 need to use do_sync_read instead of -# generic_file_read -AC_DEFUN([LC_GENERIC_FILE_READ], -[AC_MSG_CHECKING([use generic_file_read]) +# 2.6.19 replaced readv with aio_read +AC_DEFUN([LC_FILE_READV], +[AC_MSG_CHECKING([readv in fops]) LB_LINUX_TRY_COMPILE([ #include ],[ - int result = generic_file_read(NULL, NULL, 0, 0); + struct file_operations *fops = NULL; + fops->readv = NULL; ],[ AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_GENERIC_FILE_READ, 1, - [use generic_file_read]) + AC_DEFINE(HAVE_FILE_READV, 1, + [use fops->readv]) ],[ - AC_MSG_RESULT(NO) + AC_MSG_RESULT(no) ]) ]) @@ -1093,25 +848,30 @@ LB_LINUX_TRY_COMPILE([ AC_DEFINE(HAVE_NR_PAGECACHE, 1, [is kernel export nr_pagecache]) ],[ - AC_MSG_RESULT(NO) + AC_MSG_RESULT(no) ]) ]) # LC_CANCEL_DIRTY_PAGE -# 2.6.20 introduse cancel_dirty_page instead of +# 2.6.20 introduse 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 ],[ + /* 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) 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) ]) ]) @@ -1125,6 +885,7 @@ LB_LINUX_TRY_COMPILE([ AC_DEFUN([LC_PAGE_CONSTANT], [AC_MSG_CHECKING([if kernel have PageConstant defined]) LB_LINUX_TRY_COMPILE([ + #include #include ],[ #ifndef PG_constant @@ -1138,11 +899,11 @@ 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([ + #include #include ],[ #ifndef PG_fs_misc @@ -1153,7 +914,7 @@ LB_LINUX_TRY_COMPILE([ AC_DEFINE(HAVE_PG_FS_MISC, 1, [is kernel have PG_fs_misc]) ],[ - AC_MSG_RESULT(NO) + AC_MSG_RESULT(no) ]) ]) @@ -1161,6 +922,7 @@ LB_LINUX_TRY_COMPILE([ AC_DEFUN([LC_PAGE_CHECKED], [AC_MSG_CHECKING([kernel has PageChecked and SetPageChecked]) LB_LINUX_TRY_COMPILE([ + #include #include ],[ #ifndef PageChecked @@ -1174,7 +936,7 @@ LB_LINUX_TRY_COMPILE([ AC_DEFINE(HAVE_PAGE_CHECKED, 1, [does kernel have PageChecked and SetPageChecked]) ],[ - AC_MSG_RESULT(NO) + AC_MSG_RESULT(no) ]) ]) @@ -1187,6 +949,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],[ @@ -1223,6 +994,38 @@ AC_DEFINE(HAVE___D_MOVE, 1, ]) ]) +# +# LC_EXPORT_INVALIDATE_MAPPING_PAGES +# +# SLES9, RHEL4, RHEL5, vanilla 2.6.24 export invalidate_mapping_pages() but +# SLES10 2.6.16 does not, for some reason. For filter cache invalidation. +# +AC_DEFUN([LC_EXPORT_INVALIDATE_MAPPING_PAGES], + [LB_CHECK_SYMBOL_EXPORT([invalidate_mapping_pages], [mm/truncate.c], [ + AC_DEFINE(HAVE_INVALIDATE_MAPPING_PAGES, 1, + [exported invalidate_mapping_pages])], + [LB_CHECK_SYMBOL_EXPORT([invalidate_inode_pages], [mm/truncate.c], [ + AC_DEFINE(HAVE_INVALIDATE_INODE_PAGES, 1, + [exported invalidate_inode_pages])], [ + AC_MSG_ERROR([no way to invalidate pages]) + ]) + ],[]) +]) + +# +# LC_EXPORT_FILEMAP_FDATASYNC_RANGE +# +# No standard kernels export this +# +AC_DEFUN([LC_EXPORT_FILEMAP_FDATAWRITE_RANGE], +[LB_CHECK_SYMBOL_EXPORT([filemap_fdatawrite_range], +[mm/filemap.c],[ +AC_DEFINE(HAVE_FILEMAP_FDATAWRITE_RANGE, 1, + [filemap_fdatawrite_range is exported by the kernel]) +],[ +]) +]) + # The actual symbol exported varies among architectures, so we need # to check many symbols (but only in the current architecture.) No # matter what symbol is exported, the kernel #defines node_to_cpumask @@ -1270,7 +1073,7 @@ LB_LINUX_TRY_COMPILE([ int i = unregister_blkdev(0,NULL); ],[ AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_UNREGISTER_BLKDEV_RETURN_INT, 1, + AC_DEFINE(HAVE_UNREGISTER_BLKDEV_RETURN_INT, 1, [unregister_blkdev return int]) ],[ AC_MSG_RESULT([no]) @@ -1359,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], @@ -1383,13 +1206,13 @@ EXTRA_KCFLAGS="$tmp_flags" AC_DEFUN([LC_CONST_ACL_SIZE], [AC_MSG_CHECKING([calc acl size]) tmp_flags="$CFLAGS" -CFLAGS="$CFLAGS -I $LINUX_OBJ/include $EXTRA_KCFLAGS" +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 +// block include #define __LINUX_POSIX_ACL_H # ifdef CONFIG_FS_POSIX_ACL @@ -1426,14 +1249,16 @@ CFLAGS="$tmp_flags" ]) # -# check for crypto API +# 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 ],[ - 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]) @@ -1443,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]) @@ -1460,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 @@ -1468,38 +1421,29 @@ AC_DEFUN([LC_PROG_LINUX], [LC_LUSTRE_VERSION_H if test x$enable_server = xyes ; then AC_DEFINE(HAVE_SERVER_SUPPORT, 1, [support server]) + LC_FUNC_DEV_SET_RDONLY + LC_STACK_SIZE LC_CONFIG_BACKINGFS fi LC_CONFIG_PINGER LC_CONFIG_CHECKSUM LC_CONFIG_LIBLUSTRE_RECOVERY - LC_CONFIG_QUOTA LC_CONFIG_HEALTH_CHECK_WRITE 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_STRUCT_KIOBUF - LC_FUNC_COND_RESCHED - LC_FUNC_ZAP_PAGE_RANGE - LC_FUNC_PDE - LC_FUNC_DIRECT_IO - 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 @@ -1510,8 +1454,8 @@ AC_DEFUN([LC_PROG_LINUX], LC_STRUCT_INTENT_FILE - LC_FUNC_SET_FS_PWD LC_CAPA_CRYPTO + LC_CONFIG_RMTCLIENT LC_CONFIG_GSS LC_FUNC_MS_FLOCK_LOCK LC_FUNC_HAVE_CAN_SLEEP_ARG @@ -1520,6 +1464,9 @@ AC_DEFUN([LC_PROG_LINUX], LC_COOKIE_FOLLOW_LINK 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 @@ -1530,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 @@ -1538,7 +1486,9 @@ AC_DEFUN([LC_PROG_LINUX], LC_SECURITY_PLUG # for SLES10 SP2 # 2.6.17 + LC_INODE_IPRIVATE LC_DQUOTOFF_MUTEX + LC_VFS_RENAME_MUTEX # 2.6.18 LC_NR_PAGECACHE @@ -1546,6 +1496,11 @@ AC_DEFUN([LC_PROG_LINUX], LC_VFS_KERN_MOUNT LC_INVALIDATEPAGE_RETURN_INT LC_UMOUNTBEGIN_HAS_VFSMOUNT + LC_SEQ_LOCK + LC_EXPORT_FILEMAP_FDATAWRITE_RANGE + if test x$enable_server = xyes ; then + LC_EXPORT_INVALIDATE_MAPPING_PAGES + fi #2.6.18 + RHEL5 (fc6) LC_PG_FS_MISC @@ -1554,18 +1509,20 @@ AC_DEFUN([LC_PROG_LINUX], # 2.6.19 LC_INODE_BLKSIZE LC_VFS_READDIR_U64_INO - LC_GENERIC_FILE_READ - LC_GENERIC_FILE_WRITE + LC_FILE_WRITEV + LC_FILE_READV # 2.6.20 LC_CANCEL_DIRTY_PAGE # raid5-zerocopy patch LC_PAGE_CONSTANT - + # 2.6.22 LC_INVALIDATE_BDEV_2ARG LC_ASYNC_BLOCK_CIPHER + LC_STRUCT_HASH_DESC + LC_STRUCT_BLKCIPHER_DESC LC_FS_RENAME_DOES_D_MOVE # 2.6.23 LC_UNREGISTER_BLKDEV_RETURN_INT @@ -1628,12 +1585,52 @@ if test x$enable_liblustre_acl = xyes ; then AC_DEFINE(LIBLUSTRE_POSIX_ACL, 1, Liblustre Support ACL-enabled MDS) fi -AC_MSG_CHECKING([whether to build mpitests]) -AC_ARG_ENABLE([mpitests], - AC_HELP_STRING([--enable-mpitests], - [build liblustre mpi tests]), - [],[enable_mpitests=no]) -AC_MSG_RESULT([$enable_mpitests]) +# +# --enable-mpitest +# +AC_ARG_ENABLE(mpitests, + AC_HELP_STRING([--enable-mpitests=yes|no|mpicc wrapper], + [include mpi tests]), + [ + enable_mpitests=yes + case $enableval in + yes) + MPICC_WRAPPER=mpicc + ;; + no) + enable_mpitests=no + ;; + *) + MPICC_WRAPPER=$enableval + ;; + esac + ], + [ + MPICC_WRAPPER=mpicc + enable_mpitests=yes + ] +) + +if test x$enable_mpitests != xno; then + 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_SUBST(MPICC_WRAPPER) AC_MSG_NOTICE([Enabling Lustre configure options for libsysio]) ac_configure_args="$ac_configure_args --with-lustre-hack --with-sockets" @@ -1644,7 +1641,7 @@ LC_CONFIG_LIBLUSTRE_RECOVERY AC_DEFUN([LC_CONFIG_LRU_RESIZE], [AC_MSG_CHECKING([whether to enable lru self-adjusting]) -AC_ARG_ENABLE([lru_resize], +AC_ARG_ENABLE([lru_resize], AC_HELP_STRING([--enable-lru-resize], [enable lru resize support]), [],[enable_lru_resize='yes']) @@ -1657,52 +1654,37 @@ fi # # LC_CONFIG_QUOTA # -# whether to enable quota support +# whether to enable quota support global control # AC_DEFUN([LC_CONFIG_QUOTA], -[AC_ARG_ENABLE([quota], +[AC_ARG_ENABLE([quota], AC_HELP_STRING([--enable-quota], [enable quota support]), - [],[enable_quota='default']) -if test x$linux25 != xyes; then - enable_quota='no' -fi -LB_LINUX_CONFIG([QUOTA],[ - if test x$enable_quota = xdefault; then - enable_quota='yes' - fi -],[ - if test x$enable_quota = xdefault; then - enable_quota='no' - AC_MSG_WARN([quota is not enabled because the kernel lacks quota support]) - else - if test x$enable_quota = xyes; then - AC_MSG_ERROR([cannot enable quota because the kernel lacks quota support]) - fi - fi + [],[enable_quota='yes']) ]) -if test x$enable_quota != xno; then + +# 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 ]) -# -# LC_CONFIG_SPLIT -# -# whether to enable split support -# -AC_DEFUN([LC_CONFIG_SPLIT], -[AC_MSG_CHECKING([whether to enable split support]) -AC_ARG_ENABLE([split], - AC_HELP_STRING([--enable-split], - [enable split support]), - [],[enable_split='no']) -AC_MSG_RESULT([$enable_split]) -if test x$enable_split != xno; then - AC_DEFINE(HAVE_SPLIT_SUPPORT, 1, [enable split support]) -fi +AC_DEFUN([LC_QUOTA], +[#check global +LC_CONFIG_QUOTA +#check for utils +AC_CHECK_HEADER(sys/quota.h, + [AC_DEFINE(HAVE_SYS_QUOTA_H, 1, [Define to 1 if you have .])], + [AC_MSG_ERROR([don't find in your system])]) ]) - + AC_DEFUN([LC_QUOTA_READ], [AC_MSG_CHECKING([if kernel supports quota_read]) LB_LINUX_TRY_COMPILE([ @@ -1719,6 +1701,23 @@ LB_LINUX_TRY_COMPILE([ ]) # +# LC_CONFIG_SPLIT +# +# whether to enable split support +# +AC_DEFUN([LC_CONFIG_SPLIT], +[AC_MSG_CHECKING([whether to enable split support]) +AC_ARG_ENABLE([split], + AC_HELP_STRING([--enable-split], + [enable split support]), + [],[enable_split='no']) +AC_MSG_RESULT([$enable_split]) +if test x$enable_split != xno; then + AC_DEFINE(HAVE_SPLIT_SUPPORT, 1, [enable split support]) +fi +]) + +# # LC_COOKIE_FOLLOW_LINK # # kernel 2.6.13+ ->follow_link returns a cookie @@ -1745,7 +1744,7 @@ LB_LINUX_TRY_COMPILE([ # # LC_FUNC_RCU # -# kernels prior than 2.6.0(?) have no RCU supported; in kernel 2.6.5(SUSE), +# 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], @@ -1766,15 +1765,40 @@ LB_LINUX_TRY_COMPILE([ 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_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]) + ],[ + 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 +# 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([ @@ -1790,7 +1814,7 @@ LB_LINUX_TRY_COMPILE([ AC_DEFINE(HAVE_SECURITY_PLUG, 1, [SLES10 SP2 use extra parameter in vfs]) ],[ - AC_MSG_RESULT(NO) + AC_MSG_RESULT(no) ]) ]) @@ -1821,6 +1845,35 @@ LB_LINUX_TRY_COMPILE([ ]) # +# LC_NETLINK +# +# 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 + ],[ + nlmsg_new(100, GFP_KERNEL); + ],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_NETLINK_NL2, 1, [nlmsg_new takes 2 args]) + ],[ + AC_MSG_RESULT([no]) + ]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# # LC_CONFIGURE # # other configure checks @@ -1828,6 +1881,10 @@ LB_LINUX_TRY_COMPILE([ AC_DEFUN([LC_CONFIGURE], [LC_CONFIG_OBD_BUFFER_SIZE +if test $target_cpu == "i686" -o $target_cpu == "x86_64"; then + CFLAGS="$CFLAGS -Werror" +fi + # include/liblustre.h AC_CHECK_HEADERS([sys/user.h sys/vfs.h stdint.h blkid/blkid.h]) @@ -1887,6 +1944,26 @@ if test x$enable_fail_alloc != xno ; then AC_DEFINE([RANDOM_FAIL_ALLOC], 1, [enable randomly alloc failure]) fi +AC_ARG_ENABLE([invariants], + AC_HELP_STRING([--enable-invariants], + [enable invariant checking (cpu intensive)]), + [],[]) +AC_MSG_CHECKING([whether to check invariants (expensive cpu-wise)]) +AC_MSG_RESULT([$enable_invariants]) +if test x$enable_invariants = xyes ; then + AC_DEFINE([INVARIANT_CHECK], 1, [enable invariant checking]) +fi + +AC_ARG_ENABLE([lu_ref], + AC_HELP_STRING([--enable-lu_ref], + [enable lu_ref reference tracking code]), + [],[]) +AC_MSG_CHECKING([whether to track references with lu_ref]) +AC_MSG_RESULT([$enable_lu_ref]) +if test x$enable_lu_ref = xyes ; then + AC_DEFINE([USE_LU_REF], 1, [enable lu_ref reference tracking code]) +fi + ]) # @@ -1901,7 +1978,7 @@ 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 = 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) @@ -1933,13 +2010,16 @@ 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 lustre/lov/Makefile lustre/lov/autoMakefile lustre/lvfs/Makefile @@ -1982,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 ])