commit 9c5a3854b03356e8dfe929477bf1ea67afcb8ad3
author Shaozhi Shawn Ye <yeshao@google.com> Wed Sep 10 09:09:37 2008 +0200
committer Jens Axboe <jens.axboe@oracle.com> Wed Sep 10 09:09:37 2008 +0200
tree a4f3ae4b89edf0ec00e63e7043a78dcb03561172
parent 8954110682922232b8bccfe2b7e734d04ce71b96

eta: fix bugs withe fill_device and exitall_on_terminate

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

eta.c

diff --git a/eta.c b/eta.c
index 766f650..47e9e33 100644
--- a/eta.c
+++ b/eta.c
@@ -115,6 +115,9 @@
 	if (td->o.zone_size && td->o.zone_skip)
 		bytes_total /= (td->o.zone_skip / td->o.zone_size);
 
+	if (td->o.fill_device && td->o.size  == -1ULL)
+		return 0;
+
 	if (td->runstate == TD_RUNNING || td->runstate == TD_VERIFYING) {
 		double perc, perc_t;
 
@@ -247,8 +250,13 @@
 		eta_sec = 0;
 
 	for_each_td(td, i) {
-		if (eta_secs[i] != INT_MAX)
-			eta_sec += eta_secs[i];
+		if (exitall_on_terminate) {
+			if (eta_secs[i] < eta_sec)
+				eta_sec = eta_secs[i];
+		} else {
+			if (eta_secs[i] > eta_sec)
+				eta_sec = eta_secs[i];
+		}
 	}
 
 	free(eta_secs);