diff options
| author | Brian Behlendorf <[email protected]> | 2010-11-10 15:49:40 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2010-11-10 17:00:33 -0800 |
| commit | 675de5aa379bfceb0258a20c4ccd1414e4798ee6 (patch) | |
| tree | 241b2262cb0250579b1bd14ab37ac003eef52adc /config | |
| parent | f4af6bb783b0b7f2a6075cb1c74c225db8a157b2 (diff) | |
Linux 2.6.36 compat, synchronous bio flag
The name of the flag used to mark a bio as synchronous has changed
again in the 2.6.36 kernel due to the unification of the BIO_RW_*
and REQ_* flags. The new flag is called REQ_SYNC. To simplify
checking this flag I have introduced the vdev_disk_dio_is_sync()
helper function. Based on the results of several new autoconf
tests it uses the correct mask to check for a synchronous bio.
Preferred interface for flagging a synchronous bio:
2.6.12-2.6.29: BIO_RW_SYNC
2.6.30-2.6.35: BIO_RW_SYNCIO
2.6.36-2.6.xx: REQ_SYNC
Diffstat (limited to 'config')
| -rw-r--r-- | config/kernel-bio-rw-syncio.m4 | 39 | ||||
| -rw-r--r-- | config/kernel.m4 | 2 |
2 files changed, 37 insertions, 4 deletions
diff --git a/config/kernel-bio-rw-syncio.m4 b/config/kernel-bio-rw-syncio.m4 index 2c80f5c0e..6f8b5b591 100644 --- a/config/kernel-bio-rw-syncio.m4 +++ b/config/kernel-bio-rw-syncio.m4 @@ -1,7 +1,24 @@ dnl # -dnl # 2.6.29 API change -dnl # BIO_RW_SYNC renamed to BIO_RW_SYNCIO +dnl # Preferred interface for flagging a synchronous bio: +dnl # 2.6.12-2.6.29: BIO_RW_SYNC +dnl # 2.6.30-2.6.35: BIO_RW_SYNCIO +dnl # 2.6.36-2.6.xx: REQ_SYNC dnl # +AC_DEFUN([ZFS_AC_KERNEL_BIO_RW_SYNC], [ + AC_MSG_CHECKING([whether BIO_RW_SYNC is defined]) + ZFS_LINUX_TRY_COMPILE([ + #include <linux/bio.h> + ],[ + int flags; + flags = BIO_RW_SYNC; + ],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_BIO_RW_SYNC, 1, [BIO_RW_SYNC is defined]) + ],[ + AC_MSG_RESULT(no) + ]) +]) + AC_DEFUN([ZFS_AC_KERNEL_BIO_RW_SYNCIO], [ AC_MSG_CHECKING([whether BIO_RW_SYNCIO is defined]) ZFS_LINUX_TRY_COMPILE([ @@ -11,8 +28,22 @@ AC_DEFUN([ZFS_AC_KERNEL_BIO_RW_SYNCIO], [ flags = BIO_RW_SYNCIO; ],[ AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_BIO_RW_SYNCIO, 1, - [BIO_RW_SYNCIO is defined]) + AC_DEFINE(HAVE_BIO_RW_SYNCIO, 1, [BIO_RW_SYNCIO is defined]) + ],[ + AC_MSG_RESULT(no) + ]) +]) + +AC_DEFUN([ZFS_AC_KERNEL_REQ_SYNC], [ + AC_MSG_CHECKING([whether REQ_SYNC is defined]) + ZFS_LINUX_TRY_COMPILE([ + #include <linux/bio.h> + ],[ + int flags; + flags = REQ_SYNC; + ],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_REQ_SYNC, 1, [REQ_SYNC is defined]) ],[ AC_MSG_RESULT(no) ]) diff --git a/config/kernel.m4 b/config/kernel.m4 index c73284062..c2fc5a098 100644 --- a/config/kernel.m4 +++ b/config/kernel.m4 @@ -16,7 +16,9 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [ ZFS_AC_KERNEL_BIO_FAILFAST_DTD ZFS_AC_KERNEL_REQ_FAILFAST_MASK ZFS_AC_KERNEL_BIO_END_IO_T_ARGS + ZFS_AC_KERNEL_BIO_RW_SYNC ZFS_AC_KERNEL_BIO_RW_SYNCIO + ZFS_AC_KERNEL_REQ_SYNC ZFS_AC_KERNEL_BLK_END_REQUEST ZFS_AC_KERNEL_BLK_FETCH_REQUEST ZFS_AC_KERNEL_BLK_REQUEUE_REQUEST |