X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.c;h=8571e65bba99dc4e2e775d00a74161dfcf419748;hp=fc653b3d9016e9b7553ac5cadbb37a870ba00a9d;hb=353a7e0eb6d80d03016b2ce639f33c554e8546b7;hpb=87dc1ab1b4df7b977f60e3d43533a896e2ee665b

diff --git a/fio.c b/fio.c
index fc653b3d..8571e65b 100644
--- a/fio.c
+++ b/fio.c
@@ -4,10 +4,12 @@
  * Copyright (C) 2005 Jens Axboe <axboe@suse.de>
  * Copyright (C) 2006 Jens Axboe <axboe@kernel.dk>
  *
+ * The license below covers all files distributed with fio unless otherwise
+ * noted in the file itself.
+ *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -193,6 +195,50 @@ static void cleanup_pending_aio(struct thread_data *td)
 	}
 }
 
+/*
+ * Helper to handle the final sync of a file. Works just like the normal
+ * io path, just does everything sync.
+ */
+static int fio_io_sync(struct thread_data *td, struct fio_file *f)
+{
+	struct io_u *io_u = __get_io_u(td);
+	struct io_completion_data icd;
+	int ret;
+
+	if (!io_u)
+		return 1;
+
+	io_u->ddir = DDIR_SYNC;
+	io_u->file = f;
+
+	if (td_io_prep(td, io_u)) {
+		put_io_u(td, io_u);
+		return 1;
+	}
+
+	ret = td_io_queue(td, io_u);
+	if (ret) {
+		td_verror(td, io_u->error);
+		put_io_u(td, io_u);
+		return 1;
+	}
+
+	ret = td_io_getevents(td, 1, td->cur_depth, NULL);
+	if (ret < 0) {
+		td_verror(td, ret);
+		return 1;
+	}
+
+	icd.nr = ret;
+	ios_completed(td, &icd);
+	if (icd.error) {
+		td_verror(td, icd.error);
+		return 1;
+	}
+
+	return 0;
+}
+
 /*
  * The main verify engine. Runs over the writes we previusly submitted,
  * reads the blocks back in, and checks the crc/md5 of the data.
@@ -210,7 +256,7 @@ void do_verify(struct thread_data *td)
 	 * read from disk.
 	 */
 	for_each_file(td, f, i) {
-		td_io_sync(td, f);
+		fio_io_sync(td, f);
 		file_invalidate_cache(td, f);
 	}
 
@@ -246,8 +292,8 @@ void do_verify(struct thread_data *td)
 
 		ret = td_io_queue(td, io_u);
 		if (ret) {
+			td_verror(td, io_u->error);
 			put_io_u(td, io_u);
-			td_verror(td, ret);
 			break;
 		}
 
@@ -353,8 +399,8 @@ static void do_io(struct thread_data *td)
 
 		ret = td_io_queue(td, io_u);
 		if (ret) {
+			td_verror(td, io_u->error);
 			put_io_u(td, io_u);
-			td_verror(td, ret);
 			break;
 		}
 
@@ -413,7 +459,7 @@ static void do_io(struct thread_data *td)
 		if (should_fsync(td) && td->end_fsync) {
 			td_set_runstate(td, TD_FSYNCING);
 			for_each_file(td, f, i)
-				td_io_sync(td, f);
+				fio_io_sync(td, f);
 		}
 	}
 }