Add -lhHpw options to "zpool iostat" for avg latency, histograms, & queues

[mirror_zfs.git] / module / zfs / vdev_disk.c

diff --git a/module/zfs/vdev_disk.c b/module/zfs/vdev_disk.c
index 9b51ecc1d9687cd8bd805cfa2fb3de27c02adbfa..4e362226a88067d870f73fcdf4590363eeca699f 100644 (file)
--- a/module/zfs/vdev_disk.c
+++ b/module/zfs/vdev_disk.c
@@ -100,9 +100,9 @@ vdev_disk_error(zio_t *zio)
 {
 #ifdef ZFS_DEBUG
        printk("ZFS: zio error=%d type=%d offset=%llu size=%llu "
-           "flags=%x delay=%llu\n", zio->io_error, zio->io_type,
+           "flags=%x\n", zio->io_error, zio->io_type,
            (u_longlong_t)zio->io_offset, (u_longlong_t)zio->io_size,
-           zio->io_flags, (u_longlong_t)zio->io_delay);
+           zio->io_flags);
 #endif
 }
 
@@ -410,7 +410,6 @@ vdev_disk_dio_put(dio_request_t *dr)
                vdev_disk_dio_free(dr);
 
                if (zio) {
-                       zio->io_delay = jiffies_64 - zio->io_delay;
                        zio->io_error = error;
                        ASSERT3S(zio->io_error, >=, 0);
                        if (zio->io_error)
@@ -588,8 +587,6 @@ retry:
 
        /* Extra reference to protect dio_request during vdev_submit_bio */
        vdev_disk_dio_get(dr);
-       if (zio)
-               zio->io_delay = jiffies_64;
 
        /* Submit all bio's associated with this dio */
        for (i = 0; i < dr->dr_bio_count; i++)
@@ -630,7 +627,6 @@ BIO_END_IO_PROTO(vdev_disk_io_flush_completion, bio, rc)
        int rc = bio->bi_error;
 #endif
 
-       zio->io_delay = jiffies_64 - zio->io_delay;
        zio->io_error = -rc;
        if (rc && (rc == -EOPNOTSUPP))
                zio->io_vd->vdev_nowritecache = B_TRUE;
@@ -660,7 +656,6 @@ vdev_disk_io_flush(struct block_device *bdev, zio_t *zio)
        bio->bi_end_io = vdev_disk_io_flush_completion;
        bio->bi_private = zio;
        bio->bi_bdev = bdev;
-       zio->io_delay = jiffies_64;
        vdev_submit_bio(VDEV_WRITE_FLUSH_FUA, bio);
        invalidate_bdev(bdev);