Drop redundant "ignore invalidate option" message from 21c1b29e

[fio.git] / init.c

diff --git a/init.c b/init.c
index b4b09743f1c94225f48a5566462be84ddb27c810..2f9433b40deea2110dc2aa738244959606c97bdd 100644 (file)
--- a/init.c
+++ b/init.c
@@ -459,6 +459,7 @@ static struct thread_data *get_new_job(bool global, struct thread_data *parent,
                copy_opt_list(td, parent);
 
        td->io_ops = NULL;
+       td->io_ops_init = 0;
        if (!preserve_eo)
                td->eo = NULL;
 
@@ -764,11 +765,8 @@ static int fixup_options(struct thread_data *td)
        }
 
        if (o->pre_read) {
-               if (o->invalidate_cache) {
-                       log_info("fio: ignore invalidate option for %s\n",
-                                o->name);
+               if (o->invalidate_cache)
                        o->invalidate_cache = 0;
-               }
                if (td_ioengine_flagged(td, FIO_PIPEIO)) {
                        log_info("fio: cannot pre-read files with an IO engine"
                                 " that isn't seekable. Pre-read disabled.\n");
@@ -1120,7 +1118,7 @@ static char *make_filename(char *buf, size_t buf_size,struct thread_options *o,
 
        if (!o->filename_format || !strlen(o->filename_format)) {
                sprintf(buf, "%s.%d.%d", jobname, jobnum, filenum);
-               return NULL;
+               return buf;
        }
 
        for (f = &fpre_keywords[0]; f->keyword; f++)