pmemblk: don't use #defines for the pmemblk_* functions

[fio.git] / engines / mmap.c

diff --git a/engines/mmap.c b/engines/mmap.c
index 6464cbada7f2cc189abbb23a282be37e6fbac7c9..14e4013de83cac82d09a1eafe013c18797b08970 100644 (file)
--- a/engines/mmap.c
+++ b/engines/mmap.c
@@ -62,6 +62,16 @@ static int fio_mmap_file(struct thread_data *td, struct fio_file *f,
                        goto err;
                }
        }
+       if (posix_madvise(fmd->mmap_ptr, length, POSIX_MADV_DONTNEED) < 0) {
+               td_verror(td, errno, "madvise");
+               goto err;
+       }
+
+#ifdef FIO_MADV_FREE
+       if (f->filetype == FIO_TYPE_BD)
+               (void) posix_madvise(fmd->mmap_ptr, fmd->mmap_sz, FIO_MADV_FREE);
+#endif
+
 
 err:
        if (td->error && fmd->mmap_ptr)
@@ -103,6 +113,11 @@ static int fio_mmapio_prep_full(struct thread_data *td, struct io_u *io_u)
 
        if (fio_file_partial_mmap(f))
                return EINVAL;
+       if (io_u->offset != (size_t) io_u->offset ||
+           f->io_size != (size_t) f->io_size) {
+               fio_file_set_partial_mmap(f);
+               return EINVAL;
+       }
 
        fmd->mmap_sz = f->io_size;
        fmd->mmap_off = 0;
@@ -227,8 +242,8 @@ static int fio_mmapio_open_file(struct thread_data *td, struct fio_file *f)
 
        fmd = calloc(1, sizeof(*fmd));
        if (!fmd) {
-               int fio_unused ret;
-               ret = generic_close_file(td, f);
+               int fio_unused __ret;
+               __ret = generic_close_file(td, f);
                return 1;
        }
 
@@ -242,24 +257,11 @@ static int fio_mmapio_close_file(struct thread_data *td, struct fio_file *f)
 
        FILE_SET_ENG_DATA(f, NULL);
        free(fmd);
+       fio_file_clear_partial_mmap(f);
 
        return generic_close_file(td, f);
 }
 
-static int fio_mmapio_invalidate(struct thread_data *td, struct fio_file *f)
-{
-       struct fio_mmap_data *fmd = FILE_ENG_DATA(f);
-       int ret;
-
-       ret = posix_madvise(fmd->mmap_ptr, fmd->mmap_sz, POSIX_MADV_DONTNEED);
-#ifdef FIO_MADV_FREE
-       if (f->filetype == FIO_TYPE_BD)
-               (void) posix_madvise(fmd->mmap_ptr, fmd->mmap_sz, FIO_MADV_FREE);
-#endif
-
-       return ret;
-}
-
 static struct ioengine_ops ioengine = {
        .name           = "mmap",
        .version        = FIO_IOOPS_VERSION,
@@ -268,7 +270,6 @@ static struct ioengine_ops ioengine = {
        .queue          = fio_mmapio_queue,
        .open_file      = fio_mmapio_open_file,
        .close_file     = fio_mmapio_close_file,
-       .invalidate     = fio_mmapio_invalidate,
        .get_file_size  = generic_get_file_size,
        .flags          = FIO_SYNCIO | FIO_NOEXTEND,
 };