X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=include%2Fsys%2Fvdev_disk.h;h=03e7048ac665ba47dabf131e8def4623c1d8fa31;hb=6839eed23e3c9d85cf0de767be32af0759e5bf2d;hp=986c3362422e5ca0b6bb6738e1cde9c3bf2b3161;hpb=6283f55ea1b91e680386388c17d14b89e344fa8d;p=zfs.git

diff --git a/include/sys/vdev_disk.h b/include/sys/vdev_disk.h
index 986c336..03e7048 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)
@@ -88,6 +81,9 @@ extern int vdev_disk_read_rootlabel(char *, char *, nvlist_t **);
 # define vdev_bdev_block_size(bdev)	bdev_hardsect_size(bdev)
 #endif
 
+/* Default Linux IO Scheduler */
+#define	VDEV_SCHEDULER			"noop"
+
 #endif /* _KERNEL */
 
 #ifdef	__cplusplus