Remove blk_requeue_request() autotools check

Signed-off-by: Richard Yao <ryao@gentoo.org>

diff --git a/config/kernel-blk-requeue-request.m4 b/config/kernel-blk-requeue-request.m4
deleted file mode 100644 (file)
index 286c4b9..0000000
--- a/config/kernel-blk-requeue-request.m4
+++ /dev/null
@@ -1,25 +0,0 @@
-dnl #
-dnl # 2.6.31 API change
-dnl # Request queue peek/retrieval interface cleanup, the
-dnl # elv_requeue_request() function has been replaced with the
-dnl # blk_requeue_request() function.
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_BLK_REQUEUE_REQUEST], [
-       AC_MSG_CHECKING([whether blk_requeue_request() is available])
-       tmp_flags="$EXTRA_KCFLAGS"
-       EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}"
-       ZFS_LINUX_TRY_COMPILE([
-               #include <linux/blkdev.h>
-       ],[
-               struct request_queue *q = NULL;
-               struct request *req = NULL;
-               blk_requeue_request(q, req);
-       ],[
-               AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_BLK_REQUEUE_REQUEST, 1,
-                         [blk_requeue_request() is available])
-       ],[
-               AC_MSG_RESULT(no)
-       ])
-       EXTRA_KCFLAGS="$tmp_flags"
-])

diff --git a/config/kernel.m4 b/config/kernel.m4
index dfaa4c64ab2b6fafbd6faf449f54cfd05a9aaef3..9ac3da03efcd6b7e52e53234a438d9a99ccae052 100644 (file)
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -34,7 +34,6 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
        ZFS_AC_KERNEL_BLK_QUEUE_NONROT
        ZFS_AC_KERNEL_BLK_QUEUE_DISCARD
        ZFS_AC_KERNEL_BLK_FETCH_REQUEST
-       ZFS_AC_KERNEL_BLK_REQUEUE_REQUEST
        ZFS_AC_KERNEL_BLK_RQ_BYTES
        ZFS_AC_KERNEL_BLK_RQ_POS
        ZFS_AC_KERNEL_BLK_RQ_SECTORS

diff --git a/include/linux/blkdev_compat.h b/include/linux/blkdev_compat.h
index a8a2700aff55ec174fb70f6f0cbf6c89d85b9b56..ba4e9763666f7b9bb67557610f1d84029d84b88d 100644 (file)
--- a/include/linux/blkdev_compat.h
+++ b/include/linux/blkdev_compat.h
@@ -50,14 +50,6 @@ blk_fetch_request(struct request_queue *q)
 }
 #endif /* HAVE_BLK_FETCH_REQUEST */
 
-#ifndef HAVE_BLK_REQUEUE_REQUEST
-static inline void
-blk_requeue_request(request_queue_t *q, struct request *req)
-{
-       elv_requeue_request(q, req);
-}
-#endif /* HAVE_BLK_REQUEUE_REQUEST */
-
 /*
  * 2.6.36 API change,
  * The blk_queue_flush() interface has replaced blk_queue_ordered()