Merge branch 'rados' of https://github.com/vincentkfu/fio

[fio.git] / backend.c

diff --git a/backend.c b/backend.c
index 0d1f473442e368cd82443ae0352dba5878a2b072..feb34e51382fbabcae94167ae98706babbe33416 100644 (file)
--- a/backend.c
+++ b/backend.c
@@ -237,15 +237,10 @@ static void cleanup_pending_aio(struct thread_data *td)
 {
        int r;
 
-       if (td->error)
-               return;
-
        /*
         * get immediately available events, if any
         */
        r = io_u_queued_complete(td, 0);
-       if (r < 0)
-               return;
 
        /*
         * now cancel remaining active events
@@ -2120,8 +2115,16 @@ static int fio_verify_load_state(struct thread_data *td)
                                        td->thread_number - 1, &data);
                if (!ret)
                        verify_assign_state(td, data);
-       } else
-               ret = verify_load_state(td, "local");
+       } else {
+               char prefix[PATH_MAX];
+
+               if (aux_path)
+                       sprintf(prefix, "%s%clocal", aux_path,
+                                       FIO_OS_PATH_SEPARATOR);
+               else
+                       strcpy(prefix, "local");
+               ret = verify_load_state(td, prefix);
+       }
 
        return ret;
 }