summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Axboe <axboe@suse.de>2006-06-02 11:09:25 +0200
committerJens Axboe <axboe@suse.de>2006-06-02 11:09:25 +0200
commit4f97e0046deb9729371404a2919d9461939db5d7 (patch)
tree9c4a316e584e5dbb4d6ce1a94db0df0c5d2d68f6
parenta12fc0225482bd1580a332312f2a60f73a9ebc28 (diff)
downloadfio-4f97e0046deb9729371404a2919d9461939db5d7.tar.gz
fio-4f97e0046deb9729371404a2919d9461939db5d7.tar.bz2
[PATCH] Fixup merge errorfio-1.4
-rw-r--r--fio.c1
1 files changed, 0 insertions, 1 deletions
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;