Recent changes (master)

Jens Axboe
2015-02-27T13:00:06Z

The following changes since commit 93eeb5582d56fe5e36f455c8de26c302e317fdeb:

Fix implicit function declaration on Android (2015-02-25 14:00:01 -0700)

are available in the git repository at:

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

for you to fetch changes up to 3d0e3417997d9caa27cf97462e15ba437d285d29:

Fix segfault due to bad munmap() (2015-02-26 15:38:42 -0700)

----------------------------------------------------------------
Jens Axboe (2):
Merge branch 'master' of ssh://git.kernel.dk/data/git/fio
Fix segfault due to bad munmap()

Lars Marowsky-Bree (1):
Typo fix in man page.

filelock.c | 4 ++--
fio.1 | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)

---

Diff of recent changes:

diff --git a/filelock.c b/filelock.c
index 17b5a85..b113007 100644
--- a/filelock.c
+++ b/filelock.c
@@ -101,7 +101,7 @@ void fio_filelock_exit(void)
return;

assert(flist_empty(&fld->list));
- fio_mutex_remove(&fld->lock);
+ __fio_mutex_remove(&fld->lock);

while (!flist_empty(&fld->free_list)) {
struct fio_filelock *ff;
@@ -109,7 +109,7 @@ void fio_filelock_exit(void)
ff = flist_first_entry(&fld->free_list, struct fio_filelock, list);

flist_del_init(&ff->list);
- fio_mutex_remove(&ff->lock);
+ __fio_mutex_remove(&ff->lock);
}

sfree(fld);
diff --git a/fio.1 b/fio.1
index b746da1..84d71a0 100644
--- a/fio.1
+++ b/fio.1
@@ -21,7 +21,7 @@ list all available tracing options.
Write output to \fIfilename\fR.
.TP
.BI \-\-output-format \fR=\fPformat
-Set the reporting format to \fInormal\fR, \fIterse\fR, or \fIjosn\fR.
+Set the reporting format to \fInormal\fR, \fIterse\fR, or \fIjson\fR.
.TP
.BI \-\-runtime \fR=\fPruntime
Limit run time to \fIruntime\fR seconds.