Add suppor for logging fsync (and friends) latencies

[fio.git] / engines / mmap.c

diff --git a/engines/mmap.c b/engines/mmap.c
index c479ed39497ef8c3bd8c70e380cdd6e3f18c8be1..77556588e1a21218ead2006d5d73ee1bd41087c5 100644 (file)
--- a/engines/mmap.c
+++ b/engines/mmap.c
@@ -15,7 +15,7 @@
 #include "../verify.h"
 
 /*
- * Limits us to 1GB of mapped files in total
+ * Limits us to 1GiB of mapped files in total
  */
 #define MMAP_TOTAL_SZ  (1 * 1024 * 1024 * 1024UL)
 
@@ -33,9 +33,9 @@ static int fio_mmap_file(struct thread_data *td, struct fio_file *f,
        struct fio_mmap_data *fmd = FILE_ENG_DATA(f);
        int flags = 0;
 
-       if (td_rw(td))
+       if (td_rw(td) && !td->o.verify_only)
                flags = PROT_READ | PROT_WRITE;
-       else if (td_write(td)) {
+       else if (td_write(td) && !td->o.verify_only) {
                flags = PROT_WRITE;
 
                if (td->o.verify != VERIFY_NONE)
@@ -67,7 +67,7 @@ static int fio_mmap_file(struct thread_data *td, struct fio_file *f,
        }
 
 #ifdef FIO_MADV_FREE
-       if (f->filetype == FIO_TYPE_BD)
+       if (f->filetype == FIO_TYPE_BLOCK)
                (void) posix_madvise(fmd->mmap_ptr, fmd->mmap_sz, FIO_MADV_FREE);
 #endif
 
@@ -137,7 +137,7 @@ static int fio_mmapio_prep(struct thread_data *td, struct io_u *io_u)
         * It fits within existing mapping, use it
         */
        if (io_u->offset >= fmd->mmap_off &&
-           io_u->offset + io_u->buflen < fmd->mmap_off + fmd->mmap_sz)
+           io_u->offset + io_u->buflen <= fmd->mmap_off + fmd->mmap_sz)
                goto done;
 
        /*