From 413d669320995eaef092c58e67cdb7b500134551 Mon Sep 17 00:00:00 2001
From: Jens Axboe <jens.axboe@oracle.com>
Date: Tue, 27 Mar 2007 15:38:21 +0200
Subject: [PATCH] Do the invalidate/advise hinting in td_open_file()

Then we only do it once per file, not twice.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---
 filesetup.c | 15 --------------
 ioengines.c | 58 +++++++++++++++++++++++++++++++++++++----------------
 2 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/filesetup.c b/filesetup.c
index f64c7a11..f6b4855b 100644
--- a/filesetup.c
+++ b/filesetup.c
@@ -214,21 +214,6 @@ int generic_open_file(struct thread_data *td, struct fio_file *f)
 	if (get_file_size(td, f))
 		goto err;
 
-	if (td->o.invalidate_cache && file_invalidate_cache(td, f))
-		goto err;
-
-	if (td->o.fadvise_hint) {
-		if (td_random(td))
-			flags = POSIX_FADV_RANDOM;
-		else
-			flags = POSIX_FADV_SEQUENTIAL;
-
-		if (fadvise(f->fd, f->file_offset, f->io_size, flags) < 0) {
-			td_verror(td, errno, "fadvise");
-			goto err;
-		}
-	}
-
 	return 0;
 err:
 	close(f->fd);
diff --git a/ioengines.c b/ioengines.c
index 3e8d886a..3cfa773a 100644
--- a/ioengines.c
+++ b/ioengines.c
@@ -263,26 +263,50 @@ int td_io_commit(struct thread_data *td)
 
 int td_io_open_file(struct thread_data *td, struct fio_file *f)
 {
-	if (!td->io_ops->open_file(td, f)) {
-		f->last_free_lookup = 0;
-		f->last_completed_pos = 0;
-		f->last_pos = 0;
-		f->flags |= FIO_FILE_OPEN;
-		f->flags &= ~FIO_FILE_CLOSING;
-
-		if (f->file_map)
-			memset(f->file_map, 0, f->num_maps * sizeof(long));
-
-		td->nr_open_files++;
-		get_file(f);
-		return 0;
+	if (td->io_ops->open_file(td, f)) {
+		if (td->error == EINVAL && td->o.odirect)
+			log_err("fio: destination does not support O_DIRECT\n");
+		if (td->error == EMFILE)
+			log_err("fio: try reducing/setting openfiles (failed at %u of %u)\n", td->nr_open_files, td->o.nr_files);
+
+		return 1;
+	}
+
+	f->last_free_lookup = 0;
+	f->last_completed_pos = 0;
+	f->last_pos = 0;
+	f->flags |= FIO_FILE_OPEN;
+	f->flags &= ~FIO_FILE_CLOSING;
+
+	if (td->io_ops->flags & FIO_DISKLESSIO)
+		goto done;
+
+	if (td->o.invalidate_cache && file_invalidate_cache(td, f))
+		goto err;
+
+	if (td->o.fadvise_hint) {
+		int flags;
+
+		if (td_random(td))
+			flags = POSIX_FADV_RANDOM;
+		else
+			flags = POSIX_FADV_SEQUENTIAL;
+
+		if (fadvise(f->fd, f->file_offset, f->io_size, flags) < 0) {
+			td_verror(td, errno, "fadvise");
+			goto err;
+		}
 	}
 
-	if (td->error == EINVAL && td->o.odirect)
-		log_err("fio: destination does not support O_DIRECT\n");
-	if (td->error == EMFILE)
-		log_err("fio: try reducing/setting openfiles (failed at %u of %u)\n", td->nr_open_files, td->o.nr_files);
+	if (f->file_map)
+		memset(f->file_map, 0, f->num_maps * sizeof(long));
 
+done:
+	td->nr_open_files++;
+	get_file(f);
+	return 0;
+err:
+	td->io_ops->close_file(td, f);
 	return 1;
 }
 
-- 
2.25.1