projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.kernel.dk/data/git/fio
[fio.git]
/
filesetup.c
diff --git
a/filesetup.c
b/filesetup.c
index fa09219f62a2e2b93f0e001b2e7254da72e04e99..abea1e60b726a8d82f503b054c83d76a66470210 100644
(file)
--- a/
filesetup.c
+++ b/
filesetup.c
@@
-806,7
+806,7
@@
int setup_files(struct thread_data *td)
* Calculate per-file size and potential extra size for the
* first files, if needed.
*/
* Calculate per-file size and potential extra size for the
* first files, if needed.
*/
- if (!o->file_size_low) {
+ if (!o->file_size_low
&& o->nr_files
) {
uint64_t all_fs;
fs = o->size / o->nr_files;
uint64_t all_fs;
fs = o->size / o->nr_files;
@@
-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++;