Cleanup generic_file_open()

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index fb9219199e31ca378a24b2662f246167abe6a3fe..7fbd347fa1cbe414a3cc215ea27361e76d35ea86 100644 (file)
--- 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;
                }