Branch HEAD

[fs/lustre-release.git] / lustre / autoconf / lustre-core.m4

diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index 8342e99..23fa733 100644 (file)
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -830,6 +830,18 @@ LB_LINUX_TRY_COMPILE([
 ])
 ])
 
+# LC_SYMVERFILE
+# SLES 9 uses a different name for this file - unsure about vanilla kernels
+# around this version, but it matters for servers only.
+AC_DEFUN([LC_SYMVERFILE],
+         [AC_MSG_CHECKING([name of symverfile])
+          if grep -q Modules.symvers $LINUX/scripts/Makefile.modpost ; then
+              SYMVERFILE=Modules.symvers
+          else
+              SYMVERFILE=Module.symvers
+          fi
+         AC_MSG_RESULT($SYMVERFILE)
+          AC_SUBST(SYMVERFILE)])
 
 # LC_DQUOTOFF_MUTEX
 # after 2.6.17 dquote use mutex instead if semaphore
@@ -1277,97 +1289,98 @@ CFLAGS="$tmp_flags"
 # Lustre linux kernel checks
 #
 AC_DEFUN([LC_PROG_LINUX],
-[ LC_LUSTRE_VERSION_H
-if test x$enable_server = xyes ; then
-        LC_CONFIG_BACKINGFS
-fi
-LC_CONFIG_PINGER
-LC_CONFIG_CHECKSUM
-LC_CONFIG_LIBLUSTRE_RECOVERY
-LC_CONFIG_QUOTA
-LC_CONFIG_HEALTH_CHECK_WRITE
-LC_CONFIG_LRU_RESIZE
-
-
-LC_TASK_PPTR
-# RHEL4 patches
-LC_EXPORT_TRUNCATE_COMPLETE
-LC_EXPORT_D_REHASH_COND
-LC_EXPORT___D_REHASH
-LC_EXPORT_NODE_TO_CPUMASK
-
-LC_STRUCT_KIOBUF
-LC_FUNC_COND_RESCHED
-LC_FUNC_ZAP_PAGE_RANGE
-LC_FUNC_PDE
-LC_FUNC_DIRECT_IO
-LC_HEADER_MM_INLINE
-LC_STRUCT_INODE
-LC_FUNC_REGISTER_CACHE
-LC_FUNC_GRAB_CACHE_PAGE_NOWAIT_GFP
-LC_FUNC_DEV_SET_RDONLY
-LC_FUNC_FILEMAP_FDATAWRITE
-LC_STRUCT_STATFS
-LC_FUNC_PAGE_MAPPED
-LC_STRUCT_FILE_OPS_UNLOCKED_IOCTL
-LC_FILEMAP_POPULATE
-LC_D_ADD_UNIQUE
-LC_BIT_SPINLOCK_H
-
-LC_XATTR_ACL
-LC_POSIX_ACL_XATTR_H
-LC_CONST_ACL_SIZE
-
-LC_STRUCT_INTENT_FILE
-
-LC_FUNC_SET_FS_PWD
-LC_CAPA_CRYPTO
-LC_CONFIG_GSS
-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
-
-# does the kernel have VFS intent patches?
-LC_VFS_INTENT_PATCHES
-
-# ~2.6.11
-LC_S_TIME_GRAN
-LC_SB_TIME_GRAN
-
-# 2.6.12
-LC_RW_TREE_LOCK
-
-# 2.6.15
-LC_INODE_I_MUTEX
-
-# 2.6.17
-LC_DQUOTOFF_MUTEX
-
-# 2.6.18
-LC_NR_PAGECACHE
-LC_STATFS_DENTRY_PARAM
-LC_VFS_KERN_MOUNT
-LC_INVALIDATEPAGE_RETURN_INT
-LC_UMOUNTBEGIN_HAS_VFSMOUNT
-
-#2.6.18 + RHEL5 (fc6)
-LC_PG_FS_MISC
-
-# 2.6.19
-LC_INODE_BLKSIZE
-LC_VFS_READDIR_U64_INO
-LC_GENERIC_FILE_READ
-LC_GENERIC_FILE_WRITE
-
-# 2.6.20
-LC_CANCEL_DIRTY_PAGE
-
-# raid5-zerocopy patch
-LC_PAGE_CONSTANT
-])
+         [LC_LUSTRE_VERSION_H
+         if test x$enable_server = xyes ; then
+             LC_CONFIG_BACKINGFS
+         fi
+         LC_CONFIG_PINGER
+         LC_CONFIG_CHECKSUM
+         LC_CONFIG_LIBLUSTRE_RECOVERY
+         LC_CONFIG_QUOTA
+         LC_CONFIG_HEALTH_CHECK_WRITE
+         LC_CONFIG_LRU_RESIZE
+
+         LC_TASK_PPTR
+         # RHEL4 patches
+         LC_EXPORT_TRUNCATE_COMPLETE
+         LC_EXPORT_D_REHASH_COND
+         LC_EXPORT___D_REHASH
+         LC_EXPORT_NODE_TO_CPUMASK
+
+         LC_STRUCT_KIOBUF
+         LC_FUNC_COND_RESCHED
+         LC_FUNC_ZAP_PAGE_RANGE
+         LC_FUNC_PDE
+         LC_FUNC_DIRECT_IO
+         LC_HEADER_MM_INLINE
+         LC_STRUCT_INODE
+         LC_FUNC_REGISTER_CACHE
+         LC_FUNC_GRAB_CACHE_PAGE_NOWAIT_GFP
+         LC_FUNC_DEV_SET_RDONLY
+         LC_FUNC_FILEMAP_FDATAWRITE
+         LC_STRUCT_STATFS
+         LC_FUNC_PAGE_MAPPED
+         LC_STRUCT_FILE_OPS_UNLOCKED_IOCTL
+         LC_FILEMAP_POPULATE
+         LC_D_ADD_UNIQUE
+         LC_BIT_SPINLOCK_H
+
+         LC_XATTR_ACL
+         LC_POSIX_ACL_XATTR_H
+         LC_CONST_ACL_SIZE
+
+         LC_STRUCT_INTENT_FILE
+
+         LC_FUNC_SET_FS_PWD
+         LC_CAPA_CRYPTO
+         LC_CONFIG_GSS
+         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
+
+         # does the kernel have VFS intent patches?
+         LC_VFS_INTENT_PATCHES
+
+         # ~2.6.11
+         LC_S_TIME_GRAN
+         LC_SB_TIME_GRAN
+
+         # 2.6.12
+         LC_RW_TREE_LOCK
+
+         # 2.6.15
+         LC_INODE_I_MUTEX
+
+         # SLES 10 (at least)
+         LC_SYMVERFILE
+
+         # 2.6.17
+         LC_DQUOTOFF_MUTEX
+
+         # 2.6.18
+         LC_NR_PAGECACHE
+         LC_STATFS_DENTRY_PARAM
+         LC_VFS_KERN_MOUNT
+         LC_INVALIDATEPAGE_RETURN_INT
+         LC_UMOUNTBEGIN_HAS_VFSMOUNT
+
+         #2.6.18 + RHEL5 (fc6)
+         LC_PG_FS_MISC
+
+         # 2.6.19
+         LC_INODE_BLKSIZE
+         LC_VFS_READDIR_U64_INO
+         LC_GENERIC_FILE_READ
+         LC_GENERIC_FILE_WRITE
+
+         # 2.6.20
+         LC_CANCEL_DIRTY_PAGE
+
+         # raid5-zerocopy patch
+         LC_PAGE_CONSTANT])
 
 #
 # LC_CONFIG_CLIENT_SERVER