diff options
| author | Richard Yao <[email protected]> | 2014-09-14 23:39:03 -0400 |
|---|---|---|
| committer | Richard Yao <[email protected]> | 2015-09-04 15:37:25 -0400 |
| commit | d677203a9b38b389184a4e2c43c6cd8f8e5b20d4 (patch) | |
| tree | 519eea5209414e239937416fc5f847a006546e5d | |
| parent | 7d6e2adb4e4a60efe2a906faf00d134c0403dda5 (diff) | |
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 <[email protected]>
| -rw-r--r-- | config/kernel-blk-queue-discard.m4 | 22 | ||||
| -rw-r--r-- | config/kernel.m4 | 1 |
2 files changed, 0 insertions, 23 deletions
diff --git a/config/kernel-blk-queue-discard.m4 b/config/kernel-blk-queue-discard.m4 deleted file mode 100644 index 8306c88ee..000000000 --- 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 12d1ac78c..93cc3fc10 100644 --- 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 |