projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
os/windows/posix.c: Strip trailing whitespace
[fio.git]
/
init.c
diff --git
a/init.c
b/init.c
index e220c323d13d1e4986a5ae0d2d26b07e5c3a0008..3710e3d404acf84599076098cbe6569282b448a8 100644
(file)
--- a/
init.c
+++ b/
init.c
@@
-956,7
+956,6
@@
static int fixup_options(struct thread_data *td)
*/
o->max_latency *= 1000ULL;
o->latency_target *= 1000ULL;
*/
o->max_latency *= 1000ULL;
o->latency_target *= 1000ULL;
- o->latency_window *= 1000ULL;
return ret;
}
return ret;
}
@@
-1100,6
+1099,9
@@
int ioengine_load(struct thread_data *td)
*/
dlhandle = td->io_ops_dlhandle;
ops = load_ioengine(td);
*/
dlhandle = td->io_ops_dlhandle;
ops = load_ioengine(td);
+ if (!ops)
+ goto fail;
+
if (ops == td->io_ops && dlhandle == td->io_ops_dlhandle) {
if (dlhandle)
dlclose(dlhandle);
if (ops == td->io_ops && dlhandle == td->io_ops_dlhandle) {
if (dlhandle)
dlclose(dlhandle);
@@
-1114,10
+1116,8
@@
int ioengine_load(struct thread_data *td)
}
td->io_ops = load_ioengine(td);
}
td->io_ops = load_ioengine(td);
- if (!td->io_ops) {
- log_err("fio: failed to load engine\n");
- return 1;
- }
+ if (!td->io_ops)
+ goto fail;
if (td->io_ops->option_struct_size && td->io_ops->options) {
/*
if (td->io_ops->option_struct_size && td->io_ops->options) {
/*
@@
-1156,6
+1156,11
@@
int ioengine_load(struct thread_data *td)
td_set_ioengine_flags(td);
return 0;
td_set_ioengine_flags(td);
return 0;
+
+fail:
+ log_err("fio: failed to load engine\n");
+ return 1;
+
}
static void init_flags(struct thread_data *td)
}
static void init_flags(struct thread_data *td)