From: Vincent Fu <Vincent.Fu@sandisk.com>
Date: Thu, 16 Jun 2016 18:31:52 +0000 (-0400)
Subject: helper_thread: remove impossible branch
X-Git-Tag: fio-2.13~24
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=dd290fb4ab7d8e0f3aa88495096eb93177942fd7;hp=817720e1d9c3732e2e64548d3ff90b53876001a0;ds=sidebyside

helper_thread: remove impossible branch

I believe that the intention is to call update_io_ticks every
DISK_UTIL_MSEC. Make helper_thread_main do this.

Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/helper_thread.c b/helper_thread.c
index e788af5b..f031df4d 100644
--- a/helper_thread.c
+++ b/helper_thread.c
@@ -110,12 +110,8 @@ static void *helper_thread_main(void *data)
 			msec_to_next_event = DISK_UTIL_MSEC;
 			if (since_du >= DISK_UTIL_MSEC)
 				msec_to_next_event -= (since_du - DISK_UTIL_MSEC);
-		} else {
-			if (since_du >= DISK_UTIL_MSEC)
-				msec_to_next_event = DISK_UTIL_MSEC - (DISK_UTIL_MSEC - since_du);
-			else
-				msec_to_next_event = DISK_UTIL_MSEC;
-		}
+		} else
+			msec_to_next_event = DISK_UTIL_MSEC - since_du;
 
 		if (hd->do_stat) {
 			hd->do_stat = 0;