X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=engines%2Fmmap.c;h=f3d55c167691616a9d6478dba51e51154475ff3f;hb=f657a2fbbb0deaf455edc478d73b664929bcb766;hp=556e56de0e0289444965fc43e53d85f0e9dd25a9;hpb=2dc1bbeb58edc85f2829eed6729862c438ea2353;p=fio.git

diff --git a/engines/mmap.c b/engines/mmap.c
index 556e56de..f3d55c16 100644
--- a/engines/mmap.c
+++ b/engines/mmap.c
@@ -13,7 +13,6 @@
 #include <sys/mman.h>
 
 #include "../fio.h"
-#include "../os.h"
 
 static int fio_mmapio_queue(struct thread_data *td, struct io_u *io_u)
 {
@@ -25,7 +24,7 @@ static int fio_mmapio_queue(struct thread_data *td, struct io_u *io_u)
 	else if (io_u->ddir == DDIR_WRITE)
 		memcpy(f->mmap + real_off, io_u->xfer_buf, io_u->xfer_buflen);
 	else if (io_u->ddir == DDIR_SYNC) {
-		size_t len = (f->file_size + page_size - 1) & ~page_mask;
+		size_t len = (f->io_size + page_size - 1) & ~page_mask;
 
 		if (msync(f->mmap, len, MS_SYNC)) {
 			io_u->error = errno;
@@ -61,6 +60,12 @@ static int fio_mmapio_open(struct thread_data *td, struct fio_file *f)
 	if (ret)
 		return ret;
 
+	/*
+	 * for size checkup, don't mmap anything.
+	 */
+	if (!f->io_size)
+		return 0;
+
 	if (td_rw(td))
 		flags = PROT_READ | PROT_WRITE;
 	else if (td_write(td)) {
@@ -71,7 +76,7 @@ static int fio_mmapio_open(struct thread_data *td, struct fio_file *f)
 	} else
 		flags = PROT_READ;
 
-	f->mmap = mmap(NULL, f->file_size, flags, MAP_SHARED, f->fd, f->file_offset);
+	f->mmap = mmap(NULL, f->io_size, flags, MAP_SHARED, f->fd, f->file_offset);
 	if (f->mmap == MAP_FAILED) {
 		f->mmap = NULL;
 		td_verror(td, errno, "mmap");
@@ -82,12 +87,12 @@ static int fio_mmapio_open(struct thread_data *td, struct fio_file *f)
 		goto err;
 
 	if (!td_random(td)) {
-		if (madvise(f->mmap, f->file_size, MADV_SEQUENTIAL) < 0) {
+		if (madvise(f->mmap, f->io_size, MADV_SEQUENTIAL) < 0) {
 			td_verror(td, errno, "madvise");
 			goto err;
 		}
 	} else {
-		if (madvise(f->mmap, f->file_size, MADV_RANDOM) < 0) {
+		if (madvise(f->mmap, f->io_size, MADV_RANDOM) < 0) {
 			td_verror(td, errno, "madvise");
 			goto err;
 		}
@@ -104,7 +109,7 @@ static void fio_mmapio_close(struct thread_data fio_unused *td,
 			     struct fio_file *f)
 {
 	if (f->mmap) {
-		munmap(f->mmap, f->file_size);
+		munmap(f->mmap, f->io_size);
 		f->mmap = NULL;
 	}
 	generic_close_file(td, f);