Branch b1_8

b=19808

i=shadow, yangsheng

Remove obsolete config check.

diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index 7aa6acf..8e7efaa 100644 (file)
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -47,190 +47,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 <linux/fshooks.h>
-       ],[],[
-               AC_MSG_RESULT([yes])
-       ],[
-               AC_MSG_RESULT([no])
-               AC_MSG_WARN([You might have better luck with gcc 3.3.x.])
-               AC_MSG_WARN([You can set CC=gcc33 before running configure.])
-               AC_MSG_ERROR([Your compiler cannot build fshooks.h.])
-       ])
-$1
-],[
-$2
-])
-])
-
-#
-
-#
-# LC_FUNC_RELEASEPAGE_WITH_GFP
-#
-# if ->releasepage() takes a gfp_t arg in 2.6.9
-# This kernel defines gfp_t (HAS_GFP_T) but doesn't use it for this function,
-# while others either don't have gfp_t or pass gfp_t as the parameter.
-#
-AC_DEFUN([LC_FUNC_RELEASEPAGE_WITH_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
-])
-
-# 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 <linux/fs.h>
-],[
-       int (*foo)(struct address_space *)= filemap_fdatawrite;
-],[
-       AC_MSG_RESULT([yes])
-       AC_DEFINE(HAVE_FILEMAP_FDATAWRITE, 1, [filemap_fdatawrite() found])
-],[
-       AC_MSG_RESULT([no])
-])
-])
-
-#
-# LC_HEADER_MM_INLINE
-#
-# RHEL kernels define page_count in mm_inline.h
-#
-AC_DEFUN([LC_HEADER_MM_INLINE],
-[AC_MSG_CHECKING([if kernel has mm_inline.h header])
-LB_LINUX_TRY_COMPILE([
-       #include <linux/mm_inline.h>
-],[
-       #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 <linux/fs.h>
-       #include <linux/version.h>
-],[
-       struct inode i;
-       return (char *)&i.i_alloc_sem - (char *)&i;
-],[
-       AC_MSG_RESULT([yes])
-       AC_DEFINE(HAVE_I_ALLOC_SEM, 1, [struct inode has i_alloc_sem])
-],[
-       AC_MSG_RESULT([no])
-])
-])
-
-#
-# LC_FUNC_REGISTER_CACHE
-#
-# if register_cache() is defined by kernel
-# 
-# There are two ways to shrink one customized cache in linux kernels. For the
-# kernels are prior than 2.6.5(?), register_cache() is used, and for latest 
-# kernels, set_shrinker() is used instead.
-#
-AC_DEFUN([LC_FUNC_REGISTER_CACHE],
-[AC_MSG_CHECKING([if kernel defines cache pressure hook])
+AC_DEFUN([LC_STACK_SIZE],
+[AC_MSG_CHECKING([stack size big than 8k])
 LB_LINUX_TRY_COMPILE([
-       #include <linux/mm.h>
+       #include <linux/thread_info.h>
 ],[
-       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 <linux/list.h>
-               #include <linux/cache_def.h>
-       ],[
-               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 <linux/list.h>
-                       #include <linux/cache_def.h>
-               ],[
-                       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
 ])
 
 #
@@ -243,6 +74,7 @@ AC_DEFUN([LC_FUNC_DEV_SET_RDONLY],
 [AC_MSG_CHECKING([if kernel has new dev_set_rdonly])
 LB_LINUX_TRY_COMPILE([
         #include <linux/fs.h>
+        #include <linux/blkdev.h>
 ],[
         #ifndef HAVE_CLEAR_RDONLY_ON_PUT
         #error needs to be patched by lustre kernel patches from Lustre version 1.4.3 or above.
@@ -251,7 +83,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.])
 ])
 ])
@@ -266,19 +98,9 @@ AC_DEFUN([LC_CONFIG_BACKINGFS],
 BACKINGFS="ldiskfs"
 
 if test x$with_ldiskfs = xno ; then
-       BACKINGFS="ext3"
-
        if test x$enable_server = xyes ; 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
@@ -411,35 +233,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 <linux/mm.h>
+        #include <linux/fs.h>
 ],[
-       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 <linux/fs.h>
 ],[
-        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([
@@ -455,6 +313,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([
@@ -469,6 +330,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])
@@ -487,9 +351,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],[
@@ -506,28 +368,10 @@ AC_DEFUN([LC_XATTR_ACL],
 [])
 ])
 
+
 #
-# LC_LINUX_FIEMAP_H
-#
-# If we have fiemap.h
-# after 2.6.27 use fiemap.h in include/linux
+# added in 2.6.16
 #
-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 <linux/fiemap.h>
-        ],[],[
-                AC_MSG_RESULT([yes])
-                AC_DEFINE(HAVE_LINUX_FIEMAP_H, 1, [Kernel has fiemap.h])
-        ],[
-                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([
@@ -545,6 +389,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])
@@ -575,7 +422,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"
@@ -603,7 +452,7 @@ AC_DEFUN([LC_LUSTRE_VERSION_H],
 ])
 
 #
-# check for FS_RENAME_DOES_D_MOVE flag
+# 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])
@@ -619,135 +468,6 @@ LB_LINUX_TRY_COMPILE([
 ])
 ])
 
