X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=engines%2Flibaio.c;h=e15c519e453015422db3513866fad84844a0e464;hb=a3e594123de4a010776b6fc2aaac75de35c5251a;hp=60dc49d3352a950fa522931ccdfe52a601628975;hpb=82407585a3b3b10281428e4ca9c2d3e7dfca7392;p=fio.git diff --git a/engines/libaio.c b/engines/libaio.c index 60dc49d3..e15c519e 100644 --- a/engines/libaio.c +++ b/engines/libaio.c @@ -13,6 +13,7 @@ #include "../fio.h" #include "../lib/pow2.h" +#include "../optgroup.h" static int fio_libaio_commit(struct thread_data *td); @@ -82,7 +83,7 @@ static int fio_libaio_prep(struct thread_data fio_unused *td, struct io_u *io_u) static struct io_u *fio_libaio_event(struct thread_data *td, int event) { - struct libaio_data *ld = td->io_ops->data; + struct libaio_data *ld = td->io_ops_data; struct io_event *ev; struct io_u *io_u; @@ -144,7 +145,7 @@ static int user_io_getevents(io_context_t aio_ctx, unsigned int max, static int fio_libaio_getevents(struct thread_data *td, unsigned int min, unsigned int max, const struct timespec *t) { - struct libaio_data *ld = td->io_ops->data; + struct libaio_data *ld = td->io_ops_data; struct libaio_options *o = td->eo; unsigned actual_min = td->o.iodepth_batch_complete_min == 0 ? 0 : min; struct timespec __lt, *lt = NULL; @@ -180,7 +181,7 @@ static int fio_libaio_getevents(struct thread_data *td, unsigned int min, static int fio_libaio_queue(struct thread_data *td, struct io_u *io_u) { - struct libaio_data *ld = td->io_ops->data; + struct libaio_data *ld = td->io_ops_data; fio_ro_check(td, io_u); @@ -237,7 +238,7 @@ static void fio_libaio_queued(struct thread_data *td, struct io_u **io_us, static int fio_libaio_commit(struct thread_data *td) { - struct libaio_data *ld = td->io_ops->data; + struct libaio_data *ld = td->io_ops_data; struct iocb **iocbs; struct io_u **io_us; struct timeval tv; @@ -307,14 +308,14 @@ static int fio_libaio_commit(struct thread_data *td) static int fio_libaio_cancel(struct thread_data *td, struct io_u *io_u) { - struct libaio_data *ld = td->io_ops->data; + struct libaio_data *ld = td->io_ops_data; return io_cancel(ld->aio_ctx, &io_u->iocb, ld->aio_events); } static void fio_libaio_cleanup(struct thread_data *td) { - struct libaio_data *ld = td->io_ops->data; + struct libaio_data *ld = td->io_ops_data; if (ld) { /* @@ -362,7 +363,7 @@ static int fio_libaio_init(struct thread_data *td) ld->iocbs = calloc(ld->entries, sizeof(struct iocb *)); ld->io_us = calloc(ld->entries, sizeof(struct io_u *)); - td->io_ops->data = ld; + td->io_ops_data = ld; return 0; }