From: Jens Axboe <jens.axboe@oracle.com>
Date: Wed, 10 Jan 2007 14:41:07 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.kernel.dk/data/git/fio
X-Git-Tag: fio-1.12~170
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=7e75f648444ce3ee1694792134826ee89c7a29eb;hp=ddf4a69b083416fa0e626f591b3b425085656531

Merge branch 'master' of ssh://git.kernel.dk/data/git/fio
---

diff --git a/parse.c b/parse.c
index abe0653b..1e709ddb 100644
--- a/parse.c
+++ b/parse.c
@@ -180,10 +180,14 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 		if (ret)
 			break;
 
-		if (o->maxval && ull > o->maxval)
-			ull = o->maxval;
-		if (o->minval && ull < o->minval)
-			ull = o->minval;
+		if (o->maxval && ull > o->maxval) {
+			fprintf(stderr, "max value out of range: %lld (%d max)\n", ull, o->maxval);
+			return 1;
+		}
+		if (o->minval && ull < o->minval) {
+			fprintf(stderr, "min value out of range: %lld (%d min)\n", ull, o->minval);
+			return 1;
+		}
 
 		if (fn)
 			ret = fn(data, &ull);
@@ -252,10 +256,14 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 		if (ret)
 			break;
 
-		if (o->maxval && il > (int) o->maxval)
-			il = o->maxval;
-		if (o->minval && il < o->minval)
-			il = o->minval;
+		if (o->maxval && il > (int) o->maxval) {
+			fprintf(stderr, "max value out of range: %d (%d max)\n", il, o->maxval);
+			return 1;
+		}
+		if (o->minval && il < o->minval) {
+			fprintf(stderr, "min value out of range: %d (%d min)\n", il, o->minval);
+			return 1;
+		}
 
 		if (fn)
 			ret = fn(data, &il);