Revert "Fixup ->open_files if not given"
authorJens Axboe <axboe@fb.com>
Wed, 9 Apr 2014 03:03:59 +0000 (21:03 -0600)
committerJens Axboe <axboe@fb.com>
Wed, 9 Apr 2014 03:03:59 +0000 (21:03 -0600)
This reverts commit bcd27f7ae1ccebd2ac1778752bf8f13fa99600e9.

The commit causes us to default to 1 file for cases where
openfiles= isn't set, where before we would default to
nr_files.

Signed-off-by: Jens Axboe <axboe@fb.com>
Conflicts:
filesetup.c

filesetup.c

index bf05b6f000e4caf6158c4f0783ca9d5806fa6cc8..abea1e60b726a8d82f503b054c83d76a66470210 100644 (file)
@@ -1279,13 +1279,6 @@ int add_file(struct thread_data *td, const char *fname, int numjob, int inc)
 
        set_already_allocated(file_name);
 
 
        set_already_allocated(file_name);
 
-       /*
-        * For adding files after the fact - if openfiles= isn't
-        * given as an option, ensure we allow at least one file open
-        */
-       if (!td->o.open_files)
-               td->o.open_files = 1;
-
        if (inc)
                td->o.nr_files++;
 
        if (inc)
                td->o.nr_files++;