From: Jens Axboe <jens.axboe@oracle.com>
Date: Fri, 16 May 2008 10:31:36 +0000 (+0200)
Subject: Silence put_file() complaint
X-Git-Tag: fio-1.21-rc1~15
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=60f2c658b923afdd491d556e15a655584b9db306;ds=sidebyside

Silence put_file() complaint

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---

diff --git a/io_u.c b/io_u.c
index 55ac8265..92cdd717 100644
--- a/io_u.c
+++ b/io_u.c
@@ -319,17 +319,21 @@ static enum fio_ddir get_rw_ddir(struct thread_data *td)
 		return DDIR_WRITE;
 }
 
+static void put_file_log(struct thread_data *td, struct fio_file *f)
+{
+	int ret = put_file(td, f);
+
+	if (ret)
+		td_verror(td, ret, "file close");
+}
+
 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) {
-		int ret = put_file(td, io_u->file);
-
-		if (ret)
-			td_verror(td, ret, "file close");
-	}
+	if (io_u->file)
+		put_file_log(td, io_u->file);
 
 	io_u->file = NULL;
 	list_del(&io_u->list);
@@ -662,7 +666,7 @@ set_file:
 		 * way we preserve queueing etc.
 		 */
 		if (td->o.nr_files == 1 && td->o.time_based) {
-			put_file(td, f);
+			put_file_log(td, f);
 			fio_file_reset(f);
 			goto set_file;
 		}