From: Ruediger Meier <ruediger.meier@ga-group.nl>
Date: Wed, 9 Dec 2015 08:36:14 +0000 (+0100)
Subject: blkdiscard: fix timeval comparison inclusive usecs
X-Git-Tag: v2.28-rc1~233
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e765365798c54d412e355798ad584a52035f228;p=thirdparty%2Futil-linux.git

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 150689a621..a853a3519f 100644
--- 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;