From: Theodore Ts'o <tytso@mit.edu>
Date: Tue, 30 Oct 2018 14:36:49 +0000 (-0400)
Subject: Fix build failure for discontiguous-io on 32-bit platforms
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=fc59cfd5fe0adb57f9056cdcd2071ace09ac3f2d;p=users%2Fsagi%2Fblktests.git

Fix build failure for discontiguous-io on 32-bit platforms

Avoid that building with a 32-bit compiler fails as follows:
discontiguous-io.cpp:294:34: error: no matching function for call to 'min(long unsigned int, size_t)'
         std::min(4ul, len - i * 4));
                                  ^
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
[bvanassche: elaborated commit message]
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---

diff --git a/src/discontiguous-io.cpp b/src/discontiguous-io.cpp
index 5e0ee0f..f51a305 100644
--- a/src/discontiguous-io.cpp
+++ b/src/discontiguous-io.cpp
@@ -251,7 +251,7 @@ int main(int argc, char **argv)
 	const char *dev;
 	int c;
 	std::vector<uint8_t> buf;
-	size_t len = 512;
+	unsigned long len = 512;
 
 	while ((c = getopt(argc, argv, "hl:o:sw")) != EOF) {
 		switch (c) {