+ td->o.nr_files = 0;
+}
+
+static void get_file_type(struct fio_file *f)
+{
+ struct stat sb;
+
+ f->filetype = FIO_TYPE_FILE;
+
+ if (!lstat(f->file_name, &sb)) {
+ f->flags |= FIO_FILE_EXISTS;
+
+ if (S_ISBLK(sb.st_mode))
+ f->filetype = FIO_TYPE_BD;
+ else if (S_ISCHR(sb.st_mode))
+ f->filetype = FIO_TYPE_CHAR;
+ else {
+ /*
+ * might as well do this here, and save a stat later on
+ */
+ f->real_file_size = sb.st_size;
+ f->file_size = f->real_file_size;
+ }
+ }
+}
+
+void add_file(struct thread_data *td, const char *fname)
+{
+ int cur_files = td->files_index;
+ struct fio_file *f;
+
+ td->files = realloc(td->files, (cur_files + 1) * sizeof(*f));
+
+ f = &td->files[cur_files];
+ memset(f, 0, sizeof(*f));
+ f->fd = -1;
+ f->file_name = strdup(fname);
+
+ get_file_type(f);
+
+ td->files_index++;
+ if (f->filetype == FIO_TYPE_FILE)
+ td->nr_normal_files++;
+}
+
+void get_file(struct fio_file *f)
+{
+ f->references++;
+}
+
+void put_file(struct thread_data *td, struct fio_file *f)
+{
+ if (!(f->flags & FIO_FILE_OPEN))
+ return;
+
+ assert(f->references);
+ if (--f->references)
+ return;
+
+ if (should_fsync(td) && td->o.fsync_on_close)
+ fsync(f->fd);
+
+ if (td->io_ops->close_file)
+ td->io_ops->close_file(td, f);
+ td->nr_open_files--;
+ f->flags &= ~FIO_FILE_OPEN;
+}
+
+static int recurse_dir(struct thread_data *td, const char *dirname)
+{
+ struct dirent *dir;
+ int ret = 0;
+ DIR *D;
+
+ D = opendir(dirname);
+ if (!D) {
+ td_verror(td, errno, "opendir");
+ return 1;
+ }
+
+ while ((dir = readdir(D)) != NULL) {
+ char full_path[PATH_MAX];
+ struct stat sb;
+
+ if (!strcmp(dir->d_name, ".") || !strcmp(dir->d_name, ".."))
+ continue;
+
+ sprintf(full_path, "%s/%s", dirname, dir->d_name);
+
+ if (lstat(full_path, &sb) == -1) {
+ if (errno != ENOENT) {
+ td_verror(td, errno, "stat");
+ return 1;
+ }
+ }
+
+ if (S_ISREG(sb.st_mode)) {
+ add_file(td, full_path);
+ td->o.nr_files++;
+ continue;
+ }
+
+ if ((ret = recurse_dir(td, full_path)) != 0)
+ break;
+ }
+
+ closedir(D);
+ return ret;
+}
+
+int add_dir_files(struct thread_data *td, const char *path)
+{
+ return recurse_dir(td, path);