[PATCH] mmap io engine had broken sync

[fio.git] / engines / fio-engine-mmap.c

diff --git a/engines/fio-engine-mmap.c b/engines/fio-engine-mmap.c
index ad294f5d687f80d5a0555e12bc6ad05dbb87fb4c..483a704eb19bfa45c37c4b6a772032a03481f95f 100644 (file)
--- a/engines/fio-engine-mmap.c
+++ b/engines/fio-engine-mmap.c
@@ -48,13 +48,17 @@ static int fio_mmapio_queue(struct thread_data *td, struct io_u *io_u)
 
        if (io_u->ddir == DDIR_READ)
                memcpy(io_u->buf, f->mmap + real_off, io_u->buflen);
-       else
+       else if (io_u->ddir == DDIR_WRITE)
                memcpy(f->mmap + real_off, io_u->buf, io_u->buflen);
+       else if (io_u->ddir == DDIR_SYNC) {
+               if (msync(f->mmap, f->file_size, MS_SYNC))
+                       io_u->error = errno;
+       }
 
        /*
         * not really direct, but should drop the pages from the cache
         */
-       if (td->odirect) {
+       if (td->odirect && io_u->ddir != DDIR_SYNC) {
                if (msync(f->mmap + real_off, io_u->buflen, MS_SYNC) < 0)
                        io_u->error = errno;
                if (madvise(f->mmap + real_off, io_u->buflen,  MADV_DONTNEED) < 0)
@@ -67,11 +71,6 @@ static int fio_mmapio_queue(struct thread_data *td, struct io_u *io_u)
        return io_u->error;
 }
 
-static int fio_mmapio_sync(struct thread_data *td, struct fio_file *f)
-{
-       return msync(f->mmap, f->file_size, MS_SYNC);
-}
-
 static void fio_mmapio_cleanup(struct thread_data *td)
 {
        if (td->io_ops->data) {
@@ -97,6 +96,5 @@ struct ioengine_ops ioengine = {
        .getevents      = fio_mmapio_getevents,
        .event          = fio_mmapio_event,
        .cleanup        = fio_mmapio_cleanup,
-       .sync           = fio_mmapio_sync,
-       .flags          = FIO_SYNCIO,
+       .flags          = FIO_SYNCIO | FIO_MMAPIO,
 };