X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fautoconf%2Flustre-core.m4;h=0da0cccb46f27ef0ceb3948709ba197abad62abf;hp=dae4f44c1aa2b1fac792ca59bdee03b3c22d5b1f;hb=ed19570f0ebf8968cedda1756ffbb87d30aa9613;hpb=89f9a5bced24ecb7c84040a1ed88dcef4384f7c6 diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index dae4f44..0da0ccc 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -1,3 +1,4 @@ +#* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- # # LC_CONFIG_SRCDIR # @@ -26,9 +27,6 @@ AC_SUBST(demodir) pkgexampledir='${pkgdatadir}/examples' AC_SUBST(pkgexampledir) - -pymoddir='${pkglibdir}/python/Lustre' -AC_SUBST(pymoddir) ]) # @@ -38,7 +36,7 @@ AC_SUBST(pymoddir) # AC_DEFUN([LC_TARGET_SUPPORTED], [case $target_os in - linux*) + linux* | darwin*) $1 ;; *) @@ -65,7 +63,7 @@ LB_LINUX_CONFIG([EXT3_FS_XATTR],[$1],[$3]) # If we have (and can build) fshooks.h # AC_DEFUN([LC_FSHOOKS], -[AC_CHECK_FILE([$LINUX/include/linux/fshooks.h],[ +[LB_CHECK_FILE([$LINUX/include/linux/fshooks.h],[ AC_MSG_CHECKING([if fshooks.h can be compiled]) LB_LINUX_TRY_COMPILE([ #include @@ -128,7 +126,7 @@ LB_LINUX_TRY_COMPILE([ # if zap_page_range() takes a vma arg # AC_DEFUN([LC_FUNC_ZAP_PAGE_RANGE], -[AC_MSG_CHECKING([if zap_pag_range with vma parameter]) +[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]) @@ -155,6 +153,25 @@ 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 @@ -216,23 +233,83 @@ LB_LINUX_TRY_COMPILE([ ]) # +# LC_FUNC_REGISTER_CACHE +# +# if register_cache() is defined by kernel +# +AC_DEFUN([LC_FUNC_REGISTER_CACHE], +[AC_MSG_CHECKING([if kernel defines register_cache()]) +LB_LINUX_TRY_COMPILE([ + #include + #include +],[ + struct cache_definition cache; +],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_REGISTER_CACHE, 1, [register_cache found]) + AC_MSG_CHECKING([if kernel expects return from cache shrink function]) + HAVE_CACHE_RETURN_INT="`grep -c 'int.*shrink' $LINUX/include/linux/cache_def.h`" + if test "$HAVE_CACHE_RETURN_INT" != 0 ; then + AC_DEFINE(HAVE_CACHE_RETURN_INT, 1, [kernel expects return from shrink_cache]) + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + fi +],[ + AC_MSG_RESULT([no]) +]) +]) + +# +# LC_FUNC_GRAB_CACHE_PAGE_NOWAIT_GFP +# +# check for our patched grab_cache_page_nowait_gfp() function +# +AC_DEFUN([LC_FUNC_GRAB_CACHE_PAGE_NOWAIT_GFP], +[AC_MSG_CHECKING([if kernel defines grab_cache_page_nowait_gfp()]) +HAVE_GCPN_GFP="`grep -c 'grab_cache_page_nowait_gfp' $LINUX/include/linux/pagemap.h`" +if test "$HAVE_GCPN_GFP" != 0 ; then + AC_DEFINE(HAVE_GRAB_CACHE_PAGE_NOWAIT_GFP, 1, + [kernel has grab_cache_page_nowait_gfp()]) + AC_MSG_RESULT(yes) +else + AC_MSG_RESULT(no) +fi +]) + +# +# LC_FUNC_DEV_SET_RDONLY +# +# check for the old-style dev_set_rdonly which took an extra "devno" param +# and can only set a single device to discard writes at one time +# +AC_DEFUN([LC_FUNC_DEV_SET_RDONLY], +[AC_MSG_CHECKING([if kernel has new dev_set_rdonly]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + #ifndef HAVE_CLEAR_RDONLY_ON_PUT + #error needs to be patched by lustre kernel patches from Lustre version 1.4.3 or above. + #endif +],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_DEV_SET_RDONLY, 1, [kernel has new dev_set_rdonly]) +],[ + AC_MSG_RESULT([no, Linux kernel source needs to be patches by lustre +kernel patches from Lustre version 1.4.3 or above.]) +]) +]) + +# # LC_CONFIG_BACKINGFS # -# whether to use extN or ldiskfs instead of ext3 +# whether to use ldiskfs instead of ext3 # AC_DEFUN([LC_CONFIG_BACKINGFS], [ BACKINGFS='ext3' -# LLNL patches their ext3 and calls it extN -AC_MSG_CHECKING([whether to use extN]) -AC_ARG_ENABLE([extN], - AC_HELP_STRING([--enable-extN], - [use extN instead of ext3 for lustre backend]), - [BACKINGFS='extN'],[enable_extN='no']) -AC_MSG_RESULT([$enable_extN]) - -# SuSE gets ldiskfs +# 2.6 gets ldiskfs AC_MSG_CHECKING([whether to enable ldiskfs]) AC_ARG_ENABLE([ldiskfs], AC_HELP_STRING([--enable-ldiskfs], @@ -243,8 +320,19 @@ AC_MSG_RESULT([$enable_ldiskfs]) if test x$enable_ldiskfs = xyes ; then BACKINGFS="ldiskfs" + AC_MSG_CHECKING([whether to enable quilt for making ldiskfs]) + AC_ARG_ENABLE([quilt], + AC_HELP_STRING([--disable-quilt],[disable use of quilt for ldiskfs]), + [],[enable_quilt='yes']) + AC_MSG_RESULT([$enable_quilt]) + AC_PATH_PROG(PATCH, patch, [no]) - AC_PATH_PROG(QUILT, quilt, [no]) + + if test x$enable_quilt = xno ; then + QUILT="no" + else + AC_PATH_PROG(QUILT, quilt, [no]) + fi if test x$enable_ldiskfs$PATCH$QUILT = xyesnono ; then AC_MSG_ERROR([Quilt or patch are needed to build the ldiskfs module (for Linux 2.6)]) @@ -266,15 +354,24 @@ case $BACKINGFS in LC_CONFIG_EXT3([],[ AC_MSG_ERROR([Lustre requires that ext3 is enabled in the kernel]) ],[ - AC_MSG_ERROR([Lustre requires that extended attributes for ext3 are 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.]) ]) ;; ldiskfs) - LC_FSHOOKS([ - LDISKFS_SERIES="2.6-suse.series" - ],[ - LDISKFS_SERIES="2.6-vanilla.series" - ]) + AC_MSG_CHECKING([which ldiskfs series to use]) + case $LINUXRELEASE in + 2.6.5*) LDISKFS_SERIES="2.6-suse.series" ;; + 2.6.9*) LDISKFS_SERIES="2.6-rhel4.series" ;; + 2.6.10-ac*) LDISKFS_SERIES="2.6-fc3.series" ;; + 2.6.10*) LDISKFS_SERIES="2.6-rhel4.series" ;; + 2.6.12*) LDISKFS_SERIES="2.6.12-vanilla.series" ;; + 2.6.15*) LDISKFS_SERIES="2.6-fc5.series";; + 2.6.16*) LDISKFS_SERIES="2.6-sles10.series";; + 2.6.18*) LDISKFS_SERIES="2.6.18-vanilla.series";; + *) AC_MSG_WARN([Unknown kernel version $LINUXRELEASE, fix lustre/autoconf/lustre-core.m4]) + esac + AC_MSG_RESULT([$LDISKFS_SERIES]) AC_SUBST(LDISKFS_SERIES) ;; esac # $BACKINGFS @@ -298,6 +395,21 @@ fi ]) # +# LC_CONFIG_LIBLUSTRE_RECOVERY +# +AC_DEFUN([LC_CONFIG_LIBLUSTRE_RECOVERY], +[AC_MSG_CHECKING([whether to enable liblustre recovery support]) +AC_ARG_ENABLE([liblustre-recovery], + AC_HELP_STRING([--disable-liblustre-recovery], + [disable liblustre recovery support]), + [],[enable_liblustre_recovery='yes']) +AC_MSG_RESULT([$enable_liblustre_recovery]) +if test x$enable_liblustre_recovery != xno ; then + AC_DEFINE(ENABLE_LIBLUSTRE_RECOVERY, 1, Liblustre Can Recover) +fi +]) + +# # LC_CONFIG_OBD_BUFFER_SIZE # # the maximum buffer size of lctl ioctls @@ -317,62 +429,580 @@ AC_DEFINE_UNQUOTED(OBD_MAX_IOCTL_BUFFER, $OBD_BUFFER_SIZE, [IOCTL Buffer Size]) ]) # -# LC_CONFIG_GSS +# LC_STRUCT_STATFS # -# whether build-in gss/krb5 capability +# AIX does not have statfs.f_namelen # -AC_DEFUN([LC_CONFIG_GSS], -[AC_MSG_CHECKING([whether to enable gss/krb5 support]) -AC_ARG_ENABLE([gss], - AC_HELP_STRING([--enable-gss], - [enable gss/krb5 support]), - [],[enable_gss='yes']) -AC_MSG_RESULT([$enable_gss]) -if test x$enable_gss != xno ; then - AC_DEFINE(ENABLE_GSS, 1, Support GSS/krb5) -fi +AC_DEFUN([LC_STRUCT_STATFS], +[AC_MSG_CHECKING([if struct statfs has a f_namelen field]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + struct statfs sfs; + sfs.f_namelen = 1; +],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_STATFS_NAMELEN, 1, [struct statfs has a namelen field]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +AC_DEFUN([LC_FUNC_PAGE_MAPPED], +[AC_MSG_CHECKING([if kernel offers page_mapped]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + page_mapped(NULL); +],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_PAGE_MAPPED, 1, [page_mapped found]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +AC_DEFUN([LC_STRUCT_FILE_OPS_UNLOCKED_IOCTL], +[AC_MSG_CHECKING([if struct file_operations has an unlocked_ioctl field]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + struct file_operations fops; + &fops.unlocked_ioctl; +],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_UNLOCKED_IOCTL, 1, [struct file_operations has an unlock ed_ioctl field]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +AC_DEFUN([LC_FILEMAP_POPULATE], +[AC_MSG_CHECKING([for exported filemap_populate]) +LB_LINUX_TRY_COMPILE([ + #include + #include +],[ + filemap_populate(NULL, 0, 0, __pgprot(0), 0, 0); +],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_FILEMAP_POPULATE, 1, [Kernel exports filemap_populate]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +AC_DEFUN([LC_D_ADD_UNIQUE], +[AC_MSG_CHECKING([for d_add_unique]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + d_add_unique(NULL, NULL); +],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_D_ADD_UNIQUE, 1, [Kernel has d_add_unique]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +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]) + LB_LINUX_TRY_COMPILE([ + #include + #include + #include + ],[],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_BIT_SPINLOCK_H, 1, [Kernel has bit_spinlock.h]) + ],[ + AC_MSG_RESULT([no]) + ]) +], +[]) +]) + +# +# LC_POSIX_ACL_XATTR +# +# If we have xattr_acl.h +# +AC_DEFUN([LC_XATTR_ACL], +[LB_CHECK_FILE([$LINUX/include/linux/xattr_acl.h],[ + AC_MSG_CHECKING([if xattr_acl.h can be compiled]) + LB_LINUX_TRY_COMPILE([ + #include + ],[],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_XATTR_ACL, 1, [Kernel has xattr_acl]) + ],[ + AC_MSG_RESULT([no]) + ]) +], +[]) +]) + +AC_DEFUN([LC_STRUCT_INTENT_FILE], +[AC_MSG_CHECKING([if struct open_intent has a file field]) +LB_LINUX_TRY_COMPILE([ + #include + #include +],[ + struct open_intent intent; + &intent.file; +],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_FILE_IN_STRUCT_INTENT, 1, [struct open_intent has a file field]) +],[ + AC_MSG_RESULT([no]) +]) +]) + + +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 + ],[],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_LINUX_POSIX_ACL_XATTR_H, 1, [linux/posix_acl_xattr.h found]) + + ],[ + AC_MSG_RESULT([no]) + ]) +$1 +],[ +AC_MSG_RESULT([no]) +]) +]) + +AC_DEFUN([LC_LUSTRE_VERSION_H], +[LB_CHECK_FILE([$LINUX/include/linux/lustre_version.h],[ + rm -f "$LUSTRE/include/linux/lustre_version.h" +],[ + touch "$LUSTRE/include/linux/lustre_version.h" + if test x$enable_server = xyes ; then + AC_MSG_WARN([Unpatched kernel detected.]) + AC_MSG_WARN([Lustre servers cannot be built with an unpatched kernel;]) + AC_MSG_WARN([disabling server build]) + enable_server='no' + fi +]) +]) + +AC_DEFUN([LC_FUNC_SET_FS_PWD], +[AC_MSG_CHECKING([if kernel exports show_task]) +have_show_task=0 + if grep -q "EXPORT_SYMBOL(show_task)" \ + "$LINUX/fs/namespace.c" 2>/dev/null ; then + AC_DEFINE(HAVE_SET_FS_PWD, 1, [set_fs_pwd is exported]) + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + 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_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_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_CONFIG_SNAPFS +# LC_FUNC_F_OP_FLOCK # -# Whether snapfs is desired +# rhel4.2 kernel has f_op->flock field # -AC_DEFUN([LC_CONFIG_SNAPFS], -[# snap compilation -AC_MSG_CHECKING([whether to enable snapfs support]) -AC_ARG_ENABLE([snapfs], - AC_HELP_STRING([--enable-snapfs], - [build snapfs]), - [],[enable_snapfs='no']) -AC_MSG_RESULT([$enable_snapfs]) +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([use inode have i_mutex ]) +LB_LINUX_TRY_COMPILE([ + #include + #include +],[ + 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_DQUOTOFF_MUTEX +# after 2.6.17 dquote use mutex instead if semaphore +AC_DEFUN([LC_DQUOTOFF_MUTEX], +[AC_MSG_CHECKING([use dqonoff_mutex]) +LB_LINUX_TRY_COMPILE([ + #include + #include + #include +],[ + struct quota_info dq; + + mutex_unlock(&dq.dqonoff_mutex); +],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_DQUOTOFF_MUTEX, 1, + [after 2.6.17 dquote use mutex instead if semaphore]) +],[ + AC_MSG_RESULT(NO) +]) ]) # -# LC_CONFIG_SMFS +# LC_STATFS_DENTRY_PARAM +# starting from 2.6.18 linux kernel uses dentry instead of +# super_block for first vfs_statfs argument +# +AC_DEFUN([LC_STATFS_DENTRY_PARAM], +[AC_MSG_CHECKING([first vfs_statfs parameter is dentry]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + int vfs_statfs(struct dentry *, struct kstatfs *); +],[ + AC_DEFINE(HAVE_STATFS_DENTRY_PARAM, 1, + [first parameter of vfs_statfs is dentry]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) +]) + # -# whether smfs is desired +# LC_VFS_KERN_MOUNT +# starting from 2.6.18 kernel don`t export do_kern_mount +# and want to use vfs_kern_mount instead. # -AC_DEFUN([LC_CONFIG_SMFS], -[AC_MSG_CHECKING([whether to enable smfs support]) -AC_ARG_ENABLE([smfs], - AC_HELP_STRING([--enable-smfs], - [build smfs]), - [],[enable_smfs='no']) -AC_MSG_RESULT([$enable_smfs]) +AC_DEFUN([LC_VFS_KERN_MOUNT], +[AC_MSG_CHECKING([vfs_kern_mount exist in kernel]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + vfs_kern_mount(NULL, 0, NULL, NULL); +],[ + AC_DEFINE(HAVE_VFS_KERN_MOUNT, 1, + [vfs_kern_mount exist in kernel]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) ]) +# +# LC_INVALIDATEPAGE_RETURN_INT +# more 2.6 api changes. return type for the invalidatepage +# address_space_operation is 'void' in new kernels but 'int' in old +# +AC_DEFUN([LC_INVALIDATEPAGE_RETURN_INT], +[AC_MSG_CHECKING([invalidatepage has return int]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + int rc = block_invalidatepage(NULL, 0); +],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_INVALIDATEPAGE_RETURN_INT, 1, + [Define if return type of invalidatepage should be int]) +],[ + AC_MSG_RESULT(NO) +]) +]) + +# LC_UMOUNTBEGIN_HAS_VFSMOUNT +# more 2.6 API changes. 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" +EXTRA_KCFLAGS="-Werror" +LB_LINUX_TRY_COMPILE([ + #include + + struct vfsmount; + static void cfg_umount_begin (struct vfsmount *v, int flags) + { + ; + } + + static struct super_operations cfg_super_operations = { + .umount_begin = cfg_umount_begin, + }; +],[ + cfg_super_operations.umount_begin(NULL,0); +],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_UMOUNTBEGIN_VFSMOUNT, 1, + [Define umount_begin need second argument]) +],[ + AC_MSG_RESULT(NO) +]) +EXTRA_KCFLAGS="$tmp_flags" +]) + +# 2.6.19 API changes +# inode don`t have i_blksize field +AC_DEFUN([LC_INODE_BLKSIZE], +[AC_MSG_CHECKING([inode has i_blksize field]) +LB_LINUX_TRY_COMPILE([ +#include +],[ + struct inode i; + i.i_blksize = 0; +],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_INODE_BLKSIZE, 1, + [struct inode has i_blksize field]) +],[ + AC_MSG_RESULT(NO) +]) +]) + +# LC_VFS_READDIR_U64_INO +# 2.6.19 use u64 for inode number instead of inode_t +AC_DEFUN([LC_VFS_READDIR_U64_INO], +[AC_MSG_CHECKING([check vfs_readdir need 64bit inode number]) +tmp_flags="$EXTRA_KCFLAGS" +EXTRA_KCFLAGS="-Werror" +LB_LINUX_TRY_COMPILE([ +#include + int fillonedir(void * __buf, const char * name, int namlen, loff_t offset, + u64 ino, unsigned int d_type) + { + return 0; + } +],[ + filldir_t filter; + + filter = fillonedir; + return 1; +],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_VFS_READDIR_U64_INO, 1, + [if vfs_readdir need 64bit inode number]) +],[ + AC_MSG_RESULT(NO) +]) +EXTRA_KCFLAGS="$tmp_flags" +]) + +# 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]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + int result = generic_file_read(NULL, NULL, 0, 0); +],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_GENERIC_FILE_WRITE, 1, + [use generic_file_write]) +],[ + 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]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + int result = generic_file_read(NULL, NULL, 0, 0); +],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_GENERIC_FILE_READ, 1, + [use generic_file_read]) +],[ + AC_MSG_RESULT(NO) +]) +]) + +# LC_NR_PAGECACHE +# 2.6.18 don`t export nr_pagecahe +AC_DEFUN([LC_NR_PAGECACHE], +[AC_MSG_CHECKING([kernel export nr_pagecache]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + return atomic_read(&nr_pagecache); +],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_NR_PAGECACHE, 1, + [is kernel export nr_pagecache]) +],[ + AC_MSG_RESULT(NO) +]) +]) + + # # LC_PROG_LINUX # # Lustre linux kernel checks # AC_DEFUN([LC_PROG_LINUX], -[LC_CONFIG_BACKINGFS +[ LC_LUSTRE_VERSION_H +if test x$enable_server = xyes ; then + LC_CONFIG_BACKINGFS +fi LC_CONFIG_PINGER -LC_CONFIG_GSS -LC_CONFIG_SNAPFS -LC_CONFIG_SMFS +LC_CONFIG_LIBLUSTRE_RECOVERY +LC_CONFIG_QUOTA + +LC_TASK_PPTR LC_STRUCT_KIOBUF LC_FUNC_COND_RESCHED @@ -381,9 +1011,67 @@ LC_FUNC_PDE LC_FUNC_DIRECT_IO LC_HEADER_MM_INLINE LC_STRUCT_INODE +LC_FUNC_REGISTER_CACHE +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 +LC_XATTR_ACL +LC_STRUCT_INTENT_FILE +LC_POSIX_ACL_XATTR_H +LC_FUNC_SET_FS_PWD +LC_FUNC_MS_FLOCK_LOCK +LC_FUNC_HAVE_CAN_SLEEP_ARG +LC_FUNC_F_OP_FLOCK +LC_QUOTA_READ +LC_COOKIE_FOLLOW_LINK + +# 2.6.15 +LC_INODE_I_MUTEX + +# 2.6.17 +LC_DQUOTOFF_MUTEX + +# 2.6.18 +LC_NR_PAGECACHE +LC_STATFS_DENTRY_PARAM +LC_VFS_KERN_MOUNT +LC_INVALIDATEPAGE_RETURN_INT +LC_UMOUNTBEGIN_HAS_VFSMOUNT + +# 2.6.19 +LC_INODE_BLKSIZE +LC_VFS_READDIR_U64_INO +LC_GENERIC_FILE_READ +LC_GENERIC_FILE_WRITE ]) # +# LC_CONFIG_CLIENT_SERVER +# +# Build client/server sides of Lustre +# +AC_DEFUN([LC_CONFIG_CLIENT_SERVER], +[AC_MSG_CHECKING([whether to build Lustre server support]) +AC_ARG_ENABLE([server], + AC_HELP_STRING([--disable-server], + [disable Lustre server support]), + [],[enable_server='yes']) +AC_MSG_RESULT([$enable_server]) + +AC_MSG_CHECKING([whether to build Lustre client support]) +AC_ARG_ENABLE([client], + AC_HELP_STRING([--disable-client], + [disable Lustre client support]), + [],[enable_client='yes']) +AC_MSG_RESULT([$enable_client])]) + +# # LC_CONFIG_LIBLUSTRE # # whether to build liblustre @@ -398,12 +1086,88 @@ AC_MSG_RESULT([$enable_liblustre]) # only build sysio if liblustre is built with_sysio="$enable_liblustre" +AC_MSG_CHECKING([whether to build liblustre tests]) +AC_ARG_ENABLE([liblustre-tests], + AC_HELP_STRING([--enable-liblustre-tests], + [enable liblustre tests, if --disable-tests is used]), + [],[enable_liblustre_tests=$enable_tests]) +if test x$enable_liblustre != xyes ; then + enable_liblustre_tests='no' +fi +AC_MSG_RESULT([$enable_liblustre_tests]) + 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]) + +AC_MSG_NOTICE([Enabling Lustre configure options for libsysio]) +ac_configure_args="$ac_configure_args --with-lustre-hack --with-sockets" + +LC_CONFIG_PINGER +LC_CONFIG_LIBLUSTRE_RECOVERY +]) + +# +# LC_CONFIG_QUOTA +# +# whether to enable quota support +# +AC_DEFUN([LC_CONFIG_QUOTA], +[AC_MSG_CHECKING([whether to enable quota support]) +AC_ARG_ENABLE([quota], + AC_HELP_STRING([--enable-quota], + [enable quota support]), + [],[enable_quota='yes']) +AC_MSG_RESULT([$enable_quota]) +if test x$linux25 != xyes; then + enable_quota='no' +fi +if test x$enable_quota != xno; then + AC_DEFINE(HAVE_QUOTA_SUPPORT, 1, [Enable quota support]) +fi +]) + +AC_DEFUN([LC_QUOTA_READ], +[AC_MSG_CHECKING([if kernel supports quota_read]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + struct super_operations sp; + void *i = (void *)sp.quota_read; +],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(KERNEL_SUPPORTS_QUOTA_READ, 1, [quota_read found]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# +# LC_COOKIE_FOLLOW_LINK +# +# kernel 2.6.13+ ->follow_link returns a cookie +# + +AC_DEFUN([LC_COOKIE_FOLLOW_LINK], +[AC_MSG_CHECKING([if inode_operations->follow_link returns a cookie]) +LB_LINUX_TRY_COMPILE([ + #include + #include + +],[ + struct dentry dentry; + struct nameidata nd; + + dentry.d_inode->i_op->put_link(&dentry, &nd, NULL); +],[ + AC_DEFINE(HAVE_COOKIE_FOLLOW_LINK, 1, [inode_operations->follow_link returns a cookie]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) ]) # @@ -415,7 +1179,11 @@ AC_DEFUN([LC_CONFIGURE], [LC_CONFIG_OBD_BUFFER_SIZE # include/liblustre.h -AC_CHECK_HEADERS([asm/page.h sys/user.h stdint.h]) +AC_CHECK_HEADERS([asm/page.h sys/user.h sys/vfs.h stdint.h blkid/blkid.h]) + +# include/lustre/lustre_user.h +# See note there re: __ASM_X86_64_PROCESSOR_H +AC_CHECK_HEADERS([linux/quota.h]) # liblustre/llite_lib.h AC_CHECK_HEADERS([xtio.h file.h]) @@ -426,6 +1194,19 @@ AC_CHECK_HEADERS([linux/types.h sys/types.h linux/unistd.h unistd.h]) # liblustre/lutil.c AC_CHECK_HEADERS([netinet/in.h arpa/inet.h catamount/data.h]) AC_CHECK_FUNCS([inet_ntoa]) + +# utils/llverfs.c +AC_CHECK_HEADERS([ext2fs/ext2fs.h]) + +# Super safe df +AC_ARG_ENABLE([mindf], + AC_HELP_STRING([--enable-mindf], + [Make statfs report the minimum available space on any single OST instead of the sum of free space on all OSTs]), + [],[]) +if test "$enable_mindf" = "yes" ; then + AC_DEFINE([MIN_DF], 1, [Report minimum OST free space]) +fi + ]) # @@ -435,15 +1216,16 @@ AC_CHECK_FUNCS([inet_ntoa]) # AC_DEFUN([LC_CONDITIONALS], [AM_CONDITIONAL(LIBLUSTRE, test x$enable_liblustre = xyes) -AM_CONDITIONAL(EXTN, test x$enable_extN = xyes) AM_CONDITIONAL(LDISKFS, test x$enable_ldiskfs = xyes) AM_CONDITIONAL(USE_QUILT, test x$QUILT != xno) +AM_CONDITIONAL(LIBLUSTRE_TESTS, test x$enable_liblustre_tests = xyes) AM_CONDITIONAL(MPITESTS, test x$enable_mpitests = xyes, Build MPI Tests) -AM_CONDITIONAL(SNAPFS, test x$enable_snapfs = xyes) -AM_CONDITIONAL(SMFS, test x$enable_smfs = xyes) -AM_CONDITIONAL(GSS, test x$enable_gss = xyes) -AM_CONDITIONAL(LIBLUSTRE, test x$enable_liblustre = 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(BLKID, test x$ac_cv_header_blkid_blkid_h = xyes) +AM_CONDITIONAL(EXT2FS_DEVEL, test x$ac_cv_header_ext2fs_ext2fs_h = xyes) +AM_CONDITIONAL(LIBPTHREAD, test x$enable_libpthread = xyes) ]) # @@ -456,23 +1238,30 @@ AC_DEFUN([LC_CONFIG_FILES], lustre/Makefile lustre/autoMakefile lustre/autoconf/Makefile -lustre/cmobd/Makefile -lustre/cmobd/autoMakefile -lustre/cobd/Makefile -lustre/cobd/autoMakefile -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-suse.target +lustre/kernel_patches/targets/2.6-vanilla.target +lustre/kernel_patches/targets/2.6-rhel4.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/hp_pnnl-2.4.target +lustre/kernel_patches/targets/rh-2.4.target +lustre/kernel_patches/targets/rhel-2.4.target +lustre/kernel_patches/targets/suse-2.4.21-2.target +lustre/kernel_patches/targets/sles-2.4.target lustre/ldiskfs/Makefile lustre/ldiskfs/autoMakefile lustre/ldlm/Makefile lustre/liblustre/Makefile +lustre/liblustre/tests/Makefile lustre/llite/Makefile lustre/llite/autoMakefile -lustre/lmv/Makefile -lustre/lmv/autoMakefile lustre/lov/Makefile lustre/lov/autoMakefile lustre/lvfs/Makefile @@ -483,6 +1272,7 @@ lustre/mds/Makefile lustre/mds/autoMakefile lustre/obdclass/Makefile lustre/obdclass/autoMakefile +lustre/obdclass/linux/Makefile lustre/obdecho/Makefile lustre/obdecho/autoMakefile lustre/obdfilter/Makefile @@ -491,23 +1281,23 @@ lustre/osc/Makefile lustre/osc/autoMakefile lustre/ost/Makefile lustre/ost/autoMakefile -lustre/ptlbd/Makefile -lustre/ptlbd/autoMakefile +lustre/mgc/Makefile +lustre/mgc/autoMakefile +lustre/mgs/Makefile +lustre/mgs/autoMakefile lustre/ptlrpc/Makefile lustre/ptlrpc/autoMakefile +lustre/quota/Makefile +lustre/quota/autoMakefile lustre/scripts/Makefile lustre/scripts/version_tag.pl -lustre/sec/Makefile -lustre/sec/autoMakefile -lustre/sec/gss/Makefile -lustre/sec/gss/autoMakefile -lustre/smfs/Makefile -lustre/smfs/autoMakefile -lustre/snapfs/Makefile -lustre/snapfs/autoMakefile -lustre/snapfs/utils/Makefile lustre/tests/Makefile -lustre/utils/Lustre/Makefile lustre/utils/Makefile ]) +case $lb_target_os in + darwin) + AC_CONFIG_FILES([ lustre/obdclass/darwin/Makefile ]) + ;; +esac + ])