This partly revert 97bb54c9606c(add __load_ioengine() to separate ioengine loading...

In commit 97bb54c9606c, it change load_ioengine to __load_ioengine in
func fio_show_ioengine_help. The different between load_ioengine and
__load_ioengine is load_ioengine include __load_ioengine and if
__load_ioengine failed it will do dlopen_ioengine to find ioengine.
For external ioengine, if no dlopen_ioengine it can't find, etc
libfio_ceph_objectstore.so in Ceph project.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>

diff --git a/ioengines.c b/ioengines.c
index 6ffd27f10ec9e303b16a7e00ffefec000cab67d2..d579682f4a051ce332b509b811e043c55b592c62 100644 (file)
--- a/ioengines.c
+++ b/ioengines.c
@@ -574,6 +574,7 @@ int td_io_get_file_size(struct thread_data *td, struct fio_file *f)
 int fio_show_ioengine_help(const char *engine)
 {
        struct flist_head *entry;
+       struct thread_data td;
        struct ioengine_ops *io_ops;
        char *sep;
        int ret = 1;
@@ -592,7 +593,10 @@ int fio_show_ioengine_help(const char *engine)
                sep++;
        }
 
-       io_ops = __load_ioengine(engine);
+       memset(&td, 0, sizeof(struct thread_data));
+       td.o.ioengine = (char *)engine;
+       io_ops = load_ioengine(&td);
+
        if (!io_ops) {
                log_info("IO engine %s not found\n", engine);
                return 1;
@@ -603,5 +607,6 @@ int fio_show_ioengine_help(const char *engine)
        else
                log_info("IO engine %s has no options\n", io_ops->name);
 
+       free_ioengine(&td);
        return ret;
 }