ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

blkdiscard: fix timeval comparison inclusive usecs 

We will see if this makes our "--step" tests reliable.

CC: Federico Simoncelli <fsimonce@redhat.com>
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
This commit is contained in:
Ruediger Meier 2015-12-09 09:36:14 +01:00
parent 6589a1632b
commit 0e76536579
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys-utils/blkdiscard.c
View File

@ -197,10 +197,11 @@ int main(int argc, char **argv)
err(EXIT_FAILURE, _("%s: BLKDISCARD ioctl failed"), path);
}
/* reporting progress */
/* reporting progress at most once per second */
if (verbose && step) {
gettime_monotonic(&now);
if (last.tv_sec < now.tv_sec) {
if (now.tv_sec > last.tv_sec &&
(now.tv_usec >= last.tv_usec || now.tv_sec > last.tv_sec + 1)) {
print_stats(path, stats);
stats[0] = range[0], stats[1] = 0;
last = now;