Merge branch 'master' into gfio

[fio.git] / ioengines.c

diff --git a/ioengines.c b/ioengines.c
index b43374e7afebb03a63d059fd5f09a36d582e67ba..8b71e13449638dfec259370a57b74d1f7f1258c2 100644 (file)
--- a/ioengines.c
+++ b/ioengines.c
@@ -104,7 +104,9 @@ static struct ioengine_ops *dlopen_ioengine(struct thread_data *td,
         * Unlike the included modules, external engines should have a
         * non-static ioengine structure that we can reference.
         */
-       ops = dlsym(dlhandle, "ioengine");
+       ops = dlsym(dlhandle, engine_lib);
+       if (!ops)
+               ops = dlsym(dlhandle, "ioengine");
        if (!ops) {
                td_vmsg(td, -1, dlerror(), "dlsym");
                dlclose(dlhandle);
@@ -234,7 +236,7 @@ int td_io_getevents(struct thread_data *td, unsigned int min, unsigned int max,
 out:
        if (r >= 0) {
                /*
-                * Reflect that our submitted requests were retrieved with
+                * Reflect that our submitted requests were retrieved with
                 * whatever OS async calls are in the underlying engine.
                 */
                td->io_u_in_flight -= r;
@@ -359,14 +361,14 @@ int td_io_commit(struct thread_data *td)
        if (!td->cur_depth || !td->io_u_queued)
                return 0;
 
-       io_u_mark_depth(td, td->io_u_queued);   
+       io_u_mark_depth(td, td->io_u_queued);
 
        if (td->io_ops->commit) {
                ret = td->io_ops->commit(td);
                if (ret)
                        td_verror(td, -ret, "io commit");
        }
-       
+
        /*
         * Reflect that events were submitted as async IO requests.
         */
@@ -531,7 +533,7 @@ int do_io_u_trim(struct thread_data *td, struct io_u *io_u)
 
        ret = os_trim(f->fd, io_u->offset, io_u->xfer_buflen);
        if (!ret)
-               return io_u->xfer_buflen;;
+               return io_u->xfer_buflen;
 
        io_u->error = ret;
        return 0;