Fix command line parsing bug

[fio.git] / ioengines.c

diff --git a/ioengines.c b/ioengines.c
index 3cfa773ac07ea2e79d6f17c6ef38ffc360947035..34ae91671a4348c43bacdf9f7eddc2f5e81f020d 100644 (file)
--- a/ioengines.c
+++ b/ioengines.c
@@ -17,7 +17,6 @@
 #include <assert.h>
 
 #include "fio.h"
-#include "os.h"
 
 static LIST_HEAD(engine_list);
 
@@ -272,6 +271,13 @@ int td_io_open_file(struct thread_data *td, struct fio_file *f)
                return 1;
        }
 
+       if (f->filetype == FIO_TYPE_PIPE) {
+               if (td_random(td)) {
+                       log_err("fio: can't seek on pipes (no random io)\n");
+                       goto err;
+               }
+       }
+
        f->last_free_lookup = 0;
        f->last_completed_pos = 0;
        f->last_pos = 0;
@@ -284,7 +290,9 @@ int td_io_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) {
+       if (td->o.fadvise_hint &&
+           (f->filetype == FIO_TYPE_BD || f->filetype == FIO_TYPE_FILE)) {
+               
                int flags;
 
                if (td_random(td))
@@ -306,7 +314,8 @@ done:
        get_file(f);
        return 0;
 err:
-       td->io_ops->close_file(td, f);
+       if (td->io_ops->close_file)
+               td->io_ops->close_file(td, f);
        return 1;
 }
 
@@ -319,4 +328,3 @@ void td_io_close_file(struct thread_data *td, struct fio_file *f)
 
        put_file(td, f);
 }
-