diff options
| -rw-r--r-- | config/kernel-blk-rq-pos.m4 | 21 | ||||
| -rw-r--r-- | config/kernel.m4 | 1 | ||||
| -rw-r--r-- | include/linux/blkdev_compat.h | 8 |
3 files changed, 0 insertions, 30 deletions
diff --git a/config/kernel-blk-rq-pos.m4 b/config/kernel-blk-rq-pos.m4 deleted file mode 100644 index efa595f89..000000000 --- a/config/kernel-blk-rq-pos.m4 +++ /dev/null @@ -1,21 +0,0 @@ -dnl # -dnl # 2.6.31 API change -dnl # -AC_DEFUN([ZFS_AC_KERNEL_BLK_RQ_POS], [ - AC_MSG_CHECKING([whether blk_rq_pos() is available]) - tmp_flags="$EXTRA_KCFLAGS" - EXTRA_KCFLAGS="${NO_UNUSED_BUT_SET_VARIABLE}" - ZFS_LINUX_TRY_COMPILE([ - #include <linux/blkdev.h> - ],[ - struct request *req = NULL; - (void) blk_rq_pos(req); - ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_BLK_RQ_POS, 1, - [blk_rq_pos() is available]) - ],[ - AC_MSG_RESULT(no) - ]) - EXTRA_KCFLAGS="$tmp_flags" -]) diff --git a/config/kernel.m4 b/config/kernel.m4 index 7c1a2d3d1..504e45df5 100644 --- a/config/kernel.m4 +++ b/config/kernel.m4 @@ -34,7 +34,6 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [ ZFS_AC_KERNEL_BLK_QUEUE_NONROT ZFS_AC_KERNEL_BLK_QUEUE_DISCARD ZFS_AC_KERNEL_BLK_RQ_BYTES - ZFS_AC_KERNEL_BLK_RQ_POS ZFS_AC_KERNEL_BLK_RQ_SECTORS ZFS_AC_KERNEL_GET_DISK_RO ZFS_AC_KERNEL_GET_GENDISK diff --git a/include/linux/blkdev_compat.h b/include/linux/blkdev_compat.h index 2eb250ba9..2842af7e3 100644 --- a/include/linux/blkdev_compat.h +++ b/include/linux/blkdev_compat.h @@ -53,14 +53,6 @@ __blk_queue_flush(struct request_queue *q, unsigned int flags) } #endif /* HAVE_BLK_QUEUE_FLUSH && HAVE_BLK_QUEUE_FLUSH_GPL_ONLY */ -#ifndef HAVE_BLK_RQ_POS -static inline sector_t -blk_rq_pos(struct request *req) -{ - return (req->sector); -} -#endif /* HAVE_BLK_RQ_POS */ - #ifndef HAVE_BLK_RQ_SECTORS static inline unsigned int blk_rq_sectors(struct request *req) |