From: Jens Axboe <jens.axboe@oracle.com>
Date: Tue, 27 Mar 2007 11:10:00 +0000 (+0200)
Subject: Cleanup generic_file_open()
X-Git-Tag: fio-1.15~20
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=148cf6a95f738d6d9afd62bc63ba40b64bd647bd;p=fio.git

Cleanup generic_file_open()

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

diff --git a/filesetup.c b/filesetup.c
index fb921919..7fbd347f 100644
--- a/filesetup.c
+++ b/filesetup.c
@@ -412,16 +412,13 @@ int generic_open_file(struct thread_data *td, struct fio_file *f)
 	if (td->o.invalidate_cache && file_invalidate_cache(td, f))
 		goto err;
 
-	if (!td->o.fadvise_hint)
-		return 0;
+	if (td->o.fadvise_hint) {
+		if (td_random(td))
+			flags = POSIX_FADV_RANDOM;
+		else
+			flags = POSIX_FADV_SEQUENTIAL;
 
-	if (!td_random(td)) {
-		if (fadvise(f->fd, f->file_offset, f->file_size, POSIX_FADV_SEQUENTIAL) < 0) {
-			td_verror(td, errno, "fadvise");
-			goto err;
-		}
-	} else {
-		if (fadvise(f->fd, f->file_offset, f->file_size, POSIX_FADV_RANDOM) < 0) {
+		if (fadvise(f->fd, f->file_offset, f->file_size, flags) < 0) {
 			td_verror(td, errno, "fadvise");
 			goto err;
 		}