diff options
| -rw-r--r-- | config/kernel-blk-fetch-request.m4 | 25 | ||||
| -rw-r--r-- | config/kernel.m4 | 1 | ||||
| -rw-r--r-- | include/linux/blkdev_compat.h | 14 |
3 files changed, 0 insertions, 40 deletions
diff --git a/config/kernel-blk-fetch-request.m4 b/config/kernel-blk-fetch-request.m4 deleted file mode 100644 index c4e114616..000000000 --- a/config/kernel-blk-fetch-request.m4 +++ /dev/null @@ -1,25 +0,0 @@ -dnl # -dnl # 2.6.31 API change -dnl # Request queue peek/retrieval interface cleanup, the blk_fetch_request() -dnl # function replaces the elv_next_request() and blk_fetch_request() -dnl # functions. The updated blk_fetch_request() function returns the -dnl # next available request and removed it from the request queue. -dnl # -AC_DEFUN([ZFS_AC_KERNEL_BLK_FETCH_REQUEST], [ - AC_MSG_CHECKING([whether blk_fetch_request() 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_fetch_request(q); - ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_BLK_FETCH_REQUEST, 1, - [blk_fetch_request() is available]) - ],[ - AC_MSG_RESULT(no) - ]) - EXTRA_KCFLAGS="$tmp_flags" -]) diff --git a/config/kernel.m4 b/config/kernel.m4 index 9ac3da03e..7c1a2d3d1 100644 --- a/config/kernel.m4 +++ b/config/kernel.m4 @@ -33,7 +33,6 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [ ZFS_AC_KERNEL_BLK_QUEUE_MAX_SEGMENTS ZFS_AC_KERNEL_BLK_QUEUE_NONROT ZFS_AC_KERNEL_BLK_QUEUE_DISCARD - ZFS_AC_KERNEL_BLK_FETCH_REQUEST ZFS_AC_KERNEL_BLK_RQ_BYTES ZFS_AC_KERNEL_BLK_RQ_POS ZFS_AC_KERNEL_BLK_RQ_SECTORS diff --git a/include/linux/blkdev_compat.h b/include/linux/blkdev_compat.h index ba4e97636..2eb250ba9 100644 --- a/include/linux/blkdev_compat.h +++ b/include/linux/blkdev_compat.h @@ -36,20 +36,6 @@ typedef unsigned __bitwise__ fmode_t; #endif /* HAVE_FMODE_T */ -#ifndef HAVE_BLK_FETCH_REQUEST -static inline struct request * -blk_fetch_request(struct request_queue *q) -{ - struct request *req; - - req = elv_next_request(q); - if (req) - blkdev_dequeue_request(req); - - return (req); -} -#endif /* HAVE_BLK_FETCH_REQUEST */ - /* * 2.6.36 API change, * The blk_queue_flush() interface has replaced blk_queue_ordered() |