From d60328645d34be592e41e8319138e5d14cc258f7 Mon Sep 17 00:00:00 2001 From: Richard Yao Date: Sun, 14 Sep 2014 23:41:15 -0400 Subject: [PATCH] Remove blk_queue_nonrot() autotools check This autotools check was never needed because we can check for the existence of QUEUE_FLAG_NONROT in the kernel headers. Also, the comment in config/kernel-blk-queue-nonrot.m4 is incorrect. This was a Linux 2.6.28 API change, not a Linux 2.6.27 API change. Signed-off-by: Richard Yao --- config/kernel-blk-queue-nonrot.m4 | 25 ------------------------- config/kernel.m4 | 1 - 2 files changed, 26 deletions(-) delete mode 100644 config/kernel-blk-queue-nonrot.m4 diff --git a/config/kernel-blk-queue-nonrot.m4 b/config/kernel-blk-queue-nonrot.m4 deleted file mode 100644 index aa6d678fe..000000000 --- a/config/kernel-blk-queue-nonrot.m4 +++ /dev/null @@ -1,25 +0,0 @@ -dnl # -dnl # 2.6.27 API change -dnl # The blk_queue_nonrot() function and QUEUE_FLAG_NONROT flag were -dnl # added so non-rotational devices could be identified. These devices -dnl # have no seek time which the higher level elevator uses to optimize -dnl # how the I/O issued to the device. -dnl # -AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_NONROT], [ - AC_MSG_CHECKING([whether blk_queue_nonrot() is available]) - tmp_flags="$EXTRA_KCFLAGS" - EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}" - ZFS_LINUX_TRY_COMPILE([ - #include - ],[ - struct request_queue *q = NULL; - (void) blk_queue_nonrot(q); - ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_BLK_QUEUE_NONROT, 1, - [blk_queue_nonrot() is available]) - ],[ - AC_MSG_RESULT(no) - ]) - EXTRA_KCFLAGS="$tmp_flags" -]) diff --git a/config/kernel.m4 b/config/kernel.m4 index 93cc3fc10..975e42264 100644 --- a/config/kernel.m4 +++ b/config/kernel.m4 @@ -31,7 +31,6 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [ ZFS_AC_KERNEL_BLK_QUEUE_FLUSH ZFS_AC_KERNEL_BLK_QUEUE_MAX_HW_SECTORS ZFS_AC_KERNEL_BLK_QUEUE_MAX_SEGMENTS - ZFS_AC_KERNEL_BLK_QUEUE_NONROT ZFS_AC_KERNEL_GET_DISK_RO ZFS_AC_KERNEL_GET_GENDISK ZFS_AC_KERNEL_DISCARD_GRANULARITY