diff options
| author | Richard Yao <[email protected]> | 2014-07-06 20:31:41 -0400 |
|---|---|---|
| committer | Richard Yao <[email protected]> | 2015-09-04 15:37:24 -0400 |
| commit | 65f340e72579cf43ec30d9b265b0d3e1f5955bd5 (patch) | |
| tree | 8d4ac4c3ce3ec38605942ae13558a90b61c190cd | |
| parent | 9ddf9b8e1587ec7112913a6b5e1f82e468a891b6 (diff) | |
Remove rq_is_sync() autotools check
Signed-off-by: Richard Yao <[email protected]>
| -rw-r--r-- | config/kernel-rq-is_sync.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-rq-is_sync.m4 b/config/kernel-rq-is_sync.m4 deleted file mode 100644 index f6f51c87a..000000000 --- a/config/kernel-rq-is_sync.m4 +++ /dev/null @@ -1,21 +0,0 @@ -dnl # -dnl # 2.6.x API change -dnl # -AC_DEFUN([ZFS_AC_KERNEL_RQ_IS_SYNC], [ - AC_MSG_CHECKING([whether rq_is_sync() 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) rq_is_sync(req); - ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_RQ_IS_SYNC, 1, - [rq_is_sync() is available]) - ],[ - AC_MSG_RESULT(no) - ]) - EXTRA_KCFLAGS="$tmp_flags" -]) diff --git a/config/kernel.m4 b/config/kernel.m4 index 245406297..b06cdfa59 100644 --- a/config/kernel.m4 +++ b/config/kernel.m4 @@ -41,7 +41,6 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [ ZFS_AC_KERNEL_BLK_RQ_SECTORS ZFS_AC_KERNEL_GET_DISK_RO ZFS_AC_KERNEL_GET_GENDISK - ZFS_AC_KERNEL_RQ_IS_SYNC ZFS_AC_KERNEL_DISCARD_GRANULARITY ZFS_AC_KERNEL_CONST_XATTR_HANDLER ZFS_AC_KERNEL_XATTR_HANDLER_GET diff --git a/include/linux/blkdev_compat.h b/include/linux/blkdev_compat.h index b2b641840..2dbf87ca6 100644 --- a/include/linux/blkdev_compat.h +++ b/include/linux/blkdev_compat.h @@ -241,14 +241,6 @@ get_disk_ro(struct gendisk *disk) } #endif /* HAVE_GET_DISK_RO */ -#ifndef HAVE_RQ_IS_SYNC -static inline bool -rq_is_sync(struct request *req) -{ - return (req->flags & REQ_RW_SYNC); -} -#endif /* HAVE_RQ_IS_SYNC */ - #ifdef HAVE_BIO_BVEC_ITER #define BIO_BI_SECTOR(bio) (bio)->bi_iter.bi_sector #define BIO_BI_SIZE(bio) (bio)->bi_iter.bi_size |