projects
/
fio.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
97068f8
)
memory: double check that mmapfd isn't -1 before closing
author
Jens Axboe
<axboe@fb.com>
Mon, 5 Jan 2015 15:50:41 +0000
(08:50 -0700)
committer
Jens Axboe
<axboe@fb.com>
Mon, 5 Jan 2015 15:50:41 +0000
(08:50 -0700)
Signed-off-by: Jens Axboe <axboe@fb.com>
memory.c
patch
|
blob
|
blame
|
history
diff --git
a/memory.c
b/memory.c
index 76da8a86269e859889366c283281815e9ffac1dc..f81c2dd44aabaf937dd5db3b88c10a0cd6a992ca 100644
(file)
--- a/
memory.c
+++ b/
memory.c
@@
-158,7
+158,7
@@
static int alloc_mem_mmap(struct thread_data *td, size_t total_mem)
if (td->orig_buffer == MAP_FAILED) {
td_verror(td, errno, "mmap");
td->orig_buffer = NULL;
if (td->orig_buffer == MAP_FAILED) {
td_verror(td, errno, "mmap");
td->orig_buffer = NULL;
- if (td->mmapfd != 1) {
+ if (td->mmapfd != 1
&& td->mmapfd != -1
) {
close(td->mmapfd);
if (td->o.mmapfile)
unlink(td->o.mmapfile);
close(td->mmapfd);
if (td->o.mmapfile)
unlink(td->o.mmapfile);