From: Ruediger Meier <ruediger.meier@ga-group.nl>
Date: Wed, 9 Dec 2015 11:57:43 +0000 (+0100)
Subject: blkdiscard: fix stats reporting (off by one)
X-Git-Tag: v2.28-rc1~232
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3e91e26467a0f644ee568bb0b3d481591834015;p=thirdparty%2Futil-linux.git

blkdiscard: fix stats reporting (off by one)

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 a853a3519f..bb4bae6ea6 100644
--- a/sys-utils/blkdiscard.c
+++ b/sys-utils/blkdiscard.c
@@ -197,18 +197,18 @@ int main(int argc, char **argv)
 				err(EXIT_FAILURE, _("%s: BLKDISCARD ioctl failed"), path);
 		}
 
+		stats[1] += range[1];
+
 		/* reporting progress at most once per second */
 		if (verbose && step) {
 			gettime_monotonic(&now);
 			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;
+				stats[0] += stats[1], stats[1] = 0;
 				last = now;
 			}
 		}
-
-		stats[1] += range[1];
 	}
 
 	if (verbose)