Recent changes (master)

[Jens Axboe]

The following changes since commit 3c78a83fe8098489706c992d431e466222d94e4c:

  server: convert buffer pattern settings across client/server (2014-01-15 
09:41:31 -0700)

are available in the git repository at:
  git://git.kernel.dk/fio.git master

Jens Axboe (1):
      Fix potential oops in file unlocking at free time

 filesetup.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

---

Diff of recent changes:

diff --git a/filesetup.c b/filesetup.c
index 601df8f..d67f112 100644
--- a/filesetup.c
+++ b/filesetup.c
@@ -1050,6 +1050,7 @@ void close_and_free_files(struct thread_data *td)
        td->files_index = 0;
        td->files = NULL;
        td->file_locks = NULL;
+       td->o.file_lock_mode = FILE_LOCK_NONE;
        td->o.nr_files = 0;
 }
 
@@ -1242,6 +1243,8 @@ void unlock_file(struct thread_data *td, struct fio_file 
*f)
 
 void unlock_file_all(struct thread_data *td, struct fio_file *f)
 {
+       if (td->o.file_lock_mode == FILE_LOCK_NONE)
+               return;
        if (td->file_locks[f->fileno] != FILE_LOCK_NONE)
                unlock_file(td, f);
 }
--
To unsubscribe from this list: send the line "unsubscribe fio" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html