Branch b1_8

b=21375

i=johann, adilger

Cleanup for FS_HAS_FIEMAP.

diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index 98de89b..f925966 100644 (file)
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -1353,21 +1353,6 @@ AC_DEFUN([LC_LINUX_FIEMAP_H],
 [])
 ])
 
-# is FS_HAS_FIEMAP defined?
-AC_DEFUN([LC_LINUX_FS_HAS_FIEMAP],
-[AC_MSG_CHECKING([if kernel has FS_HAS_FIEMAP])
-LB_LINUX_TRY_COMPILE([
-        #include <linux/fs.h>
-],[
-        int flag = FS_HAS_FIEMAP;
-],[
-        AC_MSG_RESULT([yes])
-        AC_DEFINE(HAVE_FS_HAS_FIEMAP, 1, [kernel has FS_HAS_FIEMAP])
-],[
-        AC_MSG_RESULT([no])
-])
-])
-
 #2.6.27
 AC_DEFUN([LC_INODE_PERMISION_2ARGS],
 [AC_MSG_CHECKING([inode_operations->permission have two args])
@@ -1786,7 +1771,6 @@ AC_DEFUN([LC_PROG_LINUX],
           LC_PG_FS_MISC
           LC_PAGE_CHECKED
           LC_LINUX_FIEMAP_H
-          LC_LINUX_FS_HAS_FIEMAP
 
           # 2.6.19
           LC_INODE_BLKSIZE

diff --git a/lustre/obdclass/obd_mount.c b/lustre/obdclass/obd_mount.c
index c5c796e..3afdd26 100644 (file)
--- a/lustre/obdclass/obd_mount.c
+++ b/lustre/obdclass/obd_mount.c
@@ -2100,7 +2100,7 @@ struct file_system_type lustre_fs_type = {
         .get_sb       = lustre_get_sb,
         .kill_sb      = lustre_kill_super,
         .fs_flags     = FS_BINARY_MOUNTDATA | FS_REQUIRES_DEV |
-#ifdef HAVE_FS_HAS_FIEMAP
+#ifdef FS_HAS_FIEMAP
                         FS_HAS_FIEMAP |
 #endif
                         LL_RENAME_DOES_D_MOVE,