git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use 'noop' IO Scheduler
[zfs.git]
/
include
/
sys
/
vdev_disk.h
diff --git
a/include/sys/vdev_disk.h
b/include/sys/vdev_disk.h
index
986c336
..
03e7048
100644
(file)
--- 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 */
# 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)
/* 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
# define vdev_bdev_block_size(bdev) bdev_hardsect_size(bdev)
#endif
+/* Default Linux IO Scheduler */
+#define VDEV_SCHEDULER "noop"
+
#endif /* _KERNEL */
#ifdef __cplusplus
#endif /* _KERNEL */
#ifdef __cplusplus