Merge branch 'master' into gfio

[fio.git] / engines / libaio.c

diff --git a/engines/libaio.c b/engines/libaio.c
index 748233c268e1dad4a106c00c4c1497ad62010c0f..e9ce0ce7d4ac81c174d4932510b82c6fd732527d 100644 (file)
--- a/engines/libaio.c
+++ b/engines/libaio.c
@@ -14,8 +14,6 @@
 
 #ifdef FIO_HAVE_LIBAIO
 
-#define ev_to_iou(ev)  (struct io_u *) ((unsigned long) (ev)->obj)
-
 struct libaio_data {
        io_context_t aio_ctx;
        struct io_event *aio_events;
@@ -64,7 +62,7 @@ static struct io_u *fio_libaio_event(struct thread_data *td, int event)
        struct io_u *io_u;
 
        ev = ld->aio_events + event;
-       io_u = ev_to_iou(ev);
+       io_u = container_of(ev->obj, struct io_u, iocb);
 
        if (ev->res != io_u->xfer_buflen) {
                if (ev->res > io_u->xfer_buflen)