Fix problem with treating ENOENT as an error

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index bf28b41ad161c489390382219602e026b8c6b9b2..62d048ead5065763262e3a02100c6680cbb10f2b 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -8,11 +8,10 @@
 #include <sys/types.h>
 
 #include "fio.h"
-#include "os.h"
 
 static int extend_file(struct thread_data *td, struct fio_file *f)
 {
-       int r, new_layout = 0, flags;
+       int r, new_layout = 0, unlink_file = 0, flags;
        unsigned long long left;
        unsigned int bs;
        char *b;
@@ -24,8 +23,10 @@ static int extend_file(struct thread_data *td, struct fio_file *f)
         */
        if (td_read(td) || (td_write(td) && td->o.overwrite))
                new_layout = 1;
+       if (td_write(td) && !td->o.overwrite)
+               unlink_file = 1;
 
-       if (new_layout && (f->flags & FIO_FILE_EXISTS)) {
+       if ((unlink_file || new_layout) && (f->flags & FIO_FILE_EXISTS)) {
                if (unlink(f->file_name) < 0) {
                        td_verror(td, errno, "unlink");
                        return 1;
@@ -47,14 +48,14 @@ static int extend_file(struct thread_data *td, struct fio_file *f)
                goto err;
        }
 
+       if (!new_layout)
+               goto done;
+
        if (posix_fallocate(f->fd, 0, f->real_file_size) < 0) {
                td_verror(td, errno, "posix_fallocate");
                goto err;
        }
 
-       if (!new_layout)
-               goto done;
-
        b = malloc(td->o.max_bs[DDIR_WRITE]);
        memset(b, 0, td->o.max_bs[DDIR_WRITE]);
 
@@ -138,6 +139,9 @@ static int get_file_size(struct thread_data *td, struct fio_file *f)
 {
        int ret = 0;
 
+       if (f->flags & FIO_SIZE_KNOWN)
+               return 0;
+
        if (f->filetype == FIO_TYPE_FILE)
                ret = file_size(td, f);
        else if (f->filetype == FIO_TYPE_BD)
@@ -153,6 +157,7 @@ static int get_file_size(struct thread_data *td, struct fio_file *f)
                return 1;
        }
 
+       f->flags |= FIO_SIZE_KNOWN;
        return 0;
 }
 
@@ -270,18 +275,27 @@ int open_files(struct thread_data *td)
 /*
  * open/close all files, so that ->real_file_size gets set
  */
-static void get_file_sizes(struct thread_data *td)
+static int get_file_sizes(struct thread_data *td)
 {
        struct fio_file *f;
        unsigned int i;
+       int err = 0;
 
        for_each_file(td, f, i) {
                if (td->io_ops->open_file(td, f)) {
-                       td->error = 0;
-                       memset(td->verror, 0, sizeof(td->verror));
+                       if (td->error != ENOENT) {
+                               log_err("%s\n", td->verror);
+                               err = 1;
+                       }
+                       clear_error(td);
                } else
                        td->io_ops->close_file(td, f);
+
+               if (f->real_file_size == -1ULL && td->o.size)
+                       f->real_file_size = td->o.size / td->o.nr_files;
        }
+
+       return err;
 }
 
 /*
@@ -302,7 +316,7 @@ int setup_files(struct thread_data *td)
        if (td->io_ops->setup)
                err = td->io_ops->setup(td);
        else
-               get_file_sizes(td);
+               err = get_file_sizes(td);
 
        if (err)
                return err;
@@ -322,7 +336,7 @@ int setup_files(struct thread_data *td)
        /*
         * device/file sizes are zero and no size given, punt
         */
-       if (!total_size && !td->o.size) {
+       if ((!total_size || total_size == -1ULL) && !td->o.size) {
                log_err("%s: you need to specify size=\n", td->o.name);
                td_verror(td, EINVAL, "total_file_size");
                return 1;
@@ -387,6 +401,7 @@ int setup_files(struct thread_data *td)
                        if (!(f->flags & FIO_FILE_EXTEND))
                                continue;
 
+                       assert(f->filetype == FIO_TYPE_FILE);
                        f->flags &= ~FIO_FILE_EXTEND;
                        f->real_file_size = f->io_size;
                        err = extend_file(td, f);
@@ -516,6 +531,7 @@ void put_file(struct thread_data *td, struct fio_file *f)
 
        if (td->io_ops->close_file)
                td->io_ops->close_file(td, f);
+
        td->nr_open_files--;
        f->flags &= ~FIO_FILE_OPEN;
 }