From: Jens Axboe <jens.axboe@oracle.com>
Date: Wed, 10 Jun 2009 06:55:35 +0000 (+0200)
Subject: Merge branch 'master' of ssh://router/data/git/fio
X-Git-Tag: fio-1.27.4~3
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=39d9ef6a390466ccf58b8579ed2da508456594d0;hp=3ce9dcaf8e766557cb718d21f51e8f691bef9afb

Merge branch 'master' of ssh://router/data/git/fio
---

diff --git a/fio.c b/fio.c
index 6464b6d9..61aabb30 100644
--- a/fio.c
+++ b/fio.c
@@ -186,6 +186,9 @@ static int __check_min_rate(struct thread_data *td, struct timeval *now,
 	unsigned int rate_iops = 0;
 	unsigned int rate_iops_min = 0;
 
+	if (!td->o.ratemin[ddir] && !td->o.rate_iops_min[ddir])
+		return 0;
+
 	/*
 	 * allow a 2 second settle period in the beginning
 	 */
diff --git a/init.c b/init.c
index ef8b1cb6..7895e325 100644
--- a/init.c
+++ b/init.c
@@ -20,7 +20,7 @@
 #include "filehash.h"
 #include "verify.h"
 
-static char fio_version_string[] = "fio 1.27.2";
+static char fio_version_string[] = "fio 1.27.3";
 
 #define FIO_RANDSEED		(0xb1899bedUL)
 
diff --git a/io_u.c b/io_u.c
index 72f5ff2c..126a9a8b 100644
--- a/io_u.c
+++ b/io_u.c
@@ -1086,7 +1086,7 @@ void io_u_queued(struct thread_data *td, struct io_u *io_u)
 		unsigned long slat_time;
 
 		slat_time = utime_since(&io_u->start_time, &io_u->issue_time);
-		add_slat_sample(td, io_u->ddir, io_u->xfer_buflen, slat_time);
+		add_slat_sample(td, io_u->ddir, slat_time, io_u->xfer_buflen);
 	}
 }