Remove blk_queue_discard() autotools check

This autotools check was never needed because we can check for the
existence of QUEUE_FLAG_DISCARD in the kernel headers.

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

diff --git a/config/kernel-blk-queue-discard.m4 b/config/kernel-blk-queue-discard.m4
deleted file mode 100644 (file)
index 8306c88..0000000
--- a/config/kernel-blk-queue-discard.m4
+++ /dev/null
@@ -1,22 +0,0 @@
-dnl #
-dnl # 2.6.32 API change
-dnl # Discard requests were moved to the normal I/O path.
-dnl #
-AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_DISCARD], [
-       AC_MSG_CHECKING([whether blk_queue_discard() 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;
-               (void) blk_queue_discard(q);
-       ],[
-               AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_BLK_QUEUE_DISCARD, 1,
-                         [blk_queue_discard() is available])
-       ],[
-               AC_MSG_RESULT(no)
-       ])
-       EXTRA_KCFLAGS="$tmp_flags"
-])

diff --git a/config/kernel.m4 b/config/kernel.m4
index 12d1ac78cc0274684e4ca6f6648956bec56784a9..93cc3fc108479901f4b9f1ebda072c1d9aa48b3c 100644 (file)
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -32,7 +32,6 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
        ZFS_AC_KERNEL_BLK_QUEUE_MAX_HW_SECTORS
        ZFS_AC_KERNEL_BLK_QUEUE_MAX_SEGMENTS
        ZFS_AC_KERNEL_BLK_QUEUE_NONROT
-       ZFS_AC_KERNEL_BLK_QUEUE_DISCARD
        ZFS_AC_KERNEL_GET_DISK_RO
        ZFS_AC_KERNEL_GET_GENDISK
        ZFS_AC_KERNEL_DISCARD_GRANULARITY