fio: move dynamic library handle to io_ops structure

[fio.git] / init.c

diff --git a/init.c b/init.c
index 1d14df169d0919e1a868320272ea68b646999e2d..ab38b334a9195b089d686785c9ec0d0d02d17dc4 100644 (file)
--- a/init.c
+++ b/init.c
@@ -1104,18 +1104,18 @@ int ioengine_load(struct thread_data *td)
                 * for this name and see if they match. If they do, then
                 * the engine is unchanged.
                 */
                 * for this name and see if they match. If they do, then
                 * the engine is unchanged.
                 */

-               dlhandle = td->io_ops_dlhandle;
+               dlhandle = td->io_ops->dlhandle;

                ops = load_ioengine(td);
                if (!ops)
                        goto fail;
 
                ops = load_ioengine(td);
                if (!ops)
                        goto fail;
 

-               if (ops == td->io_ops && dlhandle == td->io_ops_dlhandle) {
+               if (ops == td->io_ops && dlhandle == td->io_ops->dlhandle) {

                        if (dlhandle)
                                dlclose(dlhandle);
                        return 0;
                }
 
                        if (dlhandle)
                                dlclose(dlhandle);
                        return 0;
                }
 

-               if (dlhandle && dlhandle != td->io_ops_dlhandle)
+               if (dlhandle && dlhandle != td->io_ops->dlhandle)

                        dlclose(dlhandle);
 
                /* Unload the old engine. */
                        dlclose(dlhandle);
 
                /* Unload the old engine. */