projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
filesetup: revert O_DIRECT for layout mess
[fio.git]
/
filesetup.c
diff --git
a/filesetup.c
b/filesetup.c
index 4ceaef6b376716b2ffa0b77aa308e1d741e2c18a..b51ab35ce08b59ccbff3d2d7f2da2692c69a85aa 100644
(file)
--- a/
filesetup.c
+++ b/
filesetup.c
@@
-15,7
+15,6
@@
#include "os/os.h"
#include "hash.h"
#include "lib/axmap.h"
#include "os/os.h"
#include "hash.h"
#include "lib/axmap.h"
-#include "lib/memalign.h"
#ifdef CONFIG_LINUX_FALLOCATE
#include <linux/falloc.h>
#ifdef CONFIG_LINUX_FALLOCATE
#include <linux/falloc.h>
@@
-147,8
+146,6
@@
static int extend_file(struct thread_data *td, struct fio_file *f)
flags |= O_CREAT;
if (new_layout)
flags |= O_TRUNC;
flags |= O_CREAT;
if (new_layout)
flags |= O_TRUNC;
- if (td->o.odirect)
- flags |= OS_O_DIRECT;
#ifdef WIN32
flags |= _O_BINARY;
#ifdef WIN32
flags |= _O_BINARY;
@@
-162,14
+159,8
@@
static int extend_file(struct thread_data *td, struct fio_file *f)
if (err == ENOENT && !td->o.allow_create)
log_err("fio: file creation disallowed by "
"allow_file_create=0\n");
if (err == ENOENT && !td->o.allow_create)
log_err("fio: file creation disallowed by "
"allow_file_create=0\n");
- else {
- if (err == EINVAL && (flags & OS_O_DIRECT))
- log_err("fio: looks like your filesystem "
- "does not support "
- "direct=1/buffered=0\n");
-
+ else
td_verror(td, err, "open");
td_verror(td, err, "open");
- }
return 1;
}
return 1;
}
@@
-196,17
+187,14
@@
static int extend_file(struct thread_data *td, struct fio_file *f)
}
}
}
}
- if (td->o.odirect && !OS_O_DIRECT && fio_set_directio(td, f))
- goto err;
-
left = f->real_file_size;
bs = td->o.max_bs[DDIR_WRITE];
if (bs > left)
bs = left;
left = f->real_file_size;
bs = td->o.max_bs[DDIR_WRITE];
if (bs > left)
bs = left;
- b =
fio_memalign(page_size,
bs);
+ b =
malloc(
bs);
if (!b) {
if (!b) {
- td_verror(td, errno, "
fio_memalign
");
+ td_verror(td, errno, "
malloc
");
goto err;
}
goto err;
}
@@
-259,14
+247,14
@@
static int extend_file(struct thread_data *td, struct fio_file *f)
f->io_size = f->real_file_size;
}
f->io_size = f->real_file_size;
}
- f
io_memfree(b, bs
);
+ f
ree(b
);
done:
return 0;
err:
close(f->fd);
f->fd = -1;
if (b)
done:
return 0;
err:
close(f->fd);
f->fd = -1;
if (b)
- f
io_memfree(b, bs
);
+ f
ree(b
);
return 1;
}
return 1;
}
@@
-1862,7
+1850,7
@@
void filesetup_mem_free(void)
int fio_set_directio(struct thread_data *td, struct fio_file *f)
{
#ifdef FIO_OS_DIRECTIO
int fio_set_directio(struct thread_data *td, struct fio_file *f)
{
#ifdef FIO_OS_DIRECTIO
- int ret = fio_set_odirect(f
->fd
);
+ int ret = fio_set_odirect(f);
if (ret) {
td_verror(td, ret, "fio_set_directio");
if (ret) {
td_verror(td, ret, "fio_set_directio");