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
Fix gcc invalid prototype warnings
[zfs.git]
/
module
/
zfs
/
vdev_queue.c
diff --git
a/module/zfs/vdev_queue.c
b/module/zfs/vdev_queue.c
index
9867d09
..
8f86635
100644
(file)
--- a/
module/zfs/vdev_queue.c
+++ b/
module/zfs/vdev_queue.c
@@
-24,7
+24,6
@@
*/
#include <sys/zfs_context.h>
*/
#include <sys/zfs_context.h>
-#include <sys/spa_impl.h>
#include <sys/vdev_impl.h>
#include <sys/zio.h>
#include <sys/avl.h>
#include <sys/vdev_impl.h>
#include <sys/zio.h>
#include <sys/avl.h>
@@
-38,10
+37,10
@@
* of i/os pending to each device (before it starts ramping up to
* max_pending).
*/
* of i/os pending to each device (before it starts ramping up to
* max_pending).
*/
-int zfs_vdev_max_pending =
35
;
+int zfs_vdev_max_pending =
10
;
int zfs_vdev_min_pending = 4;
int zfs_vdev_min_pending = 4;
-/* deadline = pri +
(lbolt
>> time_shift) */
+/* deadline = pri +
ddi_get_lbolt64()
>> time_shift) */
int zfs_vdev_time_shift = 6;
/* exponential I/O issue ramp-up rate */
int zfs_vdev_time_shift = 6;
/* exponential I/O issue ramp-up rate */
@@
-286,7
+285,7
@@
again:
ASSERT(size <= zfs_vdev_aggregation_limit);
aio = zio_vdev_delegated_io(fio->io_vd, fio->io_offset,
ASSERT(size <= zfs_vdev_aggregation_limit);
aio = zio_vdev_delegated_io(fio->io_vd, fio->io_offset,
- zio_buf_alloc(size), size, fio->io_type, ZIO_PRIORITY_
NOW
,
+ zio_buf_alloc(size), size, fio->io_type, ZIO_PRIORITY_
AGG
,
flags | ZIO_FLAG_DONT_CACHE | ZIO_FLAG_DONT_QUEUE,
vdev_queue_agg_io_done, NULL);
flags | ZIO_FLAG_DONT_CACHE | ZIO_FLAG_DONT_QUEUE,
vdev_queue_agg_io_done, NULL);
@@
-360,7
+359,8
@@
vdev_queue_io(zio_t *zio)
mutex_enter(&vq->vq_lock);
mutex_enter(&vq->vq_lock);
- zio->io_deadline = (lbolt64 >> zfs_vdev_time_shift) + zio->io_priority;
+ zio->io_deadline = (ddi_get_lbolt64() >> zfs_vdev_time_shift) +
+ zio->io_priority;
vdev_queue_io_add(vq, zio);
vdev_queue_io_add(vq, zio);
@@
-383,12
+383,13
@@
void
vdev_queue_io_done(zio_t *zio)
{
vdev_queue_t *vq = &zio->io_vd->vdev_queue;
vdev_queue_io_done(zio_t *zio)
{
vdev_queue_t *vq = &zio->io_vd->vdev_queue;
+ int i;
mutex_enter(&vq->vq_lock);
avl_remove(&vq->vq_pending_tree, zio);
mutex_enter(&vq->vq_lock);
avl_remove(&vq->vq_pending_tree, zio);
- for (i
nt i
= 0; i < zfs_vdev_ramp_rate; i++) {
+ for (i = 0; i < zfs_vdev_ramp_rate; i++) {
zio_t *nio = vdev_queue_io_to_issue(vq, zfs_vdev_max_pending);
if (nio == NULL)
break;
zio_t *nio = vdev_queue_io_to_issue(vq, zfs_vdev_max_pending);
if (nio == NULL)
break;