Recent changes (master)

Jens Axboe
2015-06-02T12:00:06Z

The following changes since commit ec4dde5948a52c5bf8dcfe3b1c43912ddef2538e:

rdma: adapt to new init_rand_seed() (2015-05-30 13:04:33 -0600)

are available in the git repository at:

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

for you to fetch changes up to a53d4f7847273faeef9795ad7a3f5865b0c22840:

Merge branch 'req6' of git://github.com/kusumi/fio (2015-06-01 08:32:45 -0600)

----------------------------------------------------------------
Jens Axboe (1):
Merge branch 'req6' of git://github.com/kusumi/fio

Tomohiro Kusumi (2):
Fix build error on non-GNU environment
Minor cleanups on cleanup()

engines/null.c | 3 +--
engines/sync.c | 8 +++++---
lib/mountcheck.c | 2 +-
3 files changed, 7 insertions(+), 6 deletions(-)

---

Diff of recent changes:

diff --git a/engines/null.c b/engines/null.c
index 6000930..41d42e0 100644
--- a/engines/null.c
+++ b/engines/null.c
@@ -86,8 +86,7 @@ static void fio_null_cleanup(struct thread_data *td)
struct null_data *nd = (struct null_data *) td->io_ops->data;

if (nd) {
- if (nd->io_us)
- free(nd->io_us);
+ free(nd->io_us);
free(nd);
}
}
diff --git a/engines/sync.c b/engines/sync.c
index 48aafff..f5801fe 100644
--- a/engines/sync.c
+++ b/engines/sync.c
@@ -317,9 +317,11 @@ static void fio_vsyncio_cleanup(struct thread_data *td)
{
struct syncio_data *sd = td->io_ops->data;

- free(sd->iovecs);
- free(sd->io_us);
- free(sd);
+ if (sd) {
+ free(sd->iovecs);
+ free(sd->io_us);
+ free(sd);
+ }
}

static struct ioengine_ops ioengine_rw = {
diff --git a/lib/mountcheck.c b/lib/mountcheck.c
index dea2746..bb01f69 100644
--- a/lib/mountcheck.c
+++ b/lib/mountcheck.c
@@ -1,8 +1,8 @@
#include <stdio.h>
#include <string.h>
-#include <mntent.h>

#ifdef CONFIG_GETMNTENT
+#include <mntent.h>

#define MTAB "/etc/mtab"