Fix bug with numjobs > 1, directory and filename given

[fio.git] / init.c

diff --git a/init.c b/init.c
index 27040326424a10ebc992e70c5fdc9929801309d9..1e0eeccfdc6e5dcbf0b95b0fa479e111108826f6 100644 (file)
--- a/init.c
+++ b/init.c
@@ -358,7 +358,6 @@ static int init_random_state(struct thread_data *td)
        return 0;
 }
 
        return 0;
 }
 

-

 /*
  * Adds a job to the list of things todo. Sanitizes the various options
  * to make sure we don't have conflicts, and initializes various
 /*
  * Adds a job to the list of things todo. Sanitizes the various options
  * to make sure we don't have conflicts, and initializes various


@@ -369,7 +368,6 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
        const char *ddir_str[] = { NULL, "read", "write", "rw", NULL,
                                   "randread", "randwrite", "randrw" };
        unsigned int i;
        const char *ddir_str[] = { NULL, "read", "write", "rw", NULL,
                                   "randread", "randwrite", "randrw" };
        unsigned int i;

-       struct fio_file *f;

        const char *engine;
        char fname[PATH_MAX];
        int numjobs, file_alloced;
        const char *engine;
        char fname[PATH_MAX];
        int numjobs, file_alloced;


@@ -412,13 +410,6 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
        if (fixup_options(td))
                goto err;
 
        if (fixup_options(td))
                goto err;
 

-       for_each_file(td, f, i) {
-               if (td->o.directory && f->filetype == FIO_TYPE_FILE) {
-                       sprintf(fname, "%s/%s", td->o.directory, f->file_name);
-                       f->file_name = strdup(fname);
-               }
-       }
-               

        td->mutex = fio_sem_init(0);
 
        td->ts.clat_stat[0].min_val = td->ts.clat_stat[1].min_val = ULONG_MAX;
        td->mutex = fio_sem_init(0);
 
        td->ts.clat_stat[0].min_val = td->ts.clat_stat[1].min_val = ULONG_MAX;