X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=io_u.c;h=7fe5242f51287b4bd72102400686eb6f1fcd31f7;hp=1ae63789c7edc8703f3edad2d32c770533385e4d;hb=db1cd90b90d4d5c49db90d5afeb79ea3a3b034d1;hpb=317b95d07d4921d2594a1be6e014c9c2d062fe75

diff --git a/io_u.c b/io_u.c
index 1ae63789..7fe5242f 100644
--- a/io_u.c
+++ b/io_u.c
@@ -265,6 +265,9 @@ void put_io_u(struct thread_data *td, struct io_u *io_u)
 	assert((io_u->flags & IO_U_F_FREE) == 0);
 	io_u->flags |= IO_U_F_FREE;
 
+	if (io_u->file)
+		put_file(td, io_u->file);
+
 	io_u->file = NULL;
 	list_del(&io_u->list);
 	list_add(&io_u->list, &td->io_u_freelist);
@@ -289,7 +292,7 @@ static int fill_io_u(struct thread_data *td, struct io_u *io_u)
 	/*
 	 * If using an iolog, grab next piece if any available.
 	 */
-	if (td->o.read_iolog)
+	if (td->o.read_iolog_file)
 		return read_iolog_get(td, io_u);
 
 	/*
@@ -540,12 +543,14 @@ struct io_u *get_io_u(struct thread_data *td)
 
 set_file:
 		io_u->file = f;
+		get_file(f);
 
 		if (!fill_io_u(td, io_u))
 			break;
 
 		/*
-		 * No more to do for this file, close it
+		 * td_io_close() does a put_file() as well, so no need to
+		 * do that here.
 		 */
 		io_u->file = NULL;
 		td_io_close_file(td, f);
@@ -588,6 +593,7 @@ set_file:
 	/*
 	 * Set io data pointers.
 	 */
+	io_u->endpos = io_u->offset + io_u->buflen;
 out:
 	io_u->xfer_buf = io_u->buf;
 	io_u->xfer_buflen = io_u->buflen;
@@ -626,8 +632,6 @@ static void io_completed(struct thread_data *td, struct io_u *io_u,
 	assert(io_u->flags & IO_U_F_FLIGHT);
 	io_u->flags &= ~IO_U_F_FLIGHT;
 
-	put_file(td, io_u->file);
-
 	if (io_u->ddir == DDIR_SYNC) {
 		td->last_was_sync = 1;
 		return;
@@ -645,7 +649,7 @@ static void io_completed(struct thread_data *td, struct io_u *io_u,
 		td->zone_bytes += bytes;
 		td->this_io_bytes[idx] += bytes;
 
-		io_u->file->last_completed_pos = io_u->offset + io_u->buflen;
+		io_u->file->last_completed_pos = io_u->endpos;
 
 		msec = mtime_since(&io_u->issue_time, &icd->time);
 
@@ -653,7 +657,7 @@ static void io_completed(struct thread_data *td, struct io_u *io_u,
 		add_bw_sample(td, idx, &icd->time);
 		io_u_mark_latency(td, msec);
 
-		if ((td_rw(td) || td_write(td)) && idx == DDIR_WRITE &&
+		if (td_write(td) && idx == DDIR_WRITE &&
 		    td->o.verify != VERIFY_NONE)
 			log_io_piece(td, io_u);