From: Jens Axboe <jaxboe@fusionio.com>
Date: Mon, 12 Sep 2011 09:30:01 +0000 (+0200)
Subject: Merge branch 'master' of ssh://router/data/git/fio
X-Git-Tag: fio-1.58~4
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=78d351576a09fa3400fee1411b3d59840c5038bb;hp=f57a9c59e366aa2f0621aa260bfd5ef5aeb61643

Merge branch 'master' of ssh://router/data/git/fio
---

diff --git a/fio.c b/fio.c
index 4514840d..b492889f 100644
--- a/fio.c
+++ b/fio.c
@@ -1502,10 +1502,8 @@ static void run_threads(void)
 	for_each_td(td, i) {
 		print_status_init(td->thread_number - 1);
 
-		if (!td->o.create_serialize) {
-			init_disk_util(td);
+		if (!td->o.create_serialize)
 			continue;
-		}
 
 		/*
 		 * do file setup here so it happens sequentially,
@@ -1533,8 +1531,6 @@ static void run_threads(void)
 					td_io_close_file(td, f);
 			}
 		}
-
-		init_disk_util(td);
 	}
 
 	set_genesis_time();
@@ -1573,6 +1569,8 @@ static void run_threads(void)
 				break;
 			}
 
+			init_disk_util(td);
+
 			/*
 			 * Set state to created. Thread will transition
 			 * to TD_INITIALIZED when it's done setting up.