-#
-# 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 <linux/fs.h>
-],[
-        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 <linux/fs.h>
-],[
-        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 <linux/fs.h>
-],[
-        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 <linux/fs.h>
-],[
-        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 <linux/fs.h>
-],[
-        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 <linux/sched.h>
-],[
-       struct task_struct *p;
-       
-       p = p->p_pptr;
-],[
-       AC_MSG_RESULT([yes])
-       AC_DEFINE(HAVE_TASK_PPTR, 1, [task p_pptr found])
-],[
-       AC_MSG_RESULT([no])
-])
-])
 
 #
 # LC_FUNC_F_OP_FLOCK
@@ -865,8 +585,7 @@ 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])
@@ -884,7 +603,7 @@ LB_LINUX_TRY_COMPILE([
 ])
 
 # LC_UMOUNTBEGIN_HAS_VFSMOUNT
-# more 2.6 API changes. 2.6.18 umount_begin has different parameters
+# after 2.6.18 umount_begin has different parameters
 AC_DEFUN([LC_UMOUNTBEGIN_HAS_VFSMOUNT],
 [AC_MSG_CHECKING([if umount_begin needs vfsmount parameter instead of super_block])
 tmp_flags="$EXTRA_KCFLAGS"
@@ -1094,8 +813,7 @@ LB_LINUX_TRY_COMPILE([
 ])
 ])
 
