3246 ZFS I/O deadman thread

[zfs.git] / include / sys / zio.h

diff --git a/include/sys/zio.h b/include/sys/zio.h
index 0527979..0353033 100644 (file)
--- a/include/sys/zio.h
+++ b/include/sys/zio.h
@@ -21,10 +21,9 @@
 
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- */
-/*
  * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
  * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
  */
 
 #ifndef _ZIO_H
@@ -108,6 +107,7 @@ enum zio_compress {
        ZIO_COMPRESS_GZIP_8,
        ZIO_COMPRESS_GZIP_9,
        ZIO_COMPRESS_ZLE,
+       ZIO_COMPRESS_LZ4,
        ZIO_COMPRESS_FUNCTIONS
 };
 
@@ -116,6 +116,7 @@ enum zio_compress {
 
 #define        BOOTFS_COMPRESS_VALID(compress)                 \
        ((compress) == ZIO_COMPRESS_LZJB ||             \
+       (compress) == ZIO_COMPRESS_LZ4 ||               \
        ((compress) == ZIO_COMPRESS_ON &&               \
        ZIO_COMPRESS_ON_VALUE == ZIO_COMPRESS_LZJB) ||  \
        (compress) == ZIO_COMPRESS_OFF)
@@ -408,7 +409,10 @@ struct zio {
        const zio_vsd_ops_t *io_vsd_ops;
 
        uint64_t        io_offset;
-       uint64_t        io_deadline;
+       uint64_t        io_deadline;    /* expires at timestamp + deadline */
+       uint64_t        io_timestamp;   /* submitted at (ticks) */
+       uint64_t        io_delta;       /* vdev queue service delta (ticks) */
+       uint64_t        io_delay;       /* vdev disk service delta (ticks) */
        avl_node_t      io_offset_node;
        avl_node_t      io_deadline_node;
        avl_tree_t      *io_vdev_tree;
@@ -420,7 +424,6 @@ struct zio {
        enum zio_flag   io_orig_flags;
        enum zio_stage  io_orig_stage;
        enum zio_stage  io_orig_pipeline;
-       uint64_t        io_delay;
        int             io_error;
        int             io_child_error[ZIO_CHILD_TYPES];
        uint64_t        io_children[ZIO_CHILD_TYPES][ZIO_WAIT_TYPES];
@@ -557,6 +560,7 @@ extern int zio_handle_fault_injection(zio_t *zio, int error);
 extern int zio_handle_device_injection(vdev_t *vd, zio_t *zio, int error);
 extern int zio_handle_label_injection(zio_t *zio, int error);
 extern void zio_handle_ignored_writes(zio_t *zio);
+extern uint64_t zio_handle_io_delay(zio_t *zio);
 
 /*
  * Checksum ereport functions