Recent changes (master)

Jens Axboe
2015-08-19T12:00:03Z

The following changes since commit 0e1c454a80bc9f1516ebc910ceb257bc6733e6b4:

mtd: expand configure check (2015-08-17 15:47:42 -0600)

are available in the git repository at:

git://git.kernel.dk/fio.git master

for you to fetch changes up to ae156be6aadb7b4ca6db8584cf5c9e957df916ed:

configure: cleanup strsep() test case (2015-08-18 11:26:00 -0700)

----------------------------------------------------------------
Dave (1):
Correct handleing of rate_iops_min and ratemin

Jens Axboe (3):
Merge branch 'master' of git://github.com/DaveGlen/fio
configure: fixup using wrong var for endmntent()
configure: cleanup strsep() test case

backend.c | 3 ++-
configure | 5 +++--
2 files changed, 5 insertions(+), 3 deletions(-)

---

Diff of recent changes:

diff --git a/backend.c b/backend.c
index 9307667..76994d9 100644
--- a/backend.c
+++ b/backend.c
@@ -179,7 +179,7 @@ static int __check_min_rate(struct thread_data *td, struct timeval *now,
if (spent < td->o.ratecycle)
return 0;

- if (td->o.rate[ddir]) {
+ if (td->o.rate[ddir] || td->o.ratemin[ddir]) {
/*
* check bandwidth specified rate
*/
@@ -220,6 +220,7 @@ static int __check_min_rate(struct thread_data *td, struct timeval *now,
log_err("%s: min iops rate %u not met,"
" got %lu\n", td->o.name,
rate_iops_min, rate);
+ return 1;
}
}
}
diff --git a/configure b/configure
index 1a41fe5..ee096b3 100755
--- a/configure
+++ b/configure
@@ -939,7 +939,8 @@ cat > $TMPC << EOF
#include <string.h>
int main(int argc, char **argv)
{
- strsep(NULL, NULL);
+ static char *string = "This is a string";
+ strsep(&string, "needle");
return 0;
}
EOF
@@ -1480,7 +1481,7 @@ int main(int argc, char **argv)
{
FILE *mtab = setmntent(NULL, "r");
struct mntent *mnt = getmntent(mtab);
- endmntent(mnt);
+ endmntent(mtab);
return 0;
}
EOF