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

diff --git a/engines/posixaio.c b/engines/posixaio.c
index 7d9aaaf18314bffe3ea30fe211918d69e89b8095..88dc0e90a654f2d49f372194a3caf6fe575684de 100644 (file)
--- a/engines/posixaio.c
+++ b/engines/posixaio.c
@@ -98,18 +98,20 @@ restart:
                        continue;
 
                err = aio_error(&io_u->aiocb);
-               switch (err) {
-                       default:
-                               io_u->error = err;
-                       case ECANCELED:
-                               io_u->resid = io_u->xfer_buflen;
-                       case 0:
-                               pd->aio_events[r++] = io_u;
-                               io_u->seen = 1;
-                               break;
-                       case EINPROGRESS:
-                               break;
-               }
+               if (err == EINPROGRESS)
+                       continue;
+
+               io_u->seen = 1;
+               pd->aio_events[r++] = io_u;
+
+               if (err == ECANCELED)
+                       io_u->resid = io_u->xfer_buflen;
+               else if (!err) {
+                       ssize_t retval = aio_return(&io_u->aiocb);
+
+                       io_u->resid = io_u->xfer_buflen - retval;
+               } else
+                       io_u->error = err;
 
                if (r >= max)
                        break;

diff --git a/filesetup.c b/filesetup.c
index abcdc1d05da17051073124457d7be62ab461e124..f43efe0d395162a70bdc9319c760909ed5b27585 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -435,7 +435,6 @@ void close_files(struct thread_data *td)
        }
 
        td->filename = NULL;
-       free(td->files);
        td->files = NULL;
        td->nr_files = 0;
 }