From: Jens Axboe <jens.axboe@oracle.com>
Date: Wed, 4 Jun 2008 18:37:18 +0000 (+0200)
Subject: MAP_ANON requires fd == -1
X-Git-Tag: fio-1.21-rc8~5
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=a55820db03f7364d2414d4173e86e576a6f5b973;hp=dc873b6f4a536c332b72cce268d5a7ccd356a891

MAP_ANON requires fd == -1

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---

diff --git a/memory.c b/memory.c
index 3bf31d76..899a9e50 100644
--- a/memory.c
+++ b/memory.c
@@ -45,7 +45,7 @@ int fio_pin_memory(void)
 	}
 
 	pinned_mem = mmap(NULL, mlock_size, PROT_READ | PROT_WRITE,
-				MAP_PRIVATE | OS_MAP_ANON, 0, 0);
+				MAP_PRIVATE | OS_MAP_ANON, -1, 0);
 	if (pinned_mem == MAP_FAILED) {
 		perror("malloc locked mem");
 		pinned_mem = NULL;
@@ -106,7 +106,7 @@ static int alloc_mem_mmap(struct thread_data *td)
 {
 	int flags = MAP_PRIVATE;
 
-	td->mmapfd = 0;
+	td->mmapfd = 1;
 
 	if (td->mmapfile) {
 		td->mmapfd = open(td->mmapfile, O_RDWR|O_CREAT, 0644);