X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=eta.c;h=81dbfa7ef2833438ab9344431e6024f31e33075b;hp=8dbff985cac272795038a53d21ff14037fd6e825;hb=dc6d4dbbdd3a12e7df2bc0a713faebeae9d0dca2;hpb=d6978a3242daad9cb7b0710b724f19225d1ed7e2

diff --git a/eta.c b/eta.c
index 8dbff985..81dbfa7e 100644
--- a/eta.c
+++ b/eta.c
@@ -110,6 +110,13 @@ static int thread_eta(struct thread_data *td)
 
 	bytes_total = td->total_io_size;
 
+	if (td->o.fill_device && td->o.size  == -1ULL) {
+		if (!td->fill_device_size || td->fill_device_size == -1ULL)
+			return 0;
+
+		bytes_total = td->fill_device_size;
+	}
+
 	/*
 	 * if writing, bytes_total will be twice the size. If mixing,
 	 * assume a 50/50 split and thus bytes_total will be 50% larger.
@@ -124,9 +131,6 @@ static int thread_eta(struct thread_data *td)
 	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;
 
@@ -169,7 +173,8 @@ static int thread_eta(struct thread_data *td)
 			}
 		}
 		if (td->o.rate[0] || td->o.rate[1]) {
-			r_eta = (bytes_total / 1024) / (td->o.rate[0] + td->o.rate[1]);
+			r_eta = (bytes_total / 1024) /
+					(td->o.rate[0] + td->o.rate[1]);
 			r_eta += td->o.start_delay;
 		}
 
@@ -264,7 +269,8 @@ void print_thread_status(void)
 			t_rate += td->o.rate[0] + td->o.rate[1];
 			m_rate += td->o.ratemin[0] + td->o.ratemin[1];
 			t_iops += td->o.rate_iops[0] + td->o.rate_iops[1];
-			m_iops += td->o.rate_iops_min[0] + td->o.rate_iops_min[1];
+			m_iops += td->o.rate_iops_min[0] +
+					td->o.rate_iops_min[1];
 			files_open += td->nr_open_files;
 		} else if (td->runstate == TD_RAMP) {
 			nr_running++;
@@ -365,7 +371,7 @@ void print_thread_status(void)
 		iops_str[1] = num2str(iops[1], 4, 1, 0);
 
 		l = printf(": [%s] [%s] [%s/%s /s] [%s/%s iops] [eta %s]",
-				 run_str, perc_str, rate_str[0], rate_str[1], 
+				 run_str, perc_str, rate_str[0], rate_str[1],
 				 iops_str[0], iops_str[1], eta_str);
 		if (l >= 0 && l < linelen_last)
 			printf("%*s", linelen_last - l, "");