io_u completion error propagation

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index 850dc2f078cd0967703624fc51f6dc2f634dae3f..502d79f8be93fae2ec9108025d344212bb284153 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -39,7 +39,7 @@ static int file_ok(struct thread_data *td, struct fio_file *f)
 {
        struct stat st;
 
-       if (td->filetype != FIO_TYPE_FILE || (td->io_ops->flags & FIO_NULLIO))
+       if (td->filetype != FIO_TYPE_FILE)
                return 0;
 
        if (lstat(f->file_name, &st) == -1)
@@ -183,16 +183,6 @@ static int file_size(struct thread_data *td, struct fio_file *f)
 {
        struct stat st;
 
-       /*
-        * if we are not doing real io, just pretend the file is as large
-        * as the size= given. this works fine with nrfiles > 1 as well,
-        * we only really care about it being at least as big as size=
-        */
-       if (td->io_ops->flags & FIO_NULLIO) {
-               f->real_file_size = f->file_size = td->total_file_size;
-               return 0;
-       }
-
        if (td->overwrite) {
                if (fstat(f->fd, &st) == -1) {
                        td_verror(td, errno, "fstat");
@@ -374,37 +364,29 @@ static int setup_file(struct thread_data *td, struct fio_file *f)
        if (td->io_ops->flags & FIO_SELFOPEN)
                return 0;
 
-       /*
-        * we need a valid file descriptor, but don't create a real file.
-        * lets just dup stdout, seems like a sensible approach.
-        */
-       if (td->io_ops->flags & FIO_NULLIO)
-               f->fd = dup(STDOUT_FILENO);
-       else {
-               if (td->odirect)
-                       flags |= OS_O_DIRECT;
-               if (td->sync_io)
-                       flags |= O_SYNC;
-
-               if (td_write(td) || td_rw(td)) {
-                       flags |= O_RDWR;
-
-                       if (td->filetype == FIO_TYPE_FILE) {
-                               if (!td->overwrite)
-                                       flags |= O_TRUNC;
+       if (td->odirect)
+               flags |= OS_O_DIRECT;
+       if (td->sync_io)
+               flags |= O_SYNC;
 
-                               flags |= O_CREAT;
-                       }
+       if (td_write(td) || td_rw(td)) {
+               flags |= O_RDWR;
 
-                       open_file(td, f, flags, 0600);
-               } else {
-                       if (td->filetype == FIO_TYPE_CHAR)
-                               flags |= O_RDWR;
-                       else
-                               flags |= O_RDONLY;
+               if (td->filetype == FIO_TYPE_FILE) {
+                       if (!td->overwrite)
+                               flags |= O_TRUNC;
 
-                       open_file(td, f, flags, 0);
+                       flags |= O_CREAT;
                }
+
+               open_file(td, f, flags, 0600);
+       } else {
+               if (td->filetype == FIO_TYPE_CHAR)
+                       flags |= O_RDWR;
+               else
+                       flags |= O_RDONLY;
+
+               open_file(td, f, flags, 0);
        }
 
        if (f->fd == -1) {