From 97771edaca2cac5905571f1355dd2b6256a306b4 Mon Sep 17 00:00:00 2001 From: Richard Yao Date: Mon, 31 Aug 2015 16:11:45 -0700 Subject: [PATCH] Remove blk_queue_io_opt() autotools check This is needed for supporting kernels earlier than 2.6.30. Support for those kernels was dropped, so we can safely remove this check. Signed-off-by: Richard Yao Signed-off-by: Brian Behlendorf --- config/kernel-blk-queue-io-opt.m4 | 24 ------------------------ config/kernel.m4 | 1 - include/linux/blkdev_compat.h | 9 --------- 3 files changed, 34 deletions(-) delete mode 100644 config/kernel-blk-queue-io-opt.m4 diff --git a/config/kernel-blk-queue-io-opt.m4 b/config/kernel-blk-queue-io-opt.m4 deleted file mode 100644 index fb9b6841b59c..000000000000 --- a/config/kernel-blk-queue-io-opt.m4 +++ /dev/null @@ -1,24 +0,0 @@ -dnl # -dnl # 2.6.30 API change -dnl # The blk_queue_io_opt() function was added to indicate the optimal -dnl # I/O size for the device. -dnl # -AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_IO_OPT], [ - AC_MSG_CHECKING([whether blk_queue_io_opt() is available]) - tmp_flags="$EXTRA_KCFLAGS" - EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}" - ZFS_LINUX_TRY_COMPILE([ - #include - ],[ - struct request_queue *q = NULL; - unsigned int opt = 1; - (void) blk_queue_io_opt(q, opt); - ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_BLK_QUEUE_IO_OPT, 1, - [blk_queue_io_opt() is available]) - ],[ - AC_MSG_RESULT(no) - ]) - EXTRA_KCFLAGS="$tmp_flags" -]) diff --git a/config/kernel.m4 b/config/kernel.m4 index d24e0b6df468..09d8003f12a0 100644 --- a/config/kernel.m4 +++ b/config/kernel.m4 @@ -29,7 +29,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_IO_OPT ZFS_AC_KERNEL_BLK_QUEUE_NONROT ZFS_AC_KERNEL_BLK_QUEUE_DISCARD ZFS_AC_KERNEL_BLK_FETCH_REQUEST diff --git a/include/linux/blkdev_compat.h b/include/linux/blkdev_compat.h index 591602bc9505..ef6fa3bbd62b 100644 --- a/include/linux/blkdev_compat.h +++ b/include/linux/blkdev_compat.h @@ -228,15 +228,6 @@ __blk_queue_max_segments(struct request_queue *q, unsigned short max_segments) } #endif -/* - * 2.6.30 API change, - * The blk_queue_io_opt() function was added to indicate the optimal - * I/O size for the device. For older kernels this is a no-op. - */ -#ifndef HAVE_BLK_QUEUE_IO_OPT -#define blk_queue_io_opt(q, x) ((void)(0)) -#endif - #ifndef HAVE_GET_DISK_RO static inline int get_disk_ro(struct gendisk *disk)