X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fautoconf%2Flustre-core.m4;h=f6d343327ba6efde1aaa1250f38444840e502043;hp=de554d4a88c2ad2c65e6324e2ac15c3e4155d783;hb=6d57017bcb81a8cff88fa049ab662b4c0677f625;hpb=a80cacd8184639aaddd615437f3ff976e9b91b62 diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index de554d4..f6d3433 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -1,5 +1,3 @@ -#* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- -#* vim:expandtab:shiftwidth=8:tabstop=8: # # LC_CONFIG_SRCDIR # @@ -85,64 +83,17 @@ AC_TRY_COMPILE([ ]) # -# 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 -]) - - - -# -# only for Lustre-patched kernels -# -AC_DEFUN([LC_LUSTRE_VERSION_H], -[LB_CHECK_FILE([$LINUX/include/linux/lustre_version.h],[ - rm -f "$LUSTRE/include/linux/lustre_version.h" -],[ - touch "$LUSTRE/include/linux/lustre_version.h" - if test x$enable_server = xyes ; then - AC_MSG_WARN([Unpatched kernel detected.]) - AC_MSG_WARN([Lustre servers cannot be built with an unpatched kernel;]) - AC_MSG_WARN([disabling server build]) - enable_server='no' - fi -]) -]) - -# # LC_FUNC_DEV_SET_RDONLY # -# check for the old-style dev_set_rdonly which took an extra "devno" param -# and can only set a single device to discard writes at one time +# check whether dev_set_rdonly is exported. This is needed until we +# have another mechanism to fence IO from the underlying device. # AC_DEFUN([LC_FUNC_DEV_SET_RDONLY], -[AC_MSG_CHECKING([if kernel has new dev_set_rdonly]) -LB_LINUX_TRY_COMPILE([ - #include - #include -],[ - #ifndef HAVE_CLEAR_RDONLY_ON_PUT - #error needs to be patched by lustre kernel patches from Lustre version 1.4.3 or above. - #endif +[LB_CHECK_SYMBOL_EXPORT([dev_set_rdonly], +[block/ll_rw_block.c,block/blk-core.c],[ + AC_DEFINE(HAVE_DEV_SET_RDONLY, 1, [kernel exports dev_set_rdonly]) ],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_DEV_SET_RDONLY, 1, [kernel has new dev_set_rdonly]) -],[ - AC_MSG_ERROR([no, Linux kernel source needs to be patches by lustre -kernel patches from Lustre version 1.4.3 or above.]) + AC_MSG_WARN([kernel missing dev_set_rdonly patch for testing]) ]) ]) @@ -256,20 +207,16 @@ if test x$enable_lru_resize != xno; then fi ]) -# whether to enable quota support(kernel modules) -AC_DEFUN([LC_QUOTA_MODULE], -[if test x$enable_quota != xno; then - LB_LINUX_CONFIG([QUOTA],[ - enable_quota_module='yes' - AC_DEFINE(HAVE_QUOTA_SUPPORT, 1, [Enable quota support]) - ],[ - enable_quota_module='no' - AC_MSG_WARN([quota is not enabled because the kernel - lacks quota support]) - ]) -fi +# +# Quota support. The kernel must support CONFIG_QUOTA. +# +AC_DEFUN([LC_QUOTA_CONFIG], +[LB_LINUX_CONFIG_IM([QUOTA],[AC_DEFINE(HAVE_QUOTA_SUPPORT, 1, [support quota])],[ + AC_MSG_ERROR([Lustre quota requires that CONFIG_QUOTA is enabled in your kernel.]) +]) ]) -# truncate_complete_page() was exported from RHEL5/SLES10/SLES11 +# truncate_complete_page() was exported from RHEL5/SLES10, but not in SLES11 SP0 (2.6.27) # remove_from_page_cache() was exported between 2.6.35 and 2.6.38 # delete_from_page_cache() is exported from 2.6.39 AC_DEFUN([LC_EXPORT_TRUNCATE_COMPLETE], @@ -287,15 +234,6 @@ AC_DEFUN([LC_EXPORT_TRUNCATE_COMPLETE], [kernel export delete_from_page_cache])]) ]) -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],[ @@ -337,46 +275,6 @@ AC_DEFUN([LC_EXPORT_NODE_TO_CPUMASK], ]) # -# LC_FUNC_GRAB_CACHE_PAGE_NOWAIT_GFP -# -# Check for our patched grab_cache_page_nowait_gfp() function -# after 2.6.29 we can emulate this using add_to_page_cache_lru() -# -AC_DEFUN([LC_FUNC_GRAB_CACHE_PAGE_NOWAIT_GFP], -[LB_CHECK_SYMBOL_EXPORT([grab_cache_page_nowait_gfp], -[mm/filemap.c],[ - AC_DEFINE(HAVE_GRAB_CACHE_PAGE_NOWAIT_GFP, 1, - [kernel exports grab_cache_page_nowait_gfp]) - ], - [LB_CHECK_SYMBOL_EXPORT([add_to_page_cache_lru], - [mm/filemap.c],[ - AC_DEFINE(HAVE_ADD_TO_PAGE_CACHE_LRU, 1, - [kernel exports add_to_page_cache_lru]) - ],[ - ]) - ]) -]) - -# -# LC_STRUCT_STATFS -# -# AIX does not have statfs.f_namelen -# -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]) -]) -]) - # # between 2.6.5 - 2.6.22 filemap_populate is exported in some kernels # @@ -396,23 +294,6 @@ 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([ - #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]) -]) -]) - -# # added in 2.6.17 # AC_DEFUN([LC_BIT_SPINLOCK_H], @@ -433,45 +314,8 @@ AC_DEFUN([LC_BIT_SPINLOCK_H], ]) # -# After 2.6.26 we no longer have xattr_acl.h +# LC_CONST_ACL_SIZE # -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]) - ]) -], -[]) -]) - -# -# 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]) - 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_CONST_ACL_SIZE], [AC_MSG_CHECKING([calc acl size]) tmp_flags="$CFLAGS" @@ -483,22 +327,16 @@ AC_TRY_RUN([ // 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 + #ifdef CONFIG_FS_POSIX_ACL + # include + #endif #include int main(void) { - int size = mds_xattr_acl_size(LUSTRE_POSIX_ACL_MAX_ENTRIES); + /* LUSTRE_POSIX_ACL_MAX_ENTRIES = 32 */ + int size = posix_acl_xattr_size(32); FILE *f = fopen("acl.size","w+"); fprintf(f,"%d", size); fclose(f); @@ -510,27 +348,12 @@ AC_TRY_RUN([ 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" -]) - -# added in 2.6.16 -# -AC_DEFUN([LC_STRUCT_INTENT_FILE], -[AC_MSG_CHECKING([if struct open_intent has a file field]) -LB_LINUX_TRY_COMPILE([ - #include - #include -],[ - struct open_intent intent; - &intent.file; -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_FILE_IN_STRUCT_INTENT, 1, [struct open_intent has a file field]) + AC_ERROR([ACL size can't be computed]) ],[ - AC_MSG_RESULT([no]) + AC_MSG_RESULT([can't check ACL size, make it 260]) + AC_DEFINE_UNQUOTED(XATTR_ACL_SIZE,260) ]) +CFLAGS="$tmp_flags" ]) # @@ -583,25 +406,9 @@ AC_DEFUN([LC_CONFIG_GSS_KEYRING], fi ]) -AC_DEFUN([LC_SUNRPC_CACHE], -[AC_MSG_CHECKING([if sunrpc struct cache_head uses kref]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct cache_head ch; - &ch.ref.refcount; -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_SUNRPC_CACHE_V2, 1, [sunrpc cache facility v2]) -],[ - AC_MSG_RESULT([no]) -]) -]) - AC_DEFUN([LC_CONFIG_SUNRPC], [LB_LINUX_CONFIG_IM([SUNRPC],[], [AC_MSG_ERROR([kernel SUNRPC support is required by using GSS.])]) - LC_SUNRPC_CACHE ]) # @@ -644,50 +451,6 @@ AC_DEFUN([LC_CONFIG_GSS], fi ]) -# -# LC_FUNC_HAVE_CAN_SLEEP_ARG -# -# 2.6.5 kernel has third arg can_sleep in fs/locks.c: flock_lock_file_wait() -# -AC_DEFUN([LC_FUNC_HAVE_CAN_SLEEP_ARG], -[AC_MSG_CHECKING([if kernel has third arg can_sleep in fs/locks.c: flock_lock_file_wait()]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - int cansleep; - struct file *file; - struct file_lock *file_lock; - flock_lock_file_wait(file, file_lock, cansleep); -],[ - AC_DEFINE(HAVE_CAN_SLEEP_ARG, 1, - [kernel has third arg can_sleep in fs/locks.c: flock_lock_file_wait()]) - AC_MSG_RESULT([yes]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# -# LC_FUNC_F_OP_FLOCK -# -# rhel4.2 kernel has f_op->flock field -# -AC_DEFUN([LC_FUNC_F_OP_FLOCK], -[AC_MSG_CHECKING([if struct file_operations has flock field]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct file_operations ll_file_operations_flock; - ll_file_operations_flock.flock = NULL; -],[ - AC_DEFINE(HAVE_F_OP_FLOCK, 1, - [struct file_operations has flock field]) - AC_MSG_RESULT([yes]) -],[ - AC_MSG_RESULT([no]) -]) -]) - AC_DEFUN([LC_QUOTA_READ], [AC_MSG_CHECKING([if kernel supports quota_read]) LB_LINUX_TRY_COMPILE([ @@ -708,17 +471,16 @@ LB_LINUX_TRY_COMPILE([ # # 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 dentry *dentry = NULL; struct nameidata nd; - dentry.d_inode->i_op->put_link(&dentry, &nd, NULL); + 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]) @@ -800,9 +562,9 @@ AC_DEFUN([LC_S_TIME_GRAN], LB_LINUX_TRY_COMPILE([ #include ],[ - struct super_block sb; + struct super_block *sb = NULL; - return sb.s_time_gran; + return sb->s_time_gran; ],[ AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_S_TIME_GRAN, 1, [super block has s_time_gran member]) @@ -847,17 +609,6 @@ LB_LINUX_TRY_COMPILE([ EXTRA_KCFLAGS="$tmp_flags" ]) -# 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]) -],[ -]) -]) - # 2.6.15 # LC_INODE_I_MUTEX @@ -889,12 +640,9 @@ AC_DEFUN([LC_SECURITY_PLUG], [AC_MSG_CHECKING([If kernel has security plug support]) LB_LINUX_TRY_COMPILE([ #include + #include ],[ - struct dentry *dentry; - struct vfsmount *mnt; - struct iattr *iattr; - - notify_change(dentry, mnt, iattr); + notify_change(NULL, NULL, NULL); ],[ AC_MSG_RESULT(yes) AC_DEFINE(HAVE_SECURITY_PLUG, 1, @@ -965,65 +713,30 @@ LB_LINUX_TRY_COMPILE([ # # LC_STATFS_DENTRY_PARAM -# starting from 2.6.18 linux kernel uses dentry instead of -# super_block for first vfs_statfs argument +# starting from 2.6.18 linux kernel uses dentry instead of super_block +# for the first parameter of the super_operations->statfs() callback. +# # AC_DEFUN([LC_STATFS_DENTRY_PARAM], -[AC_MSG_CHECKING([first vfs_statfs parameter is dentry]) +[AC_MSG_CHECKING([if super_ops.statfs() first parameter is dentry]) +tmp_flags="$EXTRA_KCFLAGS" +EXTRA_KCFLAGS="-Werror" LB_LINUX_TRY_COMPILE([ #include ],[ - int vfs_statfs(struct dentry *, struct kstatfs *); + ((struct super_operations *)0)->statfs((struct dentry *)0, (struct kstatfs*)0); ],[ AC_DEFINE(HAVE_STATFS_DENTRY_PARAM, 1, - [first parameter of vfs_statfs is dentry]) + [super_ops.statfs() first parameter is dentry]) AC_MSG_RESULT([yes]) ],[ AC_MSG_RESULT([no]) ]) -]) - -# -# LC_VFS_KERN_MOUNT -# starting from 2.6.18 kernel don't export do_kern_mount -# and want to use vfs_kern_mount instead. -# -AC_DEFUN([LC_VFS_KERN_MOUNT], -[AC_MSG_CHECKING([vfs_kern_mount exist in kernel]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - vfs_kern_mount(NULL, 0, NULL, NULL); -],[ - AC_DEFINE(HAVE_VFS_KERN_MOUNT, 1, - [vfs_kern_mount exist in kernel]) - AC_MSG_RESULT([yes]) -],[ - AC_MSG_RESULT([no]) -]) -]) - -# -# LC_INVALIDATEPAGE_RETURN_INT -# 2.6.17 changes return type for invalidatepage to 'void' from 'int' -# -AC_DEFUN([LC_INVALIDATEPAGE_RETURN_INT], -[AC_MSG_CHECKING([invalidatepage has return int]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - int rc = block_invalidatepage(NULL, 0); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_INVALIDATEPAGE_RETURN_INT, 1, - [Define if return type of invalidatepage should be int]) -],[ - AC_MSG_RESULT(no) -]) +EXTRA_KCFLAGS="$tmp_flags" ]) # LC_UMOUNTBEGIN_HAS_VFSMOUNT -# after 2.6.18 umount_begin has different parameters +# 2.6.18~2.6.25 umount_begin has different parameters AC_DEFUN([LC_UMOUNTBEGIN_HAS_VFSMOUNT], [AC_MSG_CHECKING([if umount_begin needs vfsmount parameter instead of super_block]) tmp_flags="$EXTRA_KCFLAGS" @@ -1052,39 +765,6 @@ LB_LINUX_TRY_COMPILE([ EXTRA_KCFLAGS="$tmp_flags" ]) -# LC_SEQ_LOCK -# after 2.6.18 seq_file has lock intead of sem -AC_DEFUN([LC_SEQ_LOCK], -[AC_MSG_CHECKING([if struct seq_file has lock field]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct seq_file seq; - - mutex_unlock(&seq.lock); -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SEQ_LOCK, 1, - [after 2.6.18 seq_file has lock intead of sem]) -],[ - AC_MSG_RESULT(NO) -]) -]) - -# -# LC_EXPORT_FILEMAP_FDATAWRITE_RANGE -# -# No standard kernels export this -# -AC_DEFUN([LC_EXPORT_FILEMAP_FDATAWRITE_RANGE], -[LB_CHECK_SYMBOL_EXPORT([filemap_fdatawrite_range], -[mm/filemap.c],[ -AC_DEFINE(HAVE_FILEMAP_FDATAWRITE_RANGE, 1, - [filemap_fdatawrite_range is exported by the kernel]) -],[ -]) -]) - # LC_FLUSH_OWNER_ID # starting from 2.6.18 the file_operations .flush # method has a new "fl_owner_t id" parameter @@ -1095,7 +775,7 @@ LB_LINUX_TRY_COMPILE([ #include ],[ struct file_operations *fops = NULL; - fl_owner_t id; + fl_owner_t id = NULL; int i; i = fops->flush(NULL, id); @@ -1151,19 +831,20 @@ LB_LINUX_TRY_COMPILE([ AC_DEFUN([LC_PAGE_CHECKED], [AC_MSG_CHECKING([kernel has PageChecked and SetPageChecked]) LB_LINUX_TRY_COMPILE([ + #include #ifdef HAVE_LINUX_MMTYPES_H #include #endif - #include + #include ],[ - struct page *p; + struct page *p = NULL; /* before 2.6.26 this define*/ #ifndef PageChecked - /* 2.6.26 use function instead of define for it */ - SetPageChecked(p); - PageChecked(p); - #endif + /* 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, @@ -1215,34 +896,6 @@ LB_LINUX_TRY_COMPILE([ ]) ]) -# 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_FILE_WRITEV # 2.6.19 replaced writev with aio_write AC_DEFUN([LC_FILE_WRITEV], @@ -1360,7 +1013,7 @@ LB_LINUX_TRY_COMPILE([ #include ],[ struct crypto_blkcipher *tfm; - tfm = crypto_alloc_blkcipher("aes", 0, 0 ); + tfm = crypto_alloc_blkcipher("aes", 0, sizeof(tfm) ); ],[ AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_ASYNC_BLOCK_CIPHER, 1, [kernel has block cipher support]) @@ -1378,7 +1031,7 @@ LB_LINUX_TRY_COMPILE([ #include #include ],[ - struct hash_desc foo; + struct hash_desc foo __attribute__ ((unused)); ],[ AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_STRUCT_HASH_DESC, 1, [kernel has struct hash_desc]) @@ -1396,7 +1049,7 @@ LB_LINUX_TRY_COMPILE([ #include #include ],[ - struct blkcipher_desc foo; + struct blkcipher_desc foo __attribute__ ((unused)); ],[ AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_STRUCT_BLKCIPHER_DESC, 1, [kernel has struct blkcipher_desc]) @@ -1413,7 +1066,8 @@ AC_DEFUN([LC_FS_RENAME_DOES_D_MOVE], LB_LINUX_TRY_COMPILE([ #include ],[ - int v = FS_RENAME_DOES_D_MOVE; + int v __attribute__ ((unused)); + v = FS_RENAME_DOES_D_MOVE; ],[ AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_FS_RENAME_DOES_D_MOVE, 1, [kernel has FS_RENAME_DOES_D_MOVE flag]) @@ -1430,7 +1084,8 @@ AC_DEFUN([LC_UNREGISTER_BLKDEV_RETURN_INT], LB_LINUX_TRY_COMPILE([ #include ],[ - int i = unregister_blkdev(0,NULL); + int i __attribute__ ((unused)); + i = unregister_blkdev(0,NULL); ],[ AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_UNREGISTER_BLKDEV_RETURN_INT, 1, @@ -1565,15 +1220,12 @@ LB_LINUX_TRY_COMPILE([ AC_DEFUN([LC_FH_TO_DENTRY], [AC_MSG_CHECKING([if kernel has .fh_to_dentry member in export_operations struct]) LB_LINUX_TRY_COMPILE([ + #include #ifdef HAVE_LINUX_EXPORTFS_H #include -#else - #include #endif ],[ - struct export_operations exp; - - exp.fh_to_dentry = NULL; + do{ }while(sizeof(((struct export_operations *)0)->fh_to_dentry)); ], [ AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_FH_TO_DENTRY, 1, @@ -1591,7 +1243,7 @@ LB_LINUX_TRY_COMPILE([ ],[ struct proc_dir_entry pde; - pde.deleted = NULL; + pde.deleted = sizeof(pde); ], [ AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_PROCFS_DELETED, 1, @@ -1611,26 +1263,6 @@ AC_DEFUN([LC_EXPORT_BDI_INIT], ]) ]) -# 2.6.25 - -# 2.6.25 change define to inline -AC_DEFUN([LC_MAPPING_CAP_WRITEBACK_DIRTY], -[AC_MSG_CHECKING([if kernel have mapping_cap_writeback_dirty]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - #ifndef mapping_cap_writeback_dirty - mapping_cap_writeback_dirty(NULL); - #endif -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_MAPPING_CAP_WRITEBACK_DIRTY, 1, - [kernel have mapping_cap_writeback_dirty]) -],[ - AC_MSG_RESULT([no]) -]) -]) - # 2.6.26 # 2.6.26 isn't export set_fs_pwd and change paramter in fs struct @@ -1641,10 +1273,9 @@ LB_LINUX_TRY_COMPILE([ #include #include ],[ - struct path path; struct fs_struct fs; - fs.pwd = path; + fs.pwd = *((struct path *)sizeof(fs)); ], [ AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_FS_STRUCT_USE_PATH, 1, @@ -1654,18 +1285,39 @@ LB_LINUX_TRY_COMPILE([ ]) ]) + +# # 2.6.27 +# +AC_DEFUN([LC_PGMKWRITE_USE_VMFAULT], +[AC_MSG_CHECKING([kernel .page_mkwrite uses struct vm_fault *]) +tmp_flags="$EXTRA_KCFLAGS" +EXTRA_KCFLAGS="-Werror" +LB_LINUX_TRY_COMPILE([ + #include +],[ + ((struct vm_operations_struct *)0)->page_mkwrite((struct vm_area_struct *)0, (struct vm_fault *)0); +], [ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_PGMKWRITE_USE_VMFAULT, 1, + [kernel vm_operation_struct.page_mkwrite uses struct vm_fault * as second parameter]) +],[ + AC_MSG_RESULT([no]) +]) +EXTRA_KCFLAGS="$tmp_flags" +]) AC_DEFUN([LC_INODE_PERMISION_2ARGS], [AC_MSG_CHECKING([inode_operations->permission has two args]) LB_LINUX_TRY_COMPILE([ #include ],[ - struct inode *inode; + struct inode *inode __attribute__ ((unused)); - inode->i_op->permission(NULL,0); + inode = NULL; + inode->i_op->permission(NULL, 0); ],[ - AC_DEFINE(HAVE_INODE_PERMISION_2ARGS, 1, + AC_DEFINE(HAVE_INODE_PERMISION_2ARGS, 1, [inode_operations->permission has two args]) AC_MSG_RESULT([yes]) ],[ @@ -1736,9 +1388,10 @@ AC_DEFINE(HAVE_EXPORT_INODE_PERMISSION, 1, AC_DEFUN([LC_QUOTA_ON_5ARGS], [AC_MSG_CHECKING([quota_on needs 5 parameters]) LB_LINUX_TRY_COMPILE([ + #include #include ],[ - struct quotactl_ops *qop; + struct quotactl_ops *qop = NULL; qop->quota_on(NULL, 0, 0, NULL, 0); ],[ AC_DEFINE(HAVE_QUOTA_ON_5ARGS, 1, @@ -1753,9 +1406,10 @@ LB_LINUX_TRY_COMPILE([ AC_DEFUN([LC_QUOTA_OFF_3ARGS], [AC_MSG_CHECKING([quota_off needs 3 parameters]) LB_LINUX_TRY_COMPILE([ + #include #include ],[ - struct quotactl_ops *qop; + struct quotactl_ops *qop = NULL; qop->quota_off(NULL, 0, 0); ],[ AC_DEFINE(HAVE_QUOTA_OFF_3ARGS, 1, @@ -1807,7 +1461,7 @@ LB_LINUX_TRY_COMPILE([ #include ],[ struct bio io; - io.bi_hw_segments = 0; + io.bi_hw_segments = sizeof(io); ],[ AC_DEFINE(HAVE_BI_HW_SEGMENTS, 1, [struct bio has a bi_hw_segments field]) @@ -1837,26 +1491,6 @@ AC_DEFUN([LC_HAVE_QUOTAIO_H], ]) ]) -# sles10 sp2 need 5 parameter for vfs_symlink -AC_DEFUN([LC_VFS_SYMLINK_5ARGS], -[AC_MSG_CHECKING([vfs_symlink need 5 parameter]) -LB_LINUX_TRY_COMPILE([ - #include -],[ - struct inode *dir = NULL; - struct dentry *dentry = NULL; - struct vfsmount *mnt = NULL; - const char * path = NULL; - vfs_symlink(dir, dentry, mnt, path, 0); -],[ - AC_DEFINE(HAVE_VFS_SYMLINK_5ARGS, 1, - [vfs_symlink need 5 parameteres]) - AC_MSG_RESULT([yes]) -],[ - AC_MSG_RESULT([no]) -]) -]) - # 2.6.27 sles11 has sb_any_quota_active AC_DEFUN([LC_SB_ANY_QUOTA_ACTIVE], [AC_MSG_CHECKING([Kernel has sb_any_quota_active]) @@ -1899,7 +1533,23 @@ AC_DEFUN([LC_EXPORT_ADD_TO_PAGE_CACHE_LRU], ]) ]) -# 2.6.31 +# +# 2.6.29 introduce sb_any_quota_loaded. +# +AC_DEFUN([LC_SB_ANY_QUOTA_LOADED], +[AC_MSG_CHECKING([Kernel has sb_any_quota_loaded]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + sb_any_quota_loaded(NULL); +],[ + AC_DEFINE(HAVE_SB_ANY_QUOTA_LOADED, 1, + [Kernel has a sb_any_quota_loaded]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) +]) # 2.6.30 x86 node_to_cpumask has been removed. must use cpumask_of_node AC_DEFUN([LC_EXPORT_CPUMASK_OF_NODE], @@ -1928,6 +1578,24 @@ LB_LINUX_TRY_COMPILE([ # 2.6.32 +# 2.6.32 changes cache_detail's member cache_request to cache_upcall +# in kernel commit bc74b4f5e63a09fb78e245794a0de1e5a2716bbe +AC_DEFUN([LC_CACHE_UPCALL], +[AC_MSG_CHECKING([if cache_detail has cache_upcall field]) + LB_LINUX_TRY_COMPILE([ + #include + ],[ + struct cache_detail cd; + cd.cache_upcall = NULL; + ],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_CACHE_UPCALL, 1, + [cache_detail has cache_upcall field]) + ],[ + AC_MSG_RESULT(no) + ]) +]) + # 2.6.32 add a limits member in struct request_queue. AC_DEFUN([LC_REQUEST_QUEUE_LIMITS], [AC_MSG_CHECKING([if request_queue has a limits field]) @@ -2076,10 +1744,27 @@ AC_DEFUN([LC_SET_CPUS_ALLOWED], [set_cpus_allowed is exported by the kernel])], [AC_MSG_RESULT([no])] )]) +# 2.6.32 introduces selinux_is_enabled() +AC_DEFUN([LC_SELINUX_IS_ENABLED], +[AC_MSG_CHECKING([if selinux_is_enabled is available]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + selinux_is_enabled(); +],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_SELINUX_IS_ENABLED, 1, + [selinux_is_enabled is defined]) +],[ + AC_MSG_RESULT([no]) +]) +]) + # # LC_D_OBTAIN_ALIAS # starting from 2.6.28 kernel replaces d_alloc_anon() with # d_obtain_alias() for getting anonymous dentries +# RHEL5(2.6.18) has d_obtain_alias but SLES11SP0(2.6.27) not # AC_DEFUN([LC_D_OBTAIN_ALIAS], [AC_MSG_CHECKING([d_obtain_alias exist in kernel]) @@ -2097,6 +1782,174 @@ LB_LINUX_TRY_COMPILE([ ]) # +# LC_EXPORT_GENERIC_ERROR_REMOVE_PAGE +# +AC_DEFUN([LC_EXPORT_GENERIC_ERROR_REMOVE_PAGE], + [LB_CHECK_SYMBOL_EXPORT( + [generic_error_remove_page], + [mm/truncate.c], + [AC_DEFINE(HAS_GENERIC_ERROR_REMOVE_PAGE, 1, + [kernel export generic_error_remove_page])], + []) + ] +) + +# 2.6.32 if kernel export access_process_vm(). +AC_DEFUN([LC_EXPORT_ACCESS_PROCESS_VM], + [LB_CHECK_SYMBOL_EXPORT([access_process_vm], + [mm/memory.c], + [AC_DEFINE(HAVE_ACCESS_PROCESS_VM, 1, + [access_process_vm function is present])], + []) + ] +) + +# +# 2.6.36 fs_struct.lock use spinlock instead of rwlock. +# +AC_DEFUN([LC_FS_STRUCT_RWLOCK], +[AC_MSG_CHECKING([if fs_struct.lock use rwlock]) +LB_LINUX_TRY_COMPILE([ + #include + #include + #include +],[ + ((struct fs_struct *)0)->lock = (rwlock_t){ 0 }; +],[ + AC_DEFINE(HAVE_FS_STRUCT_RWLOCK, 1, + [fs_struct.lock use rwlock]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# +# 2.6.36 super_operations add evict_inode method. it hybird of +# delete_inode & clear_inode. +# +AC_DEFUN([LC_SBOPS_EVICT_INODE], +[AC_MSG_CHECKING([if super_operations.evict_inode exist]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + ((struct super_operations *)0)->evict_inode(NULL); +],[ + AC_DEFINE(HAVE_SBOPS_EVICT_INODE, 1, + [super_operations.evict_inode() is exist in kernel]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# +# 2.6.35 file_operations.fsync taken 2 arguments. +# 3.0.0 file_operations.fsync takes 4 arguments. +# +AC_DEFUN([LC_FILE_FSYNC], +[AC_MSG_CHECKING([if file_operations.fsync takes 4 or 2 arguments]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + ((struct file_operations *)0)->fsync(NULL, 0, 0, 0); +],[ + AC_DEFINE(HAVE_FILE_FSYNC_4ARGS, 1, + [file_operations.fsync takes 4 arguments]) + AC_MSG_RESULT([yes, 4 args]) +],[ + LB_LINUX_TRY_COMPILE([ + #include + ],[ + ((struct file_operations *)0)->fsync(NULL, 0); + ],[ + AC_DEFINE(HAVE_FILE_FSYNC_2ARGS, 1, + [file_operations.fsync takes 2 arguments]) + AC_MSG_RESULT([yes, 2 args]) + ],[ + AC_MSG_RESULT([no]) + ]) +]) +]) + +# +# 2.6.37 remove kernel_locked +# +AC_DEFUN([LC_KERNEL_LOCKED], +[AC_MSG_CHECKING([if kernel_locked is defined]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + kernel_locked(); +],[ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_KERNEL_LOCKED, 1, + [kernel_locked is defined]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# +# 2.6.38 dentry_operations.d_compare() taken 7 arguments. +# +AC_DEFUN([LC_D_COMPARE_7ARGS], +[AC_MSG_CHECKING([if d_compare taken 7 arguments]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + ((struct dentry_operations*)0)->d_compare(NULL,NULL,NULL,NULL,0,NULL,NULL); +],[ + AC_DEFINE(HAVE_D_COMPARE_7ARGS, 1, + [d_compare need 7 arguments]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# +# 2.6.38 dentry_operations.d_delete() defined 'const' for 1st parameter. +# +AC_DEFUN([LC_D_DELETE_CONST], +[AC_MSG_CHECKING([if d_delete has const declare on first parameter]) +tmp_flags="$EXTRA_KCFLAGS" +EXTRA_KCFLAGS="-Werror" +LB_LINUX_TRY_COMPILE([ + #include +],[ + const struct dentry *d = NULL; + ((struct dentry_operations*)0)->d_delete(d); +],[ + AC_DEFINE(HAVE_D_DELETE_CONST, const, + [d_delete first parameter declared const]) + AC_MSG_RESULT([yes]) +],[ + AC_DEFINE(HAVE_D_DELETE_CONST, , []) + AC_MSG_RESULT([no]) +]) +EXTRA_KCFLAGS="$tmp_flags" +]) + +# +# 2.6.38 dcache_lock removed. rcu-walk commited. +# +AC_DEFUN([LC_DCACHE_LOCK], +[AC_MSG_CHECKING([if dcache_lock is exist]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + spin_lock(&dcache_lock); +],[ + AC_DEFINE(HAVE_DCACHE_LOCK, 1, + [dcache_lock is exist]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# # 2.6.38 export blkdev_get_by_dev # AC_DEFUN([LC_BLKDEV_GET_BY_DEV], @@ -2109,6 +1962,48 @@ AC_DEFINE(HAVE_BLKDEV_GET_BY_DEV, 1, ]) # +# 2.6.38 vfsmount.mnt_count doesn't use atomic_t +# +AC_DEFUN([LC_ATOMIC_MNT_COUNT], +[AC_MSG_CHECKING([if vfsmount.mnt_count is atomic_t]) +LB_LINUX_TRY_COMPILE([ + #include + #include + #include +],[ + ((struct vfsmount *)0)->mnt_count = ((atomic_t) { 0 }); +],[ + AC_DEFINE(HAVE_ATOMIC_MNT_COUNT, 1, + [vfsmount.mnt_count is atomic_t]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# +# 2.6.38 use path as 4th parameter in quota_on. +# +AC_DEFUN([LC_QUOTA_ON_USE_PATH], +[AC_MSG_CHECKING([quota_on use path as parameter]) +tmp_flags="$EXTRA_KCFLAGS" +EXTRA_KCFLAGS="-Werror" +LB_LINUX_TRY_COMPILE([ + #include + #include +],[ + ((struct quotactl_ops *)0)->quota_on(NULL, 0, 0, ((struct path*)0)); +],[ + AC_DEFINE(HAVE_QUOTA_ON_USE_PATH, 1, + [quota_on use path as 4th paramter]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) +EXTRA_KCFLAGS="$tmp_flags" +]) + +# # 2.6.39 remove unplug_fn from request_queue. # AC_DEFUN([LC_REQUEST_QUEUE_UNPLUG_FN], @@ -2116,11 +2011,29 @@ AC_DEFUN([LC_REQUEST_QUEUE_UNPLUG_FN], LB_LINUX_TRY_COMPILE([ #include ],[ - struct request_queue rq; - memset(rq.unplug_fn, 0, sizeof(rq.unplug_fn)); + do{ }while(sizeof(((struct request_queue *)0)->unplug_fn)); ],[ AC_DEFINE(HAVE_REQUEST_QUEUE_UNPLUG_FN, 1, - [request_queue has unplug_fn field]), + [request_queue has unplug_fn field]) + AC_MSG_RESULT([yes]) +],[ + AC_MSG_RESULT([no]) +]) +]) + +# +# 2.6.38 generic_permission taken 4 paremater. +# in fact, it means rcu-walk aware permission bring. +# +AC_DEFUN([LC_GENERIC_PERMISSION], +[AC_MSG_CHECKING([if generic_permission take 4 arguments]) +LB_LINUX_TRY_COMPILE([ + #include +],[ + generic_permission(NULL, 0, 0, NULL); +],[ + AC_DEFINE(HAVE_GENERIC_PERMISSION_4ARGS, 1, + [generic_permission taken 4 arguments]) AC_MSG_RESULT([yes]) ],[ AC_MSG_RESULT([no]) @@ -2128,44 +2041,45 @@ LB_LINUX_TRY_COMPILE([ ]) # +# 2.6.38 export simple_setattr +# +AC_DEFUN([LC_EXPORT_SIMPLE_SETATTR], +[LB_CHECK_SYMBOL_EXPORT([simple_setattr], +[fs/libfs.c],[ +AC_DEFINE(HAVE_SIMPLE_SETATTR, 1, + [simple_setattr is exported by the kernel]) +],[ +]) +]) + +# # LC_PROG_LINUX # # Lustre linux kernel checks # AC_DEFUN([LC_PROG_LINUX], - [LC_LUSTRE_VERSION_H + [ LC_CONFIG_PINGER LC_CONFIG_CHECKSUM LC_CONFIG_LIBLUSTRE_RECOVERY LC_CONFIG_HEALTH_CHECK_WRITE LC_CONFIG_LRU_RESIZE - LC_QUOTA_MODULE LC_LLITE_LLOOP_MODULE # RHEL4 patches LC_EXPORT_TRUNCATE_COMPLETE - LC_EXPORT_TRUNCATE_RANGE LC_EXPORT_D_REHASH_COND LC_EXPORT___D_REHASH LC_EXPORT_NODE_TO_CPUMASK - LC_FUNC_GRAB_CACHE_PAGE_NOWAIT_GFP - LC_STRUCT_STATFS LC_FILEMAP_POPULATE - LC_D_ADD_UNIQUE LC_BIT_SPINLOCK_H - LC_XATTR_ACL - LC_POSIX_ACL_XATTR_H LC_CONST_ACL_SIZE - LC_STRUCT_INTENT_FILE - LC_CAPA_CRYPTO LC_CONFIG_RMTCLIENT LC_CONFIG_GSS - LC_FUNC_HAVE_CAN_SLEEP_ARG - LC_FUNC_F_OP_FLOCK LC_QUOTA_READ LC_COOKIE_FOLLOW_LINK LC_FUNC_RCU @@ -2178,7 +2092,6 @@ AC_DEFUN([LC_PROG_LINUX], # 2.6.12 LC_RW_TREE_LOCK - LC_EXPORT_SYNCHRONIZE_RCU # 2.6.15 LC_INODE_I_MUTEX @@ -2193,11 +2106,7 @@ AC_DEFUN([LC_PROG_LINUX], # 2.6.18 LC_NR_PAGECACHE LC_STATFS_DENTRY_PARAM - LC_VFS_KERN_MOUNT - LC_INVALIDATEPAGE_RETURN_INT LC_UMOUNTBEGIN_HAS_VFSMOUNT - LC_SEQ_LOCK - LC_EXPORT_FILEMAP_FDATAWRITE_RANGE LC_FLUSH_OWNER_ID if test x$enable_server = xyes ; then LC_EXPORT_INVALIDATE_MAPPING_PAGES @@ -2210,7 +2119,6 @@ AC_DEFUN([LC_PROG_LINUX], # 2.6.19 LC_INODE_BLKSIZE - LC_VFS_READDIR_U64_INO LC_FILE_WRITEV LC_FILE_READV @@ -2235,21 +2143,19 @@ AC_DEFUN([LC_PROG_LINUX], LC_VM_OP_FAULT LC_PROCFS_USERS LC_EXPORTFS_DECODE_FH - - # 2.6.24 - LC_HAVE_MMTYPES_H + + # 2.6.24 + LC_HAVE_MMTYPES_H LC_BIO_ENDIO_2ARG LC_FH_TO_DENTRY LC_PROCFS_DELETED LC_EXPORT_BDI_INIT - #2.6.25 - LC_MAPPING_CAP_WRITEBACK_DIRTY - # 2.6.26 LC_FS_STRUCT_USE_PATH # 2.6.27 + LC_PGMKWRITE_USE_VMFAULT LC_INODE_PERMISION_2ARGS LC_FILE_REMOVE_SUID LC_TRYLOCKPAGE @@ -2263,12 +2169,14 @@ AC_DEFUN([LC_PROG_LINUX], # 2.6.27.15-2 sles11 LC_BI_HW_SEGMENTS LC_HAVE_QUOTAIO_H - LC_VFS_SYMLINK_5ARGS LC_BDI_NAME LC_SB_ANY_QUOTA_ACTIVE LC_SB_HAS_QUOTA_ACTIVE LC_EXPORT_ADD_TO_PAGE_CACHE_LRU + # 2.6.29 + LC_SB_ANY_QUOTA_LOADED + # 2.6.30 LC_EXPORT_CPUMASK_OF_NODE @@ -2282,9 +2190,30 @@ AC_DEFUN([LC_PROG_LINUX], LC_BLK_QUEUE_MAX_SECTORS LC_BLK_QUEUE_MAX_SEGMENTS LC_SET_CPUS_ALLOWED + LC_CACHE_UPCALL + LC_EXPORT_GENERIC_ERROR_REMOVE_PAGE + LC_SELINUX_IS_ENABLED + LC_EXPORT_ACCESS_PROCESS_VM + + # 2.6.35, 3.0.0 + LC_FILE_FSYNC + LC_EXPORT_SIMPLE_SETATTR + + # 2.6.36 + LC_FS_STRUCT_RWLOCK + LC_SBOPS_EVICT_INODE + + # 2.6.37 + LC_KERNEL_LOCKED # 2.6.38 + LC_ATOMIC_MNT_COUNT LC_BLKDEV_GET_BY_DEV + LC_GENERIC_PERMISSION + LC_QUOTA_ON_USE_PATH + LC_DCACHE_LOCK + LC_D_COMPARE_7ARGS + LC_D_DELETE_CONST # 2.6.39 LC_REQUEST_QUEUE_UNPLUG_FN @@ -2295,6 +2224,7 @@ AC_DEFUN([LC_PROG_LINUX], LC_FUNC_DEV_SET_RDONLY LC_STACK_SIZE LC_QUOTA64 + LC_QUOTA_CONFIG fi ]) @@ -2522,6 +2452,7 @@ if test x$enable_split != xno; then fi ]) +# RHEL5(2.6.18) has tux_info AC_DEFUN([LC_TASK_CLENV_TUX_INFO], [AC_MSG_CHECKING([tux_info]) LB_LINUX_TRY_COMPILE([ @@ -2686,7 +2617,6 @@ AM_CONDITIONAL(LIBLUSTRE_TESTS, test x$enable_liblustre_tests = xyes) AM_CONDITIONAL(MPITESTS, test x$enable_mpitests = xyes, Build MPI Tests) AM_CONDITIONAL(CLIENT, test x$enable_client = xyes) AM_CONDITIONAL(SERVER, test x$enable_server = xyes) -AM_CONDITIONAL(QUOTA, test x$enable_quota_module = xyes) AM_CONDITIONAL(SPLIT, test x$enable_split = xyes) AM_CONDITIONAL(BLKID, test x$ac_cv_header_blkid_blkid_h = xyes) AM_CONDITIONAL(EXT2FS_DEVEL, test x$ac_cv_header_ext2fs_ext2fs_h = xyes) @@ -2713,6 +2643,7 @@ lustre/doc/Makefile lustre/include/Makefile lustre/include/lustre_ver.h lustre/include/linux/Makefile +lustre/include/darwin/Makefile lustre/include/lustre/Makefile lustre/kernel_patches/targets/2.6-rhel6.target lustre/kernel_patches/targets/2.6-rhel5.target @@ -2755,12 +2686,16 @@ lustre/obdecho/Makefile lustre/obdecho/autoMakefile lustre/obdfilter/Makefile lustre/obdfilter/autoMakefile +lustre/ofd/Makefile +lustre/ofd/autoMakefile lustre/osc/Makefile lustre/osc/autoMakefile lustre/ost/Makefile lustre/ost/autoMakefile lustre/osd-ldiskfs/Makefile lustre/osd-ldiskfs/autoMakefile +lustre/osd-zfs/Makefile +lustre/osd-zfs/autoMakefile lustre/mgc/Makefile lustre/mgc/autoMakefile lustre/mgs/Makefile