From: Jens Axboe <axboe@suse.de>
Date: Fri, 2 Jun 2006 09:09:25 +0000 (+0200)
Subject: [PATCH] Fixup merge error
X-Git-Tag: fio-1.4^0
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=4f97e0046deb9729371404a2919d9461939db5d7

[PATCH] Fixup merge error
---

diff --git a/fio.c b/fio.c
index 04496ea6..f1850552 100644
--- 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;