mmap engine: remove unused variable mmap_map_mask

[fio.git] / engines / mmap.c

diff --git a/engines/mmap.c b/engines/mmap.c
index 8bcd42ccd3892a237a09fa8ce04e6bee14e96474..c479ed39497ef8c3bd8c70e380cdd6e3f18c8be1 100644 (file)
--- a/engines/mmap.c
+++ b/engines/mmap.c
@@ -20,7 +20,6 @@
 #define MMAP_TOTAL_SZ  (1 * 1024 * 1024 * 1024UL)
 
 static unsigned long mmap_map_size;
-static unsigned long mmap_map_mask;
 
 struct fio_mmap_data {
        void *mmap_ptr;
@@ -62,6 +61,15 @@ 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)
@@ -198,26 +206,15 @@ static int fio_mmapio_queue(struct thread_data *td, struct io_u *io_u)
 static int fio_mmapio_init(struct thread_data *td)
 {
        struct thread_options *o = &td->o;
-       unsigned long shift, mask;
 
-       if ((td->o.rw_min_bs & page_mask) &&
+       if ((o->rw_min_bs & page_mask) &&
            (o->odirect || o->fsync_blocks || o->fdatasync_blocks)) {
                log_err("fio: mmap options dictate a minimum block size of "
                        "%llu bytes\n", (unsigned long long) page_size);
                return 1;
        }
 
-       mmap_map_size = MMAP_TOTAL_SZ / td->o.nr_files;
-       mask = mmap_map_size;
-       shift = 0;
-       do {
-               mask >>= 1;
-               if (!mask)
-                       break;
-               shift++;
-       } while (1);
-
-       mmap_map_mask = 1UL << shift;
+       mmap_map_size = MMAP_TOTAL_SZ / o->nr_files;
        return 0;
 }
 
@@ -232,8 +229,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;
        }
 
@@ -252,20 +249,6 @@ static int fio_mmapio_close_file(struct thread_data *td, struct fio_file *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,
@@ -274,7 +257,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,
 };