Merge branch 'wip-rbd-engine-tweaks' of https://github.com/dillaman/fio

[fio.git] / zbd.h

diff --git a/zbd.h b/zbd.h
index 9c447af40f707fd65cbe652674e5a374a34d4878..bff55f998edeea9bfede0c09c2e8ab9b81041cf8 100644 (file)
--- a/zbd.h
+++ b/zbd.h
@@ -23,6 +23,7 @@ enum io_u_action {
  * struct fio_zone_info - information about a single ZBD zone
  * @start: zone start location (bytes)
  * @wp: zone write pointer location (bytes)
+ * @capacity: maximum size usable from the start of a zone (bytes)
  * @verify_block: number of blocks that have been verified for this zone
  * @mutex: protects the modifiable members in this structure
  * @type: zone type (BLK_ZONE_TYPE_*)
@@ -35,6 +36,7 @@ struct fio_zone_info {
        pthread_mutex_t         mutex;
        uint64_t                start;
        uint64_t                wp;
+       uint64_t                capacity;
        uint32_t                verify_block;
        enum zbd_zone_type      type:2;
        enum zbd_zone_cond      cond:4;
@@ -49,7 +51,7 @@ struct fio_zone_info {
  *     sequential write zones.
  * @mutex: Protects the modifiable members in this structure (refcount and
  *             num_open_zones).
- * @zone_size: size of a single zone in units of 512 bytes
+ * @zone_size: size of a single zone in bytes.
  * @sectors_with_data: total size of data in all zones in units of 512 bytes
  * @zone_size_log2: log2 of the zone size in bytes if it is a power of 2 or 0
  *             if the zone size is not a power of 2.
@@ -96,18 +98,19 @@ static inline void zbd_close_file(struct fio_file *f)
                zbd_free_zone_info(f);
 }
 
-static inline void zbd_queue_io_u(struct io_u *io_u, enum fio_q_status status)
+static inline void zbd_queue_io_u(struct thread_data *td, struct io_u *io_u,
+                                 enum fio_q_status status)
 {
        if (io_u->zbd_queue_io) {
-               io_u->zbd_queue_io(io_u, status, io_u->error == 0);
+               io_u->zbd_queue_io(td, io_u, status, io_u->error == 0);
                io_u->zbd_queue_io = NULL;
        }
 }
 
-static inline void zbd_put_io_u(struct io_u *io_u)
+static inline void zbd_put_io_u(struct thread_data *td, struct io_u *io_u)
 {
        if (io_u->zbd_put_io) {
-               io_u->zbd_put_io(io_u);
+               io_u->zbd_put_io(td, io_u);
                io_u->zbd_queue_io = NULL;
                io_u->zbd_put_io = NULL;
        }