Fio 1.21-rc7

[fio.git] / init.c

diff --git a/init.c b/init.c
index 3469584f3c9f51162f5a9c2fb755213af7bfb736..a7d90df0e982b7e9e1c8dfa077ea3cb289a53e0c 100644 (file)
--- a/init.c
+++ b/init.c
@@ -19,7 +19,7 @@
 #include "smalloc.h"
 #include "filehash.h"
 
-static char fio_version_string[] = "fio 1.20";
+static char fio_version_string[] = "fio 1.21-rc7";
 
 #define FIO_RANDSEED           (0xb1899bedUL)
 
@@ -220,9 +220,6 @@ static int fixup_options(struct thread_data *td)
                return 1;
        }
 
-       if (o->rwmix[DDIR_READ] + o->rwmix[DDIR_WRITE] > 100)
-               o->rwmix[DDIR_WRITE] = 100 - o->rwmix[DDIR_READ];
-
        if (o->write_iolog_file && o->read_iolog_file) {
                log_err("fio: read iolog overrides write_iolog\n");
                free(o->write_iolog_file);
@@ -310,7 +307,7 @@ static int fixup_options(struct thread_data *td)
        }
 
        if (o->fill_device && !o->size)
-               o->size = ULONG_LONG_MAX;
+               o->size = -1ULL;
 
        if (td_rw(td) && td->o.verify != VERIFY_NONE)
                log_info("fio: mixed read/write workload with verify. May not "
@@ -919,7 +916,7 @@ static int set_debug(const char *string)
        return 0;
 }
 #else
-static void set_debug(const char *string)
+static int set_debug(const char *string)
 {
        log_err("fio: debug tracing not included in build\n");
        return 1;