Rename thread_options' ->io_limit to io_size

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index 3fa8b32e3b8d4b4d7e6227f211365d3f3ffd8cd6..74551a4338442f022d2b78096696efa63d68fee5 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -375,12 +375,10 @@ static int get_file_size(struct thread_data *td, struct fio_file *f)
        else if (f->filetype == FIO_TYPE_CHAR)
                ret = char_size(td, f);
        else
-               f->real_file_size = -1ULL;
+               f->real_file_size = -1;
 
-       if (ret) {
-               f->real_file_size = -1ULL;
+       if (ret)
                return ret;
-       }
 
        if (f->file_offset > f->real_file_size) {
                log_err("%s: offset extends end (%llu > %llu)\n", td->o.name,
@@ -500,9 +498,6 @@ int file_lookup_open(struct fio_file *f, int flags)
        __f = lookup_file_hash(f->file_name);
        if (__f) {
                dprint(FD_FILE, "found file in hash %s\n", f->file_name);
-               /*
-                * racy, need the __f->lock locked
-                */
                f->lock = __f->lock;
                from_hash = 1;
        } else {
@@ -998,8 +993,8 @@ int setup_files(struct thread_data *td)
         * stored entries.
         */
        if (!o->read_iolog_file) {
-               if (o->io_limit)
-                       td->total_io_size = o->io_limit * o->loops;
+               if (o->io_size)
+                       td->total_io_size = o->io_size * o->loops;
                else
                        td->total_io_size = o->size * o->loops;
        }