Merge branch 'doc-patches' of https://github.com/vincentkfu/fio

[fio.git] / engines / posixaio.c

diff --git a/engines/posixaio.c b/engines/posixaio.c
index 8ab88fbb1faf2821c442015f85f78e24cb1d244d..bddb1ec3f2697e43dff46dcc726ed31e419f27f0 100644 (file)
--- a/engines/posixaio.c
+++ b/engines/posixaio.c
@@ -93,7 +93,7 @@ static int fio_posixaio_prep(struct thread_data fio_unused *td,
 static int fio_posixaio_getevents(struct thread_data *td, unsigned int min,
                                  unsigned int max, const struct timespec *t)
 {
-       struct posixaio_data *pd = td->io_ops->data;
+       struct posixaio_data *pd = td->io_ops_data;
        os_aiocb_t *suspend_list[SUSPEND_ENTRIES];
        struct timespec start;
        int have_timeout = 0;
@@ -109,7 +109,7 @@ static int fio_posixaio_getevents(struct thread_data *td, unsigned int min,
 
        r = 0;
 restart:
-       memset(suspend_list, 0, sizeof(*suspend_list));
+       memset(suspend_list, 0, sizeof(suspend_list));
        suspend_entries = 0;
        io_u_qiter(&td->io_u_all, io_u, i) {
                int err;
@@ -161,7 +161,7 @@ restart:
 
 static struct io_u *fio_posixaio_event(struct thread_data *td, int event)
 {
-       struct posixaio_data *pd = td->io_ops->data;
+       struct posixaio_data *pd = td->io_ops_data;
 
        return pd->aio_events[event];
 }
@@ -169,7 +169,7 @@ static struct io_u *fio_posixaio_event(struct thread_data *td, int event)
 static int fio_posixaio_queue(struct thread_data *td,
                              struct io_u *io_u)
 {
-       struct posixaio_data *pd = td->io_ops->data;
+       struct posixaio_data *pd = td->io_ops_data;
        os_aiocb_t *aiocb = &io_u->aiocb;
        int ret;
 
@@ -198,7 +198,7 @@ static int fio_posixaio_queue(struct thread_data *td,
        }
 
        if (ret) {
-               int aio_err = aio_error(aiocb);
+               int aio_err = errno;
 
                /*
                 * At least OSX has a very low limit on the number of pending
@@ -220,7 +220,7 @@ static int fio_posixaio_queue(struct thread_data *td,
 
 static void fio_posixaio_cleanup(struct thread_data *td)
 {
-       struct posixaio_data *pd = td->io_ops->data;
+       struct posixaio_data *pd = td->io_ops_data;
 
        if (pd) {
                free(pd->aio_events);
@@ -236,7 +236,7 @@ static int fio_posixaio_init(struct thread_data *td)
        pd->aio_events = malloc(td->o.iodepth * sizeof(struct io_u *));
        memset(pd->aio_events, 0, td->o.iodepth * sizeof(struct io_u *));
 
-       td->io_ops->data = pd;
+       td->io_ops_data = pd;
        return 0;
 }