X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fautoconf%2Flustre-core.m4;h=b1ef9c21cc3dd7fae5e801ee554d869a6fa8d63d;hp=455ec77c72a4180f4f5ae06648b0c73c83d369b4;hb=1cea1eba5822af001eeba753630876ad121108ee;hpb=f7c68d305568873509766b3aff46e11ce3922d6f diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 455ec77..b1ef9c2 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -85,27 +85,6 @@ 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], @@ -125,24 +104,15 @@ AC_DEFUN([LC_LUSTRE_VERSION_H], # # 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 -],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_DEV_SET_RDONLY, 1, [kernel has new dev_set_rdonly]) +[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_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]) ]) ]) @@ -269,7 +239,7 @@ AC_DEFUN([LC_QUOTA_MODULE], fi ]) -# 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 +257,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 +298,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 +317,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 +337,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 +350,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,7 +371,10 @@ 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]) + AC_ERROR([ACL size can't be computed]) +],[ + AC_MSG_RESULT([can't check ACL size, make it 260]) + AC_DEFINE_UNQUOTED(XATTR_ACL_SIZE,260) ]) CFLAGS="$tmp_flags" ]) @@ -847,17 +711,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 @@ -976,11 +829,10 @@ EXTRA_KCFLAGS="-Werror" LB_LINUX_TRY_COMPILE([ #include ],[ - struct super_operations *sop = NULL; - sop->statfs((struct dentry *)0, (struct kstatfs*)0); + ((struct super_operations *)0)->statfs((struct dentry *)0, (struct kstatfs*)0); ],[ AC_DEFINE(HAVE_STATFS_DENTRY_PARAM, 1, - [super_ops.statfs() first parameter is dentry]) + [super_ops.statfs() first parameter is dentry]) AC_MSG_RESULT([yes]) ],[ AC_MSG_RESULT([no]) @@ -1156,19 +1008,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, @@ -1220,34 +1073,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], @@ -1365,7 +1190,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]) @@ -1570,15 +1395,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, @@ -1596,7 +1418,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, @@ -1616,26 +1438,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 @@ -1646,10 +1448,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, @@ -1663,6 +1464,24 @@ 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([ @@ -1813,7 +1632,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]) @@ -1843,26 +1662,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]) @@ -1905,7 +1704,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], @@ -1934,6 +1749,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]) @@ -2086,6 +1919,7 @@ AC_DEFUN([LC_SET_CPUS_ALLOWED], # 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]) @@ -2103,6 +1937,39 @@ 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.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. # @@ -2122,6 +1989,35 @@ LB_LINUX_TRY_COMPILE([ ]) # +# 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.38 export blkdev_get_by_dev # AC_DEFUN([LC_BLKDEV_GET_BY_DEV], @@ -2134,6 +2030,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], @@ -2141,8 +2079,7 @@ 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]) @@ -2172,6 +2109,18 @@ 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 @@ -2188,19 +2137,13 @@ AC_DEFUN([LC_PROG_LINUX], # 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 @@ -2222,7 +2165,6 @@ AC_DEFUN([LC_PROG_LINUX], # 2.6.12 LC_RW_TREE_LOCK - LC_EXPORT_SYNCHRONIZE_RCU # 2.6.15 LC_INODE_I_MUTEX @@ -2254,7 +2196,6 @@ AC_DEFUN([LC_PROG_LINUX], # 2.6.19 LC_INODE_BLKSIZE - LC_VFS_READDIR_U64_INO LC_FILE_WRITEV LC_FILE_READV @@ -2287,13 +2228,11 @@ AC_DEFUN([LC_PROG_LINUX], 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 @@ -2307,12 +2246,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 @@ -2326,13 +2267,22 @@ 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 + + # 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.38 + LC_ATOMIC_MNT_COUNT LC_BLKDEV_GET_BY_DEV LC_GENERIC_PERMISSION + LC_QUOTA_ON_USE_PATH # 2.6.39 LC_REQUEST_QUEUE_UNPLUG_FN @@ -2570,6 +2520,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([ @@ -2761,6 +2712,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