Make it work on opensolaris

[fio.git] / engines / mmap.c

diff --git a/engines/mmap.c b/engines/mmap.c
index f3d55c167691616a9d6478dba51e51154475ff3f..5b55a811511d594cc5f84c86e828da7a6157c800 100644 (file)
--- a/engines/mmap.c
+++ b/engines/mmap.c
@@ -9,7 +9,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
-#include <assert.h>
 #include <sys/mman.h>
 
 #include "../fio.h"
@@ -19,6 +18,8 @@ static int fio_mmapio_queue(struct thread_data *td, struct io_u *io_u)
        struct fio_file *f = io_u->file;
        unsigned long long real_off = io_u->offset - f->file_offset;
 
+       fio_ro_check(td, io_u);
+
        if (io_u->ddir == DDIR_READ)
                memcpy(io_u->xfer_buf, f->mmap + real_off, io_u->xfer_buflen);
        else if (io_u->ddir == DDIR_WRITE)
@@ -105,14 +106,23 @@ err:
        return 1;
 }
 
-static void fio_mmapio_close(struct thread_data fio_unused *td,
-                            struct fio_file *f)
+static int fio_mmapio_close(struct thread_data fio_unused *td,
+                           struct fio_file *f)
 {
+       int ret = 0, ret2;
+
        if (f->mmap) {
-               munmap(f->mmap, f->io_size);
+               if (munmap(f->mmap, f->io_size) < 0)
+                       ret = errno;
+
                f->mmap = NULL;
        }
-       generic_close_file(td, f);
+
+       ret2 = generic_close_file(td, f);
+       if (!ret && ret2)
+               ret = ret2;
+
+       return ret;
 }
 
 static struct ioengine_ops ioengine = {