Whamcloud - gitweb
LU-1994 kernel: 3.5 kernel encode_fh passes in parent inode
[fs/lustre-release.git] / lustre / autoconf / lustre-core.m4
index 9e88d8c..7745767 100644 (file)
@@ -211,9 +211,9 @@ 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.])
-])
+[LB_LINUX_CONFIG_IM([QUOTA],[],[
+        AC_MSG_ERROR([Lustre quota requires that CONFIG_QUOTA is enabled in your kernel.])
+       ])
 ])
 
 # truncate_complete_page() was exported from RHEL5/SLES10, but not in SLES11 SP0 (2.6.27)
@@ -319,7 +319,7 @@ AC_DEFUN([LC_BIT_SPINLOCK_H],
 AC_DEFUN([LC_CONST_ACL_SIZE],
 [AC_MSG_CHECKING([calc acl size])
 tmp_flags="$CFLAGS"
-CFLAGS="$CFLAGS -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -include $AUTOCONF_HDIR/autoconf.h $EXTRA_KCFLAGS"
+CFLAGS="$CFLAGS -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -I$LINUX/arch/`echo $target_cpu|sed -e 's/powerpc64/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -include $AUTOCONF_HDIR/autoconf.h $EXTRA_KCFLAGS"
 AC_TRY_RUN([
         #define __KERNEL__
         #include <linux/types.h>
@@ -516,57 +516,11 @@ EXTRA_KCFLAGS="$tmp_flags"
 
 #2.6.18 + RHEL5 (fc6)
 
-# RHEL5 in FS-cache patch rename PG_checked flag into PG_fs_misc
-AC_DEFUN([LC_PG_FS_MISC],
-[AC_MSG_CHECKING([kernel has PG_fs_misc])
-LB_LINUX_TRY_COMPILE([
-        #include <linux/mm.h>
-        #include <linux/page-flags.h>
-],[
-        #ifndef PG_fs_misc
-        #error PG_fs_misc not defined in kernel
-        #endif
-],[
-        AC_MSG_RESULT(yes)
-        AC_DEFINE(HAVE_PG_FS_MISC, 1,
-                  [is kernel have PG_fs_misc])
-],[
-        AC_MSG_RESULT(no)
-])
-])
-
-# RHEL5 PageChecked and SetPageChecked defined
-AC_DEFUN([LC_PAGE_CHECKED],
-[AC_MSG_CHECKING([kernel has PageChecked and SetPageChecked])
-LB_LINUX_TRY_COMPILE([
-        #include <linux/mm.h>
-#ifdef HAVE_LINUX_MMTYPES_H
-        #include <linux/mm_types.h>
-#endif
-        #include <linux/page-flags.h>
-],[
-        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
-],[
-        AC_MSG_RESULT(yes)
-        AC_DEFINE(HAVE_PAGE_CHECKED, 1,
-                  [does kernel have PageChecked and SetPageChecked])
-],[
-        AC_MSG_RESULT(no)
-])
-])
-
 #
 # LC_LINUX_FIEMAP_H
 #
-# If we have fiemap.h
-# after 2.6.27 use fiemap.h in include/linux
+# fiemap.h is added since v2.6.28
+# RHEL5 2.6.18 has it, while SLES10 2.6.27 does not
 #
 AC_DEFUN([LC_LINUX_FIEMAP_H],
 [LB_CHECK_FILE([$LINUX/include/linux/fiemap.h],[
@@ -586,24 +540,6 @@ AC_DEFUN([LC_LINUX_FIEMAP_H],
 
 # 2.6.19
 
-# 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 <linux/fs.h>
-],[
-       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_FILE_WRITEV
 # 2.6.19 replaced writev with aio_write
 AC_DEFUN([LC_FILE_WRITEV],
@@ -1005,7 +941,6 @@ LB_LINUX_TRY_COMPILE([
 ])
 ])
 
-
 #
 # 2.6.27
 #
@@ -1046,6 +981,27 @@ LB_LINUX_TRY_COMPILE([
 EXTRA_KCFLAGS="$tmp_flags"
 ])
 
+AC_DEFUN([LC_PGMKWRITE_COMPACT],
+[AC_MSG_CHECKING([if kernel .page_mkwrite is located in vm_operation_struct._pmkw])
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_LINUX_TRY_COMPILE([
+       #include <linux/mm.h>
+],[
+       struct vm_operations_struct *vm_ops;
+
+       vm_ops = NULL;
+       vm_ops->_pmkw.page_mkwrite(NULL, NULL);
+], [
+       AC_MSG_RESULT([yes])
+       AC_DEFINE(HAVE_PGMKWRITE_COMPACT, 1,
+               [kernel .page_mkwrite is located in vm_operation_struct._pmkw])
+],[
+       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([
@@ -1064,22 +1020,6 @@ LB_LINUX_TRY_COMPILE([
 ])
 ])
 
-# 2.6.27 has file_remove_suid instead of remove_suid
-AC_DEFUN([LC_FILE_REMOVE_SUID],
-[AC_MSG_CHECKING([kernel has file_remove_suid])
-LB_LINUX_TRY_COMPILE([
-        #include <linux/fs.h>
-],[
-        file_remove_suid(NULL);
-],[
-        AC_DEFINE(HAVE_FILE_REMOVE_SUID, 1,
-                  [kernel have file_remove_suid])
-        AC_MSG_RESULT([yes])
-],[
-        AC_MSG_RESULT([no])
-])
-])
-
 # 2.6.27 have new page locking API
 AC_DEFUN([LC_TRYLOCKPAGE],
 [AC_MSG_CHECKING([kernel uses trylock_page for page lock])
@@ -1317,6 +1257,22 @@ LB_LINUX_TRY_COMPILE([
 
 # 2.6.32
 
+# 2.6.32 introduced inode_newsize_ok
+AC_DEFUN([LC_VFS_INODE_NEWSIZE_OK],
+[AC_MSG_CHECKING([if inode_newsize_ok is defined])
+LB_LINUX_TRY_COMPILE([
+       #include <linux/fs.h>
+],[
+       return inode_newsize_ok(NULL, 0);
+],[
+       AC_MSG_RESULT(yes)
+       AC_DEFINE(HAVE_VFS_INODE_NEWSIZE_OK, 1,
+                 [inode_newsize_ok is defined])
+],[
+       AC_MSG_RESULT(no)
+])
+])
+
 # 2.6.32 changes cache_detail's member cache_request to cache_upcall
 # in kernel commit bc74b4f5e63a09fb78e245794a0de1e5a2716bbe
 AC_DEFUN([LC_CACHE_UPCALL],
@@ -1383,7 +1339,7 @@ LB_LINUX_TRY_COMPILE([
 AC_DEFUN([LC_BDI_NAME],
 [AC_MSG_CHECKING([if backing_device_info has name field])
 LB_LINUX_TRY_COMPILE([
-        #include <linux/blkkdev.h>
+        #include <linux/blkdev.h>
 ],[
         struct backing_dev_info bdi;
         bdi.name = NULL;
@@ -1757,6 +1713,18 @@ EXTRA_KCFLAGS="$tmp_flags"
 ])
 
 #
+# 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])
+],[
+])
+])
+
+#
 # 2.6.39 remove unplug_fn from request_queue.
 #
 AC_DEFUN([LC_REQUEST_QUEUE_UNPLUG_FN],
@@ -1775,18 +1743,111 @@ LB_LINUX_TRY_COMPILE([
 ])
 
 #
-# 2.6.38 generic_permission taken 4 paremater.
+# 2.6.39 replace get_sb with mount in struct file_system_type
+#
+AC_DEFUN([LC_HAVE_FSTYPE_MOUNT],
+[AC_MSG_CHECKING([if file_system_type has mount field])
+LB_LINUX_TRY_COMPILE([
+       #include <linux/fs.h>
+],[
+       struct file_system_type fst;
+       void *i = (void *) fst.mount;
+],[
+       AC_DEFINE(HAVE_FSTYPE_MOUNT, 1,
+               [struct file_system_type has mount field])
+       AC_MSG_RESULT([yes])
+],[
+       AC_MSG_RESULT([no])
+])
+])
+
+#
+# 2.6.38 generic_permission taken 4 parameters.
 # in fact, it means rcu-walk aware permission bring.
 #
+# 3.1 generic_permission taken 2 parameters.
+# see kernel commit 2830ba7f34ebb27c4e5b8b6ef408cd6d74860890
+#
 AC_DEFUN([LC_GENERIC_PERMISSION],
-[AC_MSG_CHECKING([if generic_permission take 4 arguments])
+[AC_MSG_CHECKING([if generic_permission take 2 or 4 arguments])
+LB_LINUX_TRY_COMPILE([
+       #include <linux/fs.h>
+],[
+       generic_permission(NULL, 0);
+],[
+       AC_DEFINE(HAVE_GENERIC_PERMISSION_2ARGS, 1,
+                 [generic_permission taken 2 arguments])
+       AC_MSG_RESULT([yes, 2 args])
+],[
+       LB_LINUX_TRY_COMPILE([
+               #include <linux/fs.h>
+       ],[
+               generic_permission(NULL, 0, 0, NULL);
+       ],[
+               AC_DEFINE(HAVE_GENERIC_PERMISSION_4ARGS, 1,
+                         [generic_permission taken 4 arguments])
+               AC_MSG_RESULT([yes, 4 args])
+       ],[
+               AC_MSG_RESULT([no])
+       ])
+])
+])
+
+#
+# 3.1 renames lock-manager ops(lock_manager_operations) from fl_xxx to lm_xxx
+# see kernel commit 8fb47a4fbf858a164e973b8ea8ef5e83e61f2e50
+#
+AC_DEFUN([LC_LM_XXX_LOCK_MANAGER_OPS],
+[AC_MSG_CHECKING([if lock-manager ops renamed to lm_xxx])
+LB_LINUX_TRY_COMPILE([
+       #include <linux/fs.h>
+],[
+       struct lock_manager_operations lm_ops;
+       lm_ops.lm_compare_owner = NULL;
+],[
+       AC_DEFINE(HAVE_LM_XXX_LOCK_MANAGER_OPS, 1,
+                 [lock-manager ops renamed to lm_xxx])
+       AC_MSG_RESULT([yes])
+],[
+       AC_MSG_RESULT([no])
+])
+])
+
+#
+# 3.1 kills inode->i_alloc_sem, use i_dio_count and inode_dio_wait/
+#     inode_dio_done instead.
+# see kernel commit bd5fe6c5eb9c548d7f07fe8f89a150bb6705e8e3
+#
+AC_DEFUN([LC_INODE_DIO_WAIT],
+[AC_MSG_CHECKING([if inode->i_alloc_sem is killed and use inode_dio_wait/done.])
+LB_LINUX_TRY_COMPILE([
+       #include <linux/fs.h>
+],[
+       inode_dio_wait((struct inode *)0);
+       inode_dio_done((struct inode *)0);
+],[
+       AC_DEFINE(HAVE_INODE_DIO_WAIT, 1,
+                 [inode->i_alloc_sem is killed and use inode_dio_wait/done])
+       AC_MSG_RESULT([yes])
+],[
+       AC_MSG_RESULT([no])
+])
+])
+
+#
+# 3.1 adds get_acl method to inode_operations to read ACL from disk.
+# see kernel commit 4e34e719e457f2e031297175410fc0bd4016a085
+#
+AC_DEFUN([LC_IOP_GET_ACL],
+[AC_MSG_CHECKING([inode_operations has .get_acl member function])
 LB_LINUX_TRY_COMPILE([
         #include <linux/fs.h>
 ],[
-        generic_permission(NULL, 0, 0, NULL);
+        struct inode_operations iop;
+        iop.get_acl = NULL;
 ],[
-        AC_DEFINE(HAVE_GENERIC_PERMISSION_4ARGS, 1,
-                  [generic_permission taken 4 arguments])
+        AC_DEFINE(HAVE_IOP_GET_ACL, 1,
+                  [inode_operations has .get_acl member function])
         AC_MSG_RESULT([yes])
 ],[
         AC_MSG_RESULT([no])
@@ -1794,18 +1855,265 @@ LB_LINUX_TRY_COMPILE([
 ])
 
 #
-# 2.6.38 export simple_setattr
+# 3.1.1 has ext4_blocks_for_truncate
 #
-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])
+AC_DEFUN([LC_BLOCKS_FOR_TRUNCATE],
+[AC_MSG_CHECKING([if kernel has ext4_blocks_for_truncate])
+LB_LINUX_TRY_COMPILE([
+       #include <linux/fs.h>
+       #include "$LINUX/fs/ext4/ext4_jbd2.h"
+       #include "$LINUX/fs/ext4/truncate.h"
+],[
+       ext4_blocks_for_truncate(NULL);
+],[
+       AC_MSG_RESULT([yes])
+       AC_DEFINE(HAVE_BLOCKS_FOR_TRUNCATE, 1,
+                 [kernel has ext4_blocks_for_truncate])
+],[
+       AC_MSG_RESULT([no])
+])
+])
+
+#
+# 3.2 request_queue.make_request_fn defined as function returns with void
+# see kernel commit 5a7bbad27a410350e64a2d7f5ec18fc73836c14f
+#
+AC_DEFUN([LC_HAVE_VOID_MAKE_REQUEST_FN],
+[AC_MSG_CHECKING([if request_queue.make_request_fn returns void but not int])
+LB_LINUX_TRY_COMPILE([
+       #include <linux/blkdev.h>
+],[
+       int ret;
+       make_request_fn         *mrf;
+       ret = mrf(NULL, NULL);
+],[
+       AC_MSG_RESULT([no])
+],[
+       AC_DEFINE(HAVE_VOID_MAKE_REQUEST_FN, 1,
+                 [request_queue.make_request_fn returns void but not int])
+       AC_MSG_RESULT([yes])
+])
+])
+
+#
+# 3.2 protects inode->i_nlink from direct modification
+# see kernel commit a78ef704a8dd430225955f0709b22d4a6ba21deb
+# at the same time adds set_nlink(), so checks set_nlink() for it.
+#
+AC_DEFUN([LC_HAVE_PROTECT_I_NLINK],
+[AC_MSG_CHECKING([if inode->i_nlink is protected from direct modification])
+LB_LINUX_TRY_COMPILE([
+       #include <linux/fs.h>
+],[
+       struct inode i;
+       set_nlink(&i, 1);
+],[
+       AC_DEFINE(HAVE_PROTECT_I_NLINK, 1,
+                 [inode->i_nlink is protected from direct modification])
+       AC_MSG_RESULT([yes])
+],[
+       AC_MSG_RESULT([no])
+])
+])
+
+#
+# 3.3 introduces migrate_mode.h and migratepage has 4 args
+#
+AC_DEFUN([LC_HAVE_MIGRATE_HEADER],
+[LB_CHECK_FILE([$LINUX/include/linux/migrate.h],[
+               AC_DEFINE(HAVE_MIGRATE_H, 1,
+               [kernel has include/linux/migrate.h])
+],[LB_CHECK_FILE([$LINUX/include/linux/migrate_mode.h],[
+               AC_DEFINE(HAVE_MIGRATE_MODE_H, 1,
+                       [kernel has include/linux/migrate_mode.h])
+],[
+       AC_MSG_RESULT([no])
+])
+])
+])
+
+AC_DEFUN([LC_MIGRATEPAGE_4ARGS],
+[AC_MSG_CHECKING([if address_space_operations.migratepage has 4 args])
+LB_LINUX_TRY_COMPILE([
+       #include <linux/fs.h>
+#ifdef HAVE_MIGRATE_H
+       #include <linux/migrate.h>
+#elif defined(HAVE_MIGRATE_MODE_H)
+       #include <linux/migrate_mode.h>
+#endif
+],[
+       struct address_space_operations aops;
+
+       aops.migratepage(NULL, NULL, NULL, MIGRATE_ASYNC);
+],[
+       AC_DEFINE(HAVE_MIGRATEPAGE_4ARGS, 1,
+               [address_space_operations.migratepage has 4 args])
+       AC_MSG_RESULT([yes])
+],[
+       AC_MSG_RESULT([no])
+])
+])
+
+#
+# 3.3 switchs super_operations to use dentry as parameter (but not vfsmount)
+# see kernel commit 34c80b1d93e6e20ca9dea0baf583a5b5510d92d4
+#
+AC_DEFUN([LC_SUPEROPS_USE_DENTRY],
+[AC_MSG_CHECKING([if super_operations use dentry as parameter])
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_LINUX_TRY_COMPILE([
+       #include <linux/fs.h>
+       int show_options(struct seq_file *seq, struct dentry *root){
+               return 0;
+       }
+],[
+       struct super_operations ops;
+       ops.show_options = show_options;
+],[
+       AC_DEFINE(HAVE_SUPEROPS_USE_DENTRY, 1,
+                 [super_operations use dentry as parameter])
+       AC_MSG_RESULT([yes])
+],[
+       AC_MSG_RESULT([no])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+])
+
+#
+# 3.3 switchs inode_operations to use umode_t as parameter (but not int)
+# see kernel commit 1a67aafb5f72a436ca044293309fa7e6351d6a35
+#
+AC_DEFUN([LC_INODEOPS_USE_UMODE_T],
+[AC_MSG_CHECKING([if inode_operations use umode_t as parameter])
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_LINUX_TRY_COMPILE([
+       #include <linux/fs.h>
+       #include <linux/types.h>
+       int my_mknod(struct inode *dir, struct dentry *dchild,
+                    umode_t mode, dev_t dev)
+       {
+               return 0;
+       }
+],[
+       struct inode_operations ops;
+       ops.mknod = my_mknod;
+],[
+       AC_DEFINE(HAVE_INODEOPS_USE_UMODE_T, 1,
+                 [inode_operations use umode_t as parameter])
+       AC_MSG_RESULT([yes])
+],[
+       AC_MSG_RESULT([no])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+])
+
+# 3.4 kmap_atomic removes second argument
+# see kernel commit 1ec9c5ddc17aa398f05646abfcbaf315b544e62f
+#
+AC_DEFUN([LC_KMAP_ATOMIC_HAS_1ARG],
+[AC_MSG_CHECKING([if kmap_atomic has only 1 argument])
+LB_LINUX_TRY_COMPILE([
+       #include <linux/highmem.h>
 ],[
+       kmap_atomic(NULL);
+],[
+       AC_DEFINE(HAVE_KMAP_ATOMIC_HAS_1ARG, 1,
+                 [have kmap_atomic has only 1 argument])
+       AC_MSG_RESULT([yes])
+],[
+       AC_MSG_RESULT([no])
 ])
 ])
 
 #
+# 3.4 switchs touch_atime to struct path
+# see kernel commit 68ac1234fb949b66941d94dce4157742799fc581
+#
+AC_DEFUN([LC_TOUCH_ATIME_1ARG],
+[AC_MSG_CHECKING([if touch_atime use one argument])
+LB_LINUX_TRY_COMPILE([
+       #include <linux/fs.h>
+],[
+       touch_atime((struct path *)NULL);
+],[
+       AC_DEFINE(HAVE_TOUCH_ATIME_1ARG, 1,
+                 [touch_atime use one argument])
+       AC_MSG_RESULT([yes])
+],[
+       AC_MSG_RESULT([no])
+])
+])
+
+#
+# 3.4 converts d_alloc_root to d_make_root
+# see kernel commit 32991ab305ace7017c62f8eecbe5eb36dc32e13b
+#
+AC_DEFUN([LC_HAVE_D_MAKE_ROOT],
+[AC_MSG_CHECKING([if have d_make_root])
+LB_LINUX_TRY_COMPILE([
+       #include <linux/fs.h>
+],[
+       d_make_root((struct inode *)NULL);
+],[
+       AC_DEFINE(HAVE_D_MAKE_ROOT, 1,
+                 [have d_make_root])
+       AC_MSG_RESULT([yes])
+],[
+       AC_MSG_RESULT([no])
+])
+])
+
+#
+# 3.5 renames end_writeback() back to clear_inode()...
+# see kernel commit dbd5768f87ff6fb0a4fe09c4d7b6c4a24de99430
+#
+AC_DEFUN([LC_HAVE_CLEAR_INODE],
+[AC_MSG_CHECKING([if have clear_inode])
+LB_LINUX_TRY_COMPILE([
+       #include <linux/fs.h>
+],[
+       clear_inode((struct inode *)NULL);
+],[
+       AC_DEFINE(HAVE_CLEAR_INODE, 1,
+                 [have clear_inode])
+       AC_MSG_RESULT([yes])
+],[
+       AC_MSG_RESULT([no])
+])
+])
+
+#
+# 3.5 encode_fh has parent inode passed in directly
+# see kernel commit b0b0382b
+#
+AC_DEFUN([LC_HAVE_ENCODE_FH_PARENT],
+[AC_MSG_CHECKING([if encode_fh have parent inode as parameter])
+tmp_flags="$EXTRA_KCFLAGS"
+EXTRA_KCFLAGS="-Werror"
+LB_LINUX_TRY_COMPILE([
+       #include <linux/exportfs.h>
+       #include <linux/fs.h>
+       #include <linux/types.h>
+       int ll_encode_fh(struct inode *i, __u32 *a, int *b, struct inode *p)
+       {
+               return 0;
+       }
+],[
+       struct export_operations exp_op;
+       exp_op.encode_fh = ll_encode_fh;
+],[
+       AC_DEFINE(HAVE_ENCODE_FH_PARENT, 1,
+                 [have parent inode as parameter])
+       AC_MSG_RESULT([yes])
+],[
+       AC_MSG_RESULT([no])
+])
+EXTRA_KCFLAGS="$tmp_flags"
+])
+
+#
 # LC_PROG_LINUX
 #
 # Lustre linux kernel checks
@@ -1842,12 +2150,9 @@ AC_DEFUN([LC_PROG_LINUX],
          LC_UMOUNTBEGIN_HAS_VFSMOUNT
 
          #2.6.18 + RHEL5 (fc6)
-         LC_PG_FS_MISC
-         LC_PAGE_CHECKED
          LC_LINUX_FIEMAP_H
 
          # 2.6.19
-         LC_INODE_BLKSIZE
          LC_FILE_WRITEV
          LC_FILE_READV
 
@@ -1886,8 +2191,8 @@ AC_DEFUN([LC_PROG_LINUX],
          # 2.6.27
          LC_SECURITY_PLUG  # for SLES10 SP2
          LC_PGMKWRITE_USE_VMFAULT
+        LC_PGMKWRITE_COMPACT
          LC_INODE_PERMISION_2ARGS
-         LC_FILE_REMOVE_SUID
          LC_TRYLOCKPAGE
          LC_READ_INODE_IN_SBOPS
          LC_EXPORT_INODE_PERMISSION
@@ -1924,6 +2229,7 @@ AC_DEFUN([LC_PROG_LINUX],
          LC_EXPORT_GENERIC_ERROR_REMOVE_PAGE
          LC_SELINUX_IS_ENABLED
          LC_EXPORT_ACCESS_PROCESS_VM
+        LC_VFS_INODE_NEWSIZE_OK
 
          # 2.6.35, 3.0.0
          LC_FILE_FSYNC
@@ -1947,15 +2253,43 @@ AC_DEFUN([LC_PROG_LINUX],
 
          # 2.6.39
          LC_REQUEST_QUEUE_UNPLUG_FN
+        LC_HAVE_FSTYPE_MOUNT
+
+        # 3.1
+        LC_LM_XXX_LOCK_MANAGER_OPS
+        LC_INODE_DIO_WAIT
+        LC_IOP_GET_ACL
+
+        # 3.1.1
+        LC_BLOCKS_FOR_TRUNCATE
+
+        # 3.2
+        LC_HAVE_VOID_MAKE_REQUEST_FN
+        LC_HAVE_PROTECT_I_NLINK
+
+        # 3.3
+        LC_HAVE_MIGRATE_HEADER
+        LC_MIGRATEPAGE_4ARGS
+        LC_SUPEROPS_USE_DENTRY
+        LC_INODEOPS_USE_UMODE_T
+
+        # 3.4
+        LC_TOUCH_ATIME_1ARG
+        LC_HAVE_D_MAKE_ROOT
+        LC_KMAP_ATOMIC_HAS_1ARG
+
+        # 3.5
+        LC_HAVE_CLEAR_INODE
+        LC_HAVE_ENCODE_FH_PARENT
 
-         #
-         if test x$enable_server = xyes ; then
-             AC_DEFINE(HAVE_SERVER_SUPPORT, 1, [support server])
-             LC_FUNC_DEV_SET_RDONLY
-             LC_STACK_SIZE
-             LC_QUOTA64
-             LC_QUOTA_CONFIG
-         fi
+        #
+        if test x$enable_server = xyes ; then
+               AC_DEFINE(HAVE_SERVER_SUPPORT, 1, [support server])
+               LC_FUNC_DEV_SET_RDONLY
+               LC_STACK_SIZE
+               LC_QUOTA64
+               LC_QUOTA_CONFIG
+        fi
 ])
 
 #
@@ -2222,6 +2556,46 @@ LB_LINUX_TRY_COMPILE([
 ])
 
 #
+# LC_OSD_ADDON
+#
+# configure support for optional OSD implementation
+#
+AC_DEFUN([LC_OSD_ADDON],
+[AC_MSG_CHECKING([for osd])
+AC_ARG_WITH([osd],
+       AC_HELP_STRING([--with-osd=path],
+                       [set path to optional osd]),
+        [
+               case $with_osd in
+                       no)     ENABLEOSDADDON=0
+                               ;;
+                       *)      OSDADDON="${with_osd}"
+                               ENABLEOSDADDON=1
+                               ;;
+               esac
+       ], [
+               ENABLEOSDADDON=0
+       ])
+if test $ENABLEOSDADDON -eq 0; then
+       AC_MSG_RESULT([no])
+       OSDADDON=
+else
+       OSDMODNAME=`basename $OSDADDON`
+       if test -e $LUSTRE/$OSDMODNAME; then
+               AC_MSG_RESULT([can't link])
+               OSDADDON=
+       elif ln -s $OSDADDON $LUSTRE/$OSDMODNAME; then
+               AC_MSG_RESULT([$OSDMODNAME])
+               OSDADDON="subdir-m += $OSDMODNAME"
+       else
+               AC_MSG_RESULT([can't link])
+               OSDADDON=
+       fi
+fi
+AC_SUBST(OSDADDON)
+])
+
+#
 # LC_CONFIGURE
 #
 # other configure checks
@@ -2322,7 +2696,7 @@ AC_ARG_ENABLE([pgstate-track],
 AC_MSG_CHECKING([whether to enable page state tracking])
 AC_MSG_RESULT([$enable_pgstat_track])
 if test x$enable_pgstat_track = xyes ; then
-        AC_DEFINE([LUSTRE_PAGESTATE_TRACKING], 1,
+        AC_DEFINE([CONFIG_DEBUG_PAGESTATE_TRACKING], 1,
                   [enable page state tracking code])
 fi
 
@@ -2379,9 +2753,11 @@ lustre/kernel_patches/targets/2.6-rhel6.target
 lustre/kernel_patches/targets/2.6-rhel5.target
 lustre/kernel_patches/targets/2.6-sles10.target
 lustre/kernel_patches/targets/2.6-sles11.target
+lustre/kernel_patches/targets/3.0-sles11.target
 lustre/kernel_patches/targets/2.6-oel5.target
 lustre/kernel_patches/targets/2.6-fc11.target
 lustre/kernel_patches/targets/2.6-fc12.target
+lustre/kernel_patches/targets/2.6-fc15.target
 lustre/ldlm/Makefile
 lustre/fid/Makefile
 lustre/fid/autoMakefile
@@ -2399,12 +2775,8 @@ lustre/mdc/Makefile
 lustre/mdc/autoMakefile
 lustre/lmv/Makefile
 lustre/lmv/autoMakefile
-lustre/mds/Makefile
-lustre/mds/autoMakefile
 lustre/mdt/Makefile
 lustre/mdt/autoMakefile
-lustre/cmm/Makefile
-lustre/cmm/autoMakefile
 lustre/mdd/Makefile
 lustre/mdd/autoMakefile
 lustre/fld/Makefile
@@ -2414,8 +2786,6 @@ lustre/obdclass/autoMakefile
 lustre/obdclass/linux/Makefile
 lustre/obdecho/Makefile
 lustre/obdecho/autoMakefile
-lustre/obdfilter/Makefile
-lustre/obdfilter/autoMakefile
 lustre/ofd/Makefile
 lustre/ofd/autoMakefile
 lustre/osc/Makefile
@@ -2430,6 +2800,7 @@ lustre/mgc/Makefile
 lustre/mgc/autoMakefile
 lustre/mgs/Makefile
 lustre/mgs/autoMakefile
+lustre/target/Makefile
 lustre/ptlrpc/Makefile
 lustre/ptlrpc/autoMakefile
 lustre/ptlrpc/gss/Makefile
@@ -2437,11 +2808,14 @@ lustre/ptlrpc/gss/autoMakefile
 lustre/quota/Makefile
 lustre/quota/autoMakefile
 lustre/scripts/Makefile
-lustre/scripts/lustre
 lustre/tests/Makefile
 lustre/tests/mpi/Makefile
 lustre/utils/Makefile
 lustre/utils/gss/Makefile
+lustre/osp/Makefile
+lustre/osp/autoMakefile
+lustre/lod/Makefile
+lustre/lod/autoMakefile
 lustre/obdclass/darwin/Makefile
 ])
 ])