-# RHEL5 in FS-cache patch rename PG_checked flag
-# into PG_fs_misc
+# RHEL5 in FS-cache patch rename PG_checked flag into PG_fs_misc
 AC_DEFUN([LC_PG_FS_MISC],
 [AC_MSG_CHECKING([kernel has PG_fs_misc])
 LB_LINUX_TRY_COMPILE([
@@ -1310,7 +1028,26 @@ LB_LINUX_TRY_COMPILE([
 EXTRA_KCFLAGS="$tmp_flags"
 ])
 
-# 2.6.18
+#
+# 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.23 have return type 'void' for unregister_blkdev
@@ -1394,19 +1131,13 @@ LB_LINUX_TRY_COMPILE([
 ])
 ])
 
-#2.6.23 has new shrinker API
+# 2.6.23 has new shrinker API
 AC_DEFUN([LC_REGISTER_SHRINKER],
-[AC_MSG_CHECKING([if kernel has register_shrinker])
-LB_LINUX_TRY_COMPILE([
-        #include <linux/mm.h>
-],[
-        register_shrinker(NULL);
-], [
-        AC_MSG_RESULT([yes])
+[LB_CHECK_SYMBOL_EXPORT([register_shrinker],
+[mm/vmscan.c],[
         AC_DEFINE(HAVE_REGISTER_SHRINKER, 1,
-                [if kernel has register_shrinker])
+                  [kernel exports register_shrinker])
 ],[
-        AC_MSG_RESULT([no])
 ])
 ])
 
@@ -1535,6 +1266,28 @@ LB_LINUX_TRY_COMPILE([
 ])
 ])
 
+
+#
+# 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 <linux/fiemap.h>
+        ],[],[
+                AC_MSG_RESULT([yes])
+                AC_DEFINE(HAVE_LINUX_FIEMAP_H, 1, [Kernel has fiemap.h])
+        ],[
+                AC_MSG_RESULT([no])
+        ])
+],
+[])
+])
+
 #2.6.27
 AC_DEFUN([LC_INODE_PERMISION_2ARGS],
 [AC_MSG_CHECKING([inode_operations->permission have two args])
@@ -1794,23 +1547,6 @@ LB_LINUX_TRY_COMPILE([
 ])
 
 #
-# Ensure stack size big than 8k in Lustre server
-AC_DEFUN([LC_STACK_SIZE],
-[AC_MSG_CHECKING([stack size big than 8k])
-LB_LINUX_TRY_COMPILE([
-       #include <linux/thread_info.h>
-],[
-        #if THREAD_SIZE < 8192
-        #error "stack size < 8192"
-        #endif
-],[
-        AC_MSG_RESULT(yes)
-],[
-        AC_MSG_ERROR([Lustre requires that Linux is configured with at least a 8KB stack.])
-])
-])
-
-#
 # LC_PROG_LINUX
 #
 # Lustre linux kernel checks
@@ -1818,6 +1554,7 @@ LB_LINUX_TRY_COMPILE([
 AC_DEFUN([LC_PROG_LINUX],
          [LC_LUSTRE_VERSION_H
           if test x$enable_server = xyes ; then
+              LC_FUNC_DEV_SET_RDONLY
               LC_CONFIG_BACKINGFS
               LC_STACK_SIZE
           fi
@@ -1841,15 +1578,8 @@ AC_DEFUN([LC_PROG_LINUX],
           LC_EXPORT_NODE_TO_CPUMASK
 
           LC_FUNC_RELEASEPAGE_WITH_GFP
-          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
@@ -1859,7 +1589,6 @@ AC_DEFUN([LC_PROG_LINUX],
           LC_EXPORT___IGET
           LC_FUNC_MS_FLOCK_LOCK
           LC_FUNC_HAVE_CAN_SLEEP_ARG
-          LC_FUNC_F_OP_FLOCK
           LC_QUOTA_READ
           LC_COOKIE_FOLLOW_LINK
           LC_FUNC_RCU

diff --git a/lustre/include/linux/lustre_compat25.h b/lustre/include/linux/lustre_compat25.h
index 34ea09e..da0cb36 100644 (file)
--- a/lustre/include/linux/lustre_compat25.h
+++ b/lustre/include/linux/lustre_compat25.h
@@ -304,7 +304,7 @@ static inline int mapping_has_pages(struct address_space *mapping)
 #define ll_vfs_symlink(dir, dentry, mnt, path, mode) \
                        vfs_symlink(dir, dentry, path)
 #endif
-#endif
+#endif /* HAVE_SECURITY_PLUG */
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,7))
 #define ll_set_dflags(dentry, flags) do { dentry->d_vfs_flags |= flags; } while(0)
@@ -322,32 +322,18 @@ static inline int mapping_has_pages(struct address_space *mapping)
                 (type *)( (char *)__mptr - offsetof(type,member) );})
 #endif
 
-#ifdef HAVE_I_ALLOC_SEM
-#define UP_WRITE_I_ALLOC_SEM(i)   do { up_write(&(i)->i_alloc_sem); } while (0)
-#define DOWN_WRITE_I_ALLOC_SEM(i) do { down_write(&(i)->i_alloc_sem); } while(0)
+#define UP_WRITE_I_ALLOC_SEM(i)   up_write(&(i)->i_alloc_sem)
+#define DOWN_WRITE_I_ALLOC_SEM(i) down_write(&(i)->i_alloc_sem)
 #define LASSERT_I_ALLOC_SEM_WRITE_LOCKED(i) LASSERT(down_read_trylock(&(i)->i_alloc_sem) == 0)
 
-#define UP_READ_I_ALLOC_SEM(i)    do { up_read(&(i)->i_alloc_sem); } while (0)
-#define DOWN_READ_I_ALLOC_SEM(i)  do { down_read(&(i)->i_alloc_sem); } while (0)
+#define UP_READ_I_ALLOC_SEM(i)    up_read(&(i)->i_alloc_sem)
+#define DOWN_READ_I_ALLOC_SEM(i)  down_read(&(i)->i_alloc_sem)
 #define LASSERT_I_ALLOC_SEM_READ_LOCKED(i) LASSERT(down_write_trylock(&(i)->i_alloc_sem) == 0)
-#else
-#define UP_READ_I_ALLOC_SEM(i)              do { } while (0)
-#define DOWN_READ_I_ALLOC_SEM(i)            do { } while (0)
-#define LASSERT_I_ALLOC_SEM_READ_LOCKED(i)  do { } while (0)
-
-#define UP_WRITE_I_ALLOC_SEM(i)             do { } while (0)
-#define DOWN_WRITE_I_ALLOC_SEM(i)           do { } while (0)
-#define LASSERT_I_ALLOC_SEM_WRITE_LOCKED(i) do { } while (0)
-#endif
 
 #ifndef HAVE_GRAB_CACHE_PAGE_NOWAIT_GFP
 #define grab_cache_page_nowait_gfp(x, y, z) grab_cache_page_nowait((x), (y))
 #endif
 
-#ifndef HAVE_FILEMAP_FDATAWRITE
-#define filemap_fdatawrite(mapping)      filemap_fdatasync(mapping)
-#endif
-
 #include <linux/mpage.h>        /* for generic_writepages */
 #ifndef HAVE_FILEMAP_FDATAWRITE_RANGE
 #include <linux/backing-dev.h>  /* for mapping->backing_dev_info */
@@ -385,11 +371,10 @@ static inline int filemap_fdatawrite_range(struct address_space *mapping,
 #else
 int filemap_fdatawrite_range(struct address_space *mapping,
                              loff_t start, loff_t end);
-#endif
+#endif /* HAVE_FILEMAP_FDATAWRITE_RANGE */
 
 #ifdef HAVE_VFS_KERN_MOUNT
-static inline 
-struct vfsmount *
+static inline struct vfsmount *
 ll_kern_mount(const char *fstype, int flags, const char *name, void *data)
 {
         struct file_system_type *type = get_fs_type(fstype);
@@ -410,11 +395,6 @@ ll_kern_mount(const char *fstype, int flags, const char *name, void *data)
 #define ll_do_statfs(sb, sfs) (sb)->s_op->statfs((sb), (sfs))
 #endif
 
-/* task_struct */
-#ifndef HAVE_TASK_PPTR
-#define p_pptr parent
-#endif
-
 #ifdef HAVE_UNREGISTER_BLKDEV_RETURN_INT
 #define ll_unregister_blkdev(a,b)       unregister_blkdev((a),(b))
 #else
@@ -460,7 +440,7 @@ int ll_unregister_blkdev(unsigned int dev, const char *name)
 #define ll_vfs_mknod(dir,entry,mnt,mode,dev)            \
                 vfs_mknod(dir,entry,mnt,mode,dev)
 #define ll_security_inode_unlink(dir,entry,mnt)         \
-                security_inode_unlink(dir,entry,mnt)     
+                security_inode_unlink(dir,entry,mnt)
 #define ll_vfs_rename(old,old_dir,mnt,new,new_dir,mnt1) \
                 vfs_rename(old,old_dir,mnt,new,new_dir,mnt1)
 #else
@@ -469,10 +449,10 @@ int ll_unregister_blkdev(unsigned int dev, const char *name)
 #define ll_vfs_link(old,mnt,dir,new,mnt1)       vfs_link(old,dir,new)
 #define ll_vfs_unlink(inode,entry,mnt)          vfs_unlink(inode,entry)
 #define ll_vfs_mknod(dir,entry,mnt,mode,dev)    vfs_mknod(dir,entry,mode,dev)
-#define ll_security_inode_unlink(dir,entry,mnt) security_inode_unlink(dir,entry)     
+#define ll_security_inode_unlink(dir,entry,mnt) security_inode_unlink(dir,entry)
 #define ll_vfs_rename(old,old_dir,mnt,new,new_dir,mnt1) \
                 vfs_rename(old,old_dir,new,new_dir)
-#endif
+#endif /* HAVE_SECURITY_PLUG */
 
 #ifndef for_each_possible_cpu
 #define for_each_possible_cpu(i) for_each_cpu(i)
@@ -511,7 +491,7 @@ void remove_shrinker(struct shrinker *shrinker)
         unregister_shrinker(shrinker);
         kfree(shrinker);
 }
-#endif
+#endif /* HAVE_REGISTER_SHRINKER */
 
 #ifdef HAVE_BIO_ENDIO_2ARG
 #define cfs_bio_io_error(a,b)   bio_io_error((a))

diff --git a/lustre/llite/dcache.c b/lustre/llite/dcache.c
index 0aa0984..7602d80 100644 (file)
--- a/lustre/llite/dcache.c
+++ b/lustre/llite/dcache.c
@@ -666,7 +666,7 @@ out_sa:
 }
 
 #ifdef HAVE_VFS_INTENT_PATCHES
-static int ll_revalidate_nd(struct dentry *dentry, struct nameidata *nd)
+int ll_revalidate_nd(struct dentry *dentry, struct nameidata *nd)
 {
         int rc;
         ENTRY;

diff --git a/lustre/llite/llite_internal.h b/lustre/llite/llite_internal.h
index 530689e..0a6fc23 100644 (file)
--- a/lustre/llite/llite_internal.h
+++ b/lustre/llite/llite_internal.h
@@ -629,31 +629,6 @@ enum {
 };
 extern char *llap_origins[];
 
-#ifdef HAVE_REGISTER_CACHE
-#include <linux/cache_def.h>
-#define ll_register_cache(cache) register_cache(cache)
-#define ll_unregister_cache(cache) unregister_cache(cache)
-#elif defined(HAVE_SHRINKER_CACHE)
-struct cache_definition {
-        const char *name;
-        shrinker_t shrink;
-        struct shrinker *shrinker;
-};
-
-#define ll_register_cache(cache) do {                                   \
-        struct cache_definition *c = (cache);                           \
-        c->shrinker = set_shrinker(DEFAULT_SEEKS, c->shrink);           \
-} while(0)
-
-#define ll_unregister_cache(cache) do {                                 \
-        remove_shrinker((cache)->shrinker);                             \
-        (cache)->shrinker = NULL;                                       \
-} while(0)
-#else
-#define ll_register_cache(cache) do {} while (0)
-#define ll_unregister_cache(cache) do {} while (0)
-#endif
-
 void ll_ra_read_init(struct file *f, struct ll_ra_read *rar,
                      loff_t offset, size_t count);
 void ll_ra_read_ex(struct file *f, struct ll_ra_read *rar);
@@ -836,6 +811,7 @@ void ll_lli_init(struct ll_inode_info *lli);
 int ll_fill_super(struct super_block *sb);
 void ll_put_super(struct super_block *sb);
 void ll_kill_super(struct super_block *sb);
+int ll_shrink_cache(int nr_to_scan, gfp_t gfp_mask);
 struct inode *ll_inode_from_lock(struct ldlm_lock *lock);
 void ll_clear_inode(struct inode *inode);
 int ll_setattr_raw(struct inode *inode, struct iattr *attr);

diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index 4b3d794..9ace0cb 100644 (file)
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -1295,35 +1295,23 @@ void ll_put_super(struct super_block *sb)
         EXIT;
 } /* client_put_super */
 
-#if defined(HAVE_REGISTER_CACHE) || defined(HAVE_SHRINKER_CACHE)
-
-#if defined(HAVE_CACHE_RETURN_INT)
-static int
-#else
-static void
-#endif
-ll_shrink_cache(int priority, unsigned int gfp_mask)
+int ll_shrink_cache(int nr_to_scan, gfp_t gfp_mask)
 {
         struct ll_sb_info *sbi;
         int count = 0;
 
+        if (gfp_mask & __GFP_FS)
+                return -1;
+
         /* don't race with umount */
         down_read(&ll_sb_sem);
         list_for_each_entry(sbi, &ll_super_blocks, ll_list)
-                count += llap_shrink_cache(sbi, priority);
+                count += llap_shrink_cache(sbi, nr_to_scan);
         up_read(&ll_sb_sem);
 
-#if defined(HAVE_CACHE_RETURN_INT)
         return count;
-#endif
 }
 
-struct cache_definition ll_cache_definition = {
-        .name = "llap_cache",
-        .shrink = ll_shrink_cache
-};
-#endif /* HAVE_REGISTER_CACHE || HAVE_SHRINKER_CACHE */
-
 struct inode *ll_inode_from_lock(struct ldlm_lock *lock)
 {
         struct inode *inode = NULL;

diff --git a/lustre/llite/lproc_llite.c b/lustre/llite/lproc_llite.c
index 9daf6d4..266ade3 100644 (file)
--- a/lustre/llite/lproc_llite.c
+++ b/lustre/llite/lproc_llite.c
@@ -757,7 +757,7 @@ void ll_stats_ops_tally(struct ll_sb_info *sbi, int op, int count)
                  sbi->ll_stats_track_id == current->pid)
                 lprocfs_counter_add(sbi->ll_stats, op, count);
         else if (sbi->ll_stats_track_type == STATS_TRACK_PPID &&
-                 sbi->ll_stats_track_id == current->p_pptr->pid)
+                 sbi->ll_stats_track_id == current->parent->pid)
                 lprocfs_counter_add(sbi->ll_stats, op, count);
         else if (sbi->ll_stats_track_type == STATS_TRACK_GID &&
                  sbi->ll_stats_track_id == current->gid)

diff --git a/lustre/llite/rw.c b/lustre/llite/rw.c
index da675c7..111fca7 100644 (file)
--- a/lustre/llite/rw.c
+++ b/lustre/llite/rw.c
@@ -640,35 +640,24 @@ static inline int llap_shrink_cache_internal(struct ll_sb_info *sbi,
  * it deduces how many pages should be reaped from each cpu in proportion as
  * their own # of page count(llpd_count).
  */
-int llap_shrink_cache(struct ll_sb_info *sbi, int shrink_fraction)
+int llap_shrink_cache(struct ll_sb_info *sbi, int nr_to_scan)
 {
         unsigned long total, want, percpu_want, count = 0;
         int cpu, nr_cpus;
 
         total = lcounter_read_positive(&sbi->ll_async_page_count);
-        if (total == 0)
-                return 0;
-
-#ifdef HAVE_SHRINKER_CACHE
-        want = shrink_fraction;
-        if (want == 0)
+        if (total == 0 || nr_to_scan == 0)
                 return total;
-#else
-        /* There can be a large number of llaps (600k or more in a large
-         * memory machine) so the VM 1/6 shrink ratio is likely too much.
-         * Since we are freeing pages also, we don't necessarily want to
-         * shrink so much.  Limit to 40MB of pages + llaps per call. */
-        if (shrink_fraction <= 0)
-                want = total - sbi->ll_async_page_max + 32*num_online_cpus();
-        else
-                want = (total + shrink_fraction - 1) / shrink_fraction;
-#endif
 
+        want = nr_to_scan;
+
+        /* Since we are freeing pages also, we don't necessarily want to
+         * shrink so much.  Limit to 40MB of pages + llaps per call. */
         if (want > 40 << (20 - CFS_PAGE_SHIFT))
                 want = 40 << (20 - CFS_PAGE_SHIFT);
 
-        CDEBUG(D_CACHE, "shrinking %lu of %lu pages (1/%d)\n",
-               want, total, shrink_fraction);
+        CDEBUG(D_CACHE, "shrinking %lu of %lu pages (asked for %u)\n",
+               want, total, nr_to_scan);
 
         nr_cpus = num_possible_cpus();
         cpu = sbi->ll_async_page_clock_hand;
@@ -693,11 +682,7 @@ int llap_shrink_cache(struct ll_sb_info *sbi, int shrink_fraction)
         CDEBUG(D_CACHE, "shrank %lu/%lu and left %lu unscanned\n",
                count, want, total);
 
-#ifdef HAVE_SHRINKER_CACHE
         return lcounter_read_positive(&sbi->ll_async_page_count);
-#else
-        return count;
-#endif
 }
 
 /* Rebalance the async page queue len for each cpu. We hope that the cpu

diff --git a/lustre/llite/super25.c b/lustre/llite/super25.c
index 6d8103a..fa4e8e7 100644 (file)
--- a/lustre/llite/super25.c
+++ b/lustre/llite/super25.c
@@ -104,6 +104,8 @@ struct super_operations lustre_super_operations =
 
 void lustre_register_client_process_config(int (*cpc)(struct lustre_cfg *lcfg));
 
+static struct shrinker *ll_shrinker;
+
 static int __init init_lustre_lite(void)
 {
         int i, rc, seed[2];
@@ -127,7 +129,7 @@ static int __init init_lustre_lite(void)
                               proc_mkdir("llite", proc_lustre_root) : NULL;
 
         init_rwsem(&ll_sb_sem);
-        ll_register_cache(&ll_cache_definition);
+        ll_shrinker = set_shrinker(DEFAULT_SEEKS, ll_shrink_cache);
 
         lustre_register_client_fill_super(ll_fill_super);
         lustre_register_kill_super_cb(ll_kill_super);
@@ -162,7 +164,7 @@ static void __exit exit_lustre_lite(void)
 
         lustre_register_client_process_config(NULL);
 
-        ll_unregister_cache(&ll_cache_definition);
+        remove_shrinker(ll_shrinker);
 
         ll_destroy_inodecache();
         rc = cfs_mem_cache_destroy(ll_file_data_slab);

diff --git a/lustre/mds/mds_internal.h b/lustre/mds/mds_internal.h
index 9a5fc5e..2a60940 100644 (file)
--- a/lustre/mds/mds_internal.h
+++ b/lustre/mds/mds_internal.h
@@ -71,7 +71,6 @@ static inline void mds_export_evict(struct obd_export *exp)
 /* Open counts for files.  No longer atomic, must hold inode->i_sem */
 # define mds_inode_oatomic(inode)    ((inode)->i_cindex)
 
-#ifdef HAVE_I_ALLOC_SEM
 #define MDS_UP_READ_ORPHAN_SEM(i)          UP_READ_I_ALLOC_SEM(i)
 #define MDS_DOWN_READ_ORPHAN_SEM(i)        DOWN_READ_I_ALLOC_SEM(i)
 #define LASSERT_MDS_ORPHAN_READ_LOCKED(i)  LASSERT_I_ALLOC_SEM_READ_LOCKED(i)
@@ -80,16 +79,6 @@ static inline void mds_export_evict(struct obd_export *exp)
 #define MDS_DOWN_WRITE_ORPHAN_SEM(i)       DOWN_WRITE_I_ALLOC_SEM(i)
 #define LASSERT_MDS_ORPHAN_WRITE_LOCKED(i) LASSERT_I_ALLOC_SEM_WRITE_LOCKED(i)
 #define MDS_PACK_MD_LOCK 1
-#else
-#define MDS_UP_READ_ORPHAN_SEM(i)          do { up(&(i)->i_sem); } while (0)
-#define MDS_DOWN_READ_ORPHAN_SEM(i)        do { down(&(i)->i_sem); } while (0)
-#define LASSERT_MDS_ORPHAN_READ_LOCKED(i)  LASSERT(down_trylock(&(i)->i_sem)!=0)
-
-#define MDS_UP_WRITE_ORPHAN_SEM(i)         do { up(&(i)->i_sem); } while (0)
-#define MDS_DOWN_WRITE_ORPHAN_SEM(i)       do { down(&(i)->i_sem); } while (0)
-#define LASSERT_MDS_ORPHAN_WRITE_LOCKED(i) LASSERT(down_trylock(&(i)->i_sem)!=0)
-#define MDS_PACK_MD_LOCK 0
-#endif
 
 static inline int mds_orphan_open_count(struct inode *inode)
 {