projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Avoid irrelevant "offset extend ends" error message for chrdev"
[fio.git]
/
ioengines.c
diff --git
a/ioengines.c
b/ioengines.c
index fa4acab2b3fa349a57993d086048a4709cb9b68a..02eaee8484938d0e6310b1238e690ecda08dd3c6 100644
(file)
--- a/
ioengines.c
+++ b/
ioengines.c
@@
-52,14
+52,12
@@
static bool check_engine_ops(struct ioengine_ops *ops)
void unregister_ioengine(struct ioengine_ops *ops)
{
dprint(FD_IO, "ioengine %s unregistered\n", ops->name);
void unregister_ioengine(struct ioengine_ops *ops)
{
dprint(FD_IO, "ioengine %s unregistered\n", ops->name);
- flist_del(&ops->list);
- INIT_FLIST_HEAD(&ops->list);
+ flist_del_init(&ops->list);
}
void register_ioengine(struct ioengine_ops *ops)
{
dprint(FD_IO, "ioengine %s registered\n", ops->name);
}
void register_ioengine(struct ioengine_ops *ops)
{
dprint(FD_IO, "ioengine %s registered\n", ops->name);
- INIT_FLIST_HEAD(&ops->list);
flist_add_tail(&ops->list, &engine_list);
}
flist_add_tail(&ops->list, &engine_list);
}
@@
-133,8
+131,10
@@
static struct ioengine_ops *__load_ioengine(const char *name)
/*
* linux libaio has alias names, so convert to what we want
*/
/*
* linux libaio has alias names, so convert to what we want
*/
- if (!strncmp(engine, "linuxaio", 8) || !strncmp(engine, "aio", 3))
+ if (!strncmp(engine, "linuxaio", 8) || !strncmp(engine, "aio", 3)) {
+ dprint(FD_IO, "converting ioengine name: %s -> libaio\n", name);
strcpy(engine, "libaio");
strcpy(engine, "libaio");
+ }
dprint(FD_IO, "load ioengine %s\n", engine);
return find_ioengine(engine);
dprint(FD_IO, "load ioengine %s\n", engine);
return find_ioengine(engine);
@@
-342,8
+342,8
@@
int td_io_queue(struct thread_data *td, struct io_u *io_u)
td->o.odirect) {
log_info("fio: first direct IO errored. File system may not "
td->o.odirect) {
log_info("fio: first direct IO errored. File system may not "
- "support direct IO, or iomem_align= is bad
. Try
"
- "setting direct=0.\n");
+ "support direct IO, or iomem_align= is bad
, or
"
+ "
invalid block size. Try
setting direct=0.\n");
}
if (!td->io_ops->commit || io_u->ddir == DDIR_TRIM) {
}
if (!td->io_ops->commit || io_u->ddir == DDIR_TRIM) {
@@
-436,6
+436,7
@@
int td_io_open_file(struct thread_data *td, struct fio_file *f)
{
assert(!fio_file_open(f));
assert(f->fd == -1);
{
assert(!fio_file_open(f));
assert(f->fd == -1);
+ assert(td->io_ops->open_file);
if (td->io_ops->open_file(td, f)) {
if (td->error == EINVAL && td->o.odirect)
if (td->io_ops->open_file(td, f)) {
if (td->error == EINVAL && td->o.odirect)