[PATCH] Fixup merge error

diff --git a/fio.c b/fio.c
index 04496ea6399c206795f5a733722aee250ec1cc7a..f185055241921a89d56595d478715711fe4bece9 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -1872,7 +1872,6 @@ static void *thread_main(void *data)
        td_set_runstate(td, TD_INITIALIZED);
        sem_post(&startup_sem);
        sem_wait(&td->mutex);
-       ret = 0;
 
        if (!td->create_serialize && setup_file(td))
                goto err;