Fixup -Wshadow warnings

[fio.git] / engines / mmap.c

diff --git a/engines/mmap.c b/engines/mmap.c
index 29ac5db24f585e46938fe83e8eb5fabbbee54222..14e4013de83cac82d09a1eafe013c18797b08970 100644 (file)
--- a/engines/mmap.c
+++ b/engines/mmap.c
@@ -31,7 +31,7 @@ struct fio_mmap_data {
 static int fio_mmap_file(struct thread_data *td, struct fio_file *f,
                         size_t length, off_t off)
 {
-       struct fio_mmap_data *fmd = (struct fio_mmap_data *) (uintptr_t) f->engine_data;
+       struct fio_mmap_data *fmd = FILE_ENG_DATA(f);
        int flags = 0;
 
        if (td_rw(td))
@@ -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)
@@ -76,7 +86,7 @@ err:
 static int fio_mmapio_prep_limited(struct thread_data *td, struct io_u *io_u)
 {
        struct fio_file *f = io_u->file;
-       struct fio_mmap_data *fmd = (struct fio_mmap_data *) (uintptr_t) f->engine_data;
+       struct fio_mmap_data *fmd = FILE_ENG_DATA(f);
 
        if (io_u->buflen > mmap_map_size) {
                log_err("fio: bs too big for mmap engine\n");
@@ -98,11 +108,16 @@ static int fio_mmapio_prep_limited(struct thread_data *td, struct io_u *io_u)
 static int fio_mmapio_prep_full(struct thread_data *td, struct io_u *io_u)
 {
        struct fio_file *f = io_u->file;
-       struct fio_mmap_data *fmd = (struct fio_mmap_data *) (uintptr_t) f->engine_data;
+       struct fio_mmap_data *fmd = FILE_ENG_DATA(f);
        int ret;
 
        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;
@@ -117,7 +132,7 @@ static int fio_mmapio_prep_full(struct thread_data *td, struct io_u *io_u)
 static int fio_mmapio_prep(struct thread_data *td, struct io_u *io_u)
 {
        struct fio_file *f = io_u->file;
-       struct fio_mmap_data *fmd = (struct fio_mmap_data *) (uintptr_t) f->engine_data;
+       struct fio_mmap_data *fmd = FILE_ENG_DATA(f);
        int ret;
 
        /*
@@ -152,7 +167,7 @@ done:
 static int fio_mmapio_queue(struct thread_data *td, struct io_u *io_u)
 {
        struct fio_file *f = io_u->file;
-       struct fio_mmap_data *fmd = (struct fio_mmap_data *) (uintptr_t) f->engine_data;
+       struct fio_mmap_data *fmd = FILE_ENG_DATA(f);
 
        fio_ro_check(td, io_u);
 
@@ -227,40 +242,26 @@ 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;
        }
 
-       f->engine_data = (uintptr_t) fmd;
+       FILE_SET_ENG_DATA(f, fmd);
        return 0;
 }
 
 static int fio_mmapio_close_file(struct thread_data *td, struct fio_file *f)
 {
-       struct fio_mmap_data *fmd;
+       struct fio_mmap_data *fmd = FILE_ENG_DATA(f);
 
-       fmd = (struct fio_mmap_data *) (uintptr_t) f->engine_data;
-       f->engine_data = 0;
+       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 = (struct fio_mmap_data *) (uintptr_t) f->engine_data;
-       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,
@@ -269,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,
 };