From: Jens Axboe <axboe@fb.com>
Date: Wed, 9 Apr 2014 03:03:59 +0000 (-0600)
Subject: Revert "Fixup ->open_files if not given"
X-Git-Tag: fio-2.1.8~5^2~4
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=3b5fea35f499c68cc56d03178a275656f2b4dc1b

Revert "Fixup ->open_files if not given"

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
---

diff --git a/filesetup.c b/filesetup.c
index bf05b6f0..abea1e60 100644
--- a/filesetup.c
+++ b/filesetup.c
@@ -1279,13 +1279,6 @@ int add_file(struct thread_data *td, const char *fname, int numjob, int inc)
 
 	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++;