summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2010-11-10 15:49:40 -0800
committerBrian Behlendorf <[email protected]>2010-11-10 17:00:33 -0800
commit675de5aa379bfceb0258a20c4ccd1414e4798ee6 (patch)
tree241b2262cb0250579b1bd14ab37ac003eef52adc /include
parentf4af6bb783b0b7f2a6075cb1c74c225db8a157b2 (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 'include')
-rw-r--r--include/sys/vdev_disk.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/include/sys/vdev_disk.h b/include/sys/vdev_disk.h
index 986c33624..021e66d1a 100644
--- a/include/sys/vdev_disk.h
+++ b/include/sys/vdev_disk.h
@@ -58,13 +58,6 @@ extern int vdev_disk_read_rootlabel(char *, char *, nvlist_t **);
# define BIO_END_IO_RETURN(rc) return rc
#endif /* HAVE_2ARGS_BIO_END_IO_T */
-/* 2.6.29 API change */
-#ifdef HAVE_BIO_RW_SYNCIO
-# define DIO_RW_SYNCIO BIO_RW_SYNCIO
-#else
-# define DIO_RW_SYNCIO BIO_RW_SYNC
-#endif /* HAVE_BIO_RW_SYNCIO */
-
/* 2.6.28 API change */
#ifdef HAVE_OPEN_BDEV_EXCLUSIVE
# define vdev_bdev_open(path, md, hld) open_bdev_exclusive(path, md, hld)