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>

diff --git a/sys-utils/blkdiscard.c b/sys-utils/blkdiscard.c
index 150689a62182e31180e80fb77175d09349a2a1bc..a853a3519f01888a3b07def065212243a7323c68 100644 (file)
--- a/sys-utils/blkdiscard.c
+++ b/sys-utils/blkdiscard.c
@@ -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;