LU-2800 autoconf: remove LC_BLKDEV_PUT_2ARGS test

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

diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index f850604..5133caa 100644 (file)
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -396,44 +396,6 @@ AC_DEFUN([LC_LINUX_FIEMAP_H],
 [])
 ])
 
-# 2.6.19
-
-# LC_FILE_WRITEV
-# 2.6.19 replaced writev with aio_write
-AC_DEFUN([LC_FILE_WRITEV],
-[AC_MSG_CHECKING([writev in fops])
-LB_LINUX_TRY_COMPILE([
-        #include <linux/fs.h>
-],[
-        struct file_operations *fops = NULL;
-        fops->writev = NULL;
-],[
-        AC_MSG_RESULT(yes)
-        AC_DEFINE(HAVE_FILE_WRITEV, 1,
-                [use fops->writev])
-],[
-       AC_MSG_RESULT(no)
-])
-])
-
-# LC_FILE_READV
-# 2.6.19 replaced readv with aio_read
-AC_DEFUN([LC_FILE_READV],
-[AC_MSG_CHECKING([readv in fops])
-LB_LINUX_TRY_COMPILE([
-        #include <linux/fs.h>
-],[
-        struct file_operations *fops = NULL;
-        fops->readv = NULL;
-],[
-        AC_MSG_RESULT(yes)
-        AC_DEFINE(HAVE_FILE_READV, 1,
-                [use fops->readv])
-],[
-        AC_MSG_RESULT(no)
-])
-])
-
 # raid5-zerocopy patch
 
 #
@@ -462,22 +424,6 @@ LB_LINUX_TRY_COMPILE([
 
 # 2.6.22
 
-# 2.6.22 lost second parameter for invalidate_bdev
-AC_DEFUN([LC_INVALIDATE_BDEV_2ARG],
-[AC_MSG_CHECKING([if invalidate_bdev has second argument])
-LB_LINUX_TRY_COMPILE([
-        #include <linux/buffer_head.h>
-],[
-        invalidate_bdev(NULL,0);
-],[
-        AC_MSG_RESULT([yes])
-        AC_DEFINE(HAVE_INVALIDATE_BDEV_2ARG, 1,
-                [invalidate_bdev has second argument])
-],[
-        AC_MSG_RESULT([no])
-])
-])
-
 #
 # 2.6.19 check for FS_RENAME_DOES_D_MOVE flag
 #
@@ -823,19 +769,6 @@ EXTRA_KCFLAGS="-I$LINUX/fs"
 EXTRA_KCFLAGS=$tmp_flags
 ])
 
-# 2.6.32 set_cpus_allowed is no more defined if CONFIG_CPUMASK_OFFSTACK=yes
-AC_DEFUN([LC_SET_CPUS_ALLOWED],
-         [AC_MSG_CHECKING([if kernel defines set_cpus_allowed])
-          LB_LINUX_TRY_COMPILE(
-                [#include <linux/sched.h>],
-                [struct task_struct *p = NULL;
-                 cpumask_t mask = { { 0 } };
-                 (void) set_cpus_allowed(p, mask);],
-                [AC_MSG_RESULT([yes])
-                 AC_DEFINE(HAVE_SET_CPUS_ALLOWED, 1,
-                           [set_cpus_allowed is exported by the kernel])],
-                [AC_MSG_RESULT([no])] )])
-
 #
 # 2.6.36 fs_struct.lock use spinlock instead of rwlock.
 #
@@ -1595,6 +1528,28 @@ LB_LINUX_TRY_COMPILE([
 ])
 
 #
+# 3.9 killed f_vfsmnt by
+# 182be684784334598eee1d90274e7f7aa0063616
+# replacement is f_path.mnt
+#
+AC_DEFUN([LC_HAVE_F_PATH_MNT],
+[AC_MSG_CHECKING([if struct file has f_path.mnt])
+LB_LINUX_TRY_COMPILE([
+       #include <linux/fs.h>
+],[
+       struct file *fp = NULL;
+       struct path  path;
+
+       path.mnt = fp->f_path.mnt;
+],[
+       AC_DEFINE(HAVE_F_PATH_MNT,1,[yes])
+       AC_MSG_RESULT([yes])
+],[
+       AC_MSG_RESULT([no])
+])
+])
+
+#
 # LC_PROG_LINUX
 #
 # Lustre linux kernel checks
@@ -1623,15 +1578,10 @@ AC_DEFUN([LC_PROG_LINUX],
          #2.6.18 + RHEL5 (fc6)
          LC_LINUX_FIEMAP_H
 
-         # 2.6.19
-         LC_FILE_WRITEV
-         LC_FILE_READV
-
          # raid5-zerocopy patch
          LC_PAGE_CONSTANT
 
         # 2.6.22
-         LC_INVALIDATE_BDEV_2ARG
          LC_FS_RENAME_DOES_D_MOVE
 
          # 2.6.23
@@ -1658,7 +1608,6 @@ AC_DEFUN([LC_PROG_LINUX],
 
          # 2.6.32
          LC_BLK_QUEUE_MAX_SEGMENTS
-         LC_SET_CPUS_ALLOWED
 
         # 2.6.34
         LC_HAVE_DQUOT_FS_DISK_QUOTA
@@ -1730,6 +1679,7 @@ AC_DEFUN([LC_PROG_LINUX],
 
         # 3.9
         LC_HAVE_HLIST_FOR_EACH_3ARG
+        LC_HAVE_F_PATH_MNT
 
         #
         if test x$enable_server = xyes ; then
@@ -1796,22 +1746,6 @@ if test x$enable_liblustre_acl = xyes ; then
   AC_DEFINE(LIBLUSTRE_POSIX_ACL, 1, Liblustre Support ACL-enabled MDS)
 fi
 
-# 2.6.29 blkdev_put has 2 arguments
-AC_DEFUN([LC_BLKDEV_PUT_2ARGS],
-[AC_MSG_CHECKING([blkdev_put needs 2 parameters])
-LB_LINUX_TRY_COMPILE([
-        #include <linux/fs.h>
-],[
-        blkdev_put(NULL, 0);
-],[
-        AC_DEFINE(HAVE_BLKDEV_PUT_2ARGS, 1,
-                [blkdev_put needs 2 paramters])
-        AC_MSG_RESULT([yes])
-],[
-        AC_MSG_RESULT([no])
-])
-])
-
 #
 # --enable-mpitest
 #
@@ -2085,10 +2019,6 @@ if test x$enable_pgstat_track = xyes ; then
         AC_DEFINE([CONFIG_DEBUG_PAGESTATE_TRACKING], 1,
                   [enable page state tracking code])
 fi
-
-         #2.6.29
-         LC_BLKDEV_PUT_2ARGS
-
 ])
 
 #