X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=init.c;h=160bdffc470cfdb1fae61ad30b41fc51ff0cb23d;hb=9c0d224129b0c59698e4c77e7fed00dc8cbb50e1;hp=cd32725c4b9893ed2983419e44835f707b4a1935;hpb=896cac2a44de3725a6d615914e239cab4f382e1c;p=fio.git diff --git a/init.c b/init.c index cd32725c..160bdffc 100644 --- a/init.c +++ b/init.c @@ -20,7 +20,7 @@ #include "filehash.h" #include "verify.h" -static char fio_version_string[] = "fio 1.28"; +static char fio_version_string[] = "fio 1.29-rc1"; #define FIO_RANDSEED (0xb1899bedUL) @@ -233,22 +233,6 @@ static int fixup_options(struct thread_data *td) } #endif -#ifndef FIO_HAVE_CPU_AFFINITY - if (td->o.gtod_cpu) { - log_err("fio: platform must support CPU affinity for" - "gettimeofday() offloading\n"); - return 1; - } -#endif - -#if 0 - if (read_only && td_write(td)) { - log_err("fio: job <%s> has write bit set, but fio is in" - " read-only mode\n", td->o.name); - return 1; - } -#endif - if (o->write_iolog_file && o->read_iolog_file) { log_err("fio: read iolog overrides write_iolog\n"); free(o->write_iolog_file); @@ -366,8 +350,12 @@ static int fixup_options(struct thread_data *td) if (td->o.verify != VERIFY_NONE) td->o.refill_buffers = 1; - if (td->o.pre_read) + if (td->o.pre_read) { td->o.invalidate_cache = 0; + if (td->io_ops->flags & FIO_PIPEIO) + log_info("fio: cannot pre-read files with an IO engine" + " that isn't seekable. Pre-read disabled.\n"); + } if (td->o.mem_align) { if (td->o.odirect && !is_power_of_2(td->o.mem_align)) {