From 4f97e0046deb9729371404a2919d9461939db5d7 Mon Sep 17 00:00:00 2001
From: Jens Axboe <axboe@suse.de>
Date: Fri, 2 Jun 2006 11:09:25 +0200
Subject: [PATCH] [PATCH] Fixup merge error

---
 fio.c | 1 -
 1 file changed, 1 deletion(-)

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;
-- 
2.25.1