projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix undeclared mkdir() on Fedora 13
[fio.git]
/
eta.c
diff --git
a/eta.c
b/eta.c
index 53dcc93aa4d6b157d7d64037d34ad99526cb10ce..81dbfa7ef2833438ab9344431e6024f31e33075b 100644
(file)
--- a/
eta.c
+++ b/
eta.c
@@
-110,6
+110,13
@@
static int thread_eta(struct thread_data *td)
bytes_total = td->total_io_size;
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.
/*
* 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.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;
if (td->runstate == TD_RUNNING || td->runstate == TD_VERIFYING) {
double perc, perc_t;