[PATCH] fio: use_mmap is gone, check io_engine

diff --git a/Makefile b/Makefile
index 30eb818a888550d6845901578536e94ad4bb4acb..065705ea311e894fd14f7f329a19bab315bcfbc0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 CC     = gcc
-CFLAGS = -Wall -O2 -g -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+CFLAGS = -Wall -g -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 PROGS  = dops fio sgioread drivescan
 SCRIPTS = fio_generate_plots
 

diff --git a/fio.c b/fio.c
index 3fd2859e2279e24d6046d632933e1de82045408b..9e5c60f1b867ba0ea4fa77ccd8e5951f1f3d554c 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -1304,7 +1304,7 @@ static int setup_file(struct thread_data *td)
        if (get_file_size(td))
                return 1;
 
-       if (!td->use_mmap)
+       if (td->io_engine != FIO_MMAPIO)
                return setup_file_plain(td);
        else
                return setup_file_mmap(td);

diff --git a/fio.h b/fio.h
index 3f2fc84f1edf926a70bd180480ef391acf8687ca..442052021f4e72393ce8131028e1fe488c030456 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -133,7 +133,6 @@ struct thread_data {
        unsigned int stonewall;
        unsigned int numjobs;
        unsigned int use_thread;
-       unsigned int use_mmap;
        os_cpu_mask_t cpumask;
 
        struct drand48_data bsrange_state;