diff options
| author | Richard Yao <[email protected]> | 2015-08-31 12:21:21 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2015-09-01 09:33:18 -0700 |
| commit | 3c119330a6b4e166f85c3b07ae011231f9253dee (patch) | |
| tree | dbf7e4ad5470f6c741398d38a0eae256f7a875ce | |
| parent | 324dcd373371fbc2855406444c1c106722970c18 (diff) | |
Remove blk_queue_physical_block_size() 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 <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
| -rw-r--r-- | config/kernel-blk-queue-physical-block-size.m4 | 25 | ||||
| -rw-r--r-- | config/kernel.m4 | 1 | ||||
| -rw-r--r-- | include/linux/blkdev_compat.h | 10 |
3 files changed, 0 insertions, 36 deletions
diff --git a/config/kernel-blk-queue-physical-block-size.m4 b/config/kernel-blk-queue-physical-block-size.m4 deleted file mode 100644 index a585b2846..000000000 --- a/config/kernel-blk-queue-physical-block-size.m4 +++ /dev/null @@ -1,25 +0,0 @@ -dnl # -dnl # 2.6.30 API change -dnl # The blk_queue_physical_block_size() function was introduced to -dnl # indicate the smallest I/O the device can write without incurring -dnl # a read-modify-write penalty. -dnl # -AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_PHYSICAL_BLOCK_SIZE], [ - AC_MSG_CHECKING([whether blk_queue_physical_block_size() 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; - unsigned short block_size = 1; - (void) blk_queue_physical_block_size(q, block_size); - ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_BLK_QUEUE_PHYSICAL_BLOCK_SIZE, 1, - [blk_queue_physical_block_size() is available]) - ],[ - AC_MSG_RESULT(no) - ]) - EXTRA_KCFLAGS="$tmp_flags" -]) diff --git a/config/kernel.m4 b/config/kernel.m4 index f84612dbf..d24e0b6df 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_PHYSICAL_BLOCK_SIZE ZFS_AC_KERNEL_BLK_QUEUE_IO_OPT ZFS_AC_KERNEL_BLK_QUEUE_NONROT ZFS_AC_KERNEL_BLK_QUEUE_DISCARD diff --git a/include/linux/blkdev_compat.h b/include/linux/blkdev_compat.h index 89e888c30..591602bc9 100644 --- a/include/linux/blkdev_compat.h +++ b/include/linux/blkdev_compat.h @@ -230,16 +230,6 @@ __blk_queue_max_segments(struct request_queue *q, unsigned short max_segments) /* * 2.6.30 API change, - * The blk_queue_physical_block_size() function was introduced to - * indicate the smallest I/O the device can write without incurring - * a read-modify-write penalty. For older kernels this is a no-op. - */ -#ifndef HAVE_BLK_QUEUE_PHYSICAL_BLOCK_SIZE -#define blk_queue_physical_block_size(q, x) ((void)(0)) -#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. */ |