Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio

diff --git a/engines/libaio.c b/engines/libaio.c
index bc459da1fcbaf5a310305cc4e4d2b63136c873a8..f17260d32911523b563d3c8493abcb3f67960eba 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;
@@ -62,7 +60,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)