Recent changes

[Jens Axboe <jaxboe@xxxxxxxxxxxx>]

The following changes since commit ef71e317e6e1e96a4776610035cd67711603e1f8:

  Make verify_dump off by default (2011-10-25 22:44:05 +0200)

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

Jens Axboe (1):
      Fio 1.99.10

Steven Lang (1):
      Fix segfault with verify_async

 fio_version.h          |    2 +-
 io_u.c                 |    9 ++++-----
 os/windows/install.wxs |    2 +-
 os/windows/version.h   |    2 +-
 verify.c               |    4 +---
 5 files changed, 8 insertions(+), 11 deletions(-)

---

Diff of recent changes:

diff --git a/fio_version.h b/fio_version.h
index b374014..49a2dc3 100644
--- a/fio_version.h
+++ b/fio_version.h
@@ -3,6 +3,6 @@
 
 #define FIO_MAJOR	1
 #define FIO_MINOR	99
-#define FIO_PATCH	9
+#define FIO_PATCH	10
 
 #endif
diff --git a/io_u.c b/io_u.c
index d1f66a9..fc3ee49 100644
--- a/io_u.c
+++ b/io_u.c
@@ -597,13 +597,12 @@ void put_io_u(struct thread_data *td, struct io_u *io_u)
 {
 	td_io_u_lock(td);
 
-	io_u->flags |= IO_U_F_FREE;
-	io_u->flags &= ~IO_U_F_FREE_DEF;
-
-	if (io_u->file)
+	if (io_u->file && !(io_u->flags & IO_U_F_FREE_DEF))
 		put_file_log(td, io_u->file);
-
 	io_u->file = NULL;
+	io_u->flags &= ~IO_U_F_FREE_DEF;
+	io_u->flags |= IO_U_F_FREE;
+
 	if (io_u->flags & IO_U_F_IN_CUR_DEPTH)
 		td->cur_depth--;
 	flist_del_init(&io_u->list);
diff --git a/os/windows/install.wxs b/os/windows/install.wxs
index a95fe37..eecef14 100755
--- a/os/windows/install.wxs
+++ b/os/windows/install.wxs
@@ -3,7 +3,7 @@
 
 <?define VersionMajor = 1?>
 <?define VersionMinor = 99?>
-<?define VersionBuild = 9?>
+<?define VersionBuild = 10?>
 
 	<Product Id="*"
 	  Codepage="1252" Language="1033"
diff --git a/os/windows/version.h b/os/windows/version.h
index 57cecb3..f7624a4 100644
--- a/os/windows/version.h
+++ b/os/windows/version.h
@@ -3,4 +3,4 @@
 #define FIO_VERSION_MAJOR FIO_MAJOR
 #define FIO_VERSION_MINOR FIO_MINOR
 #define FIO_VERSION_BUILD FIO_PATCH
-#define FIO_VERSION_STRING "1.99.9"
+#define FIO_VERSION_STRING "1.99.10"
diff --git a/verify.c b/verify.c
index 43dd392..5a94281 100644
--- a/verify.c
+++ b/verify.c
@@ -602,10 +602,8 @@ int verify_io_u_async(struct thread_data *td, struct io_u *io_u)
 	if (io_u->file)
 		put_file_log(td, io_u->file);
 
-	io_u->file = NULL;
-
 	pthread_mutex_lock(&td->io_u_lock);
-	
+
 	if (io_u->flags & IO_U_F_IN_CUR_DEPTH) {
 		td->cur_depth--;
 		io_u->flags &= ~IO_U_F_IN_CUR_DEPTH;
--
To unsubscribe from this list: send the line "unsubscribe fio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html