Fix size setting on raw devices

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index b0a40e572b23996ba6f53996a75eb447d2c6ecde..161f63e7d1a5aee2597e146513396406784fd4c2 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -138,6 +138,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 +156,7 @@ static int get_file_size(struct thread_data *td, struct fio_file *f)
                return 1;
        }
 
+       f->flags |= FIO_SIZE_KNOWN;
        return 0;
 }
 
@@ -244,8 +248,15 @@ int open_files(struct thread_data *td)
 
        for_each_file(td, f, i) {
                err = td_io_open_file(td, f);
-               if (err)
+               if (err) {
+                       if (td->error == EMFILE) {
+                               log_err("fio: limited open files to: %d\n", td->nr_open_files);
+                               td->o.open_files = td->nr_open_files;
+                               err = 0;
+                               clear_error(td);
+                       }
                        break;
+               }
 
                if (td->o.open_files == td->nr_open_files)
                        break;
@@ -269,11 +280,13 @@ static void get_file_sizes(struct thread_data *td)
        unsigned int i;
 
        for_each_file(td, f, i) {
-               if (td->io_ops->open_file(td, f)) {
-                       td->error = 0;
-                       memset(td->verror, 0, sizeof(td->verror));
-               } else
+               if (td->io_ops->open_file(td, f))
+                       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;
        }
 }
 
@@ -315,7 +328,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;
@@ -380,6 +393,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);