From: Jens Axboe <axboe@suse.de>
Date: Tue, 6 Dec 2005 12:02:32 +0000 (+0100)
Subject: [PATCH] fio: use_mmap is gone, check io_engine
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=b600618bfc15710ab187e88dd4e9cb1491aced60;p=disktools.git

[PATCH] fio: use_mmap is gone, check io_engine
---

diff --git a/Makefile b/Makefile
index 30eb818..065705e 100644
--- 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 3fd2859..9e5c60f 100644
--- 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 3f2fc84..4420520 100644
--- 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;