projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Move td_io_sync()
[fio.git]
/
filesetup.c
diff --git
a/filesetup.c
b/filesetup.c
index d6df4f9fccb7b699c7e5dcfe292bbd4b6d65d8ac..52d822ac4b6c8fb1bff042fd56aae96e0846c9da 100644
(file)
--- a/
filesetup.c
+++ b/
filesetup.c
@@
-114,8
+114,8
@@
static int create_files(struct thread_data *td)
temp_stall_ts = 1;
fprintf(f_out, "%s: Laying out IO file(s) (%d x %LuMiB == %LuMiB)\n",
temp_stall_ts = 1;
fprintf(f_out, "%s: Laying out IO file(s) (%d x %LuMiB == %LuMiB)\n",
- td->name, td->nr_files,
- (td->total_file_size >> 20) / td->nr_files,
+ td->name, td->nr_
uniq_
files,
+ (td->total_file_size >> 20) / td->nr_
uniq_
files,
td->total_file_size >> 20);
err = 0;
td->total_file_size >> 20);
err = 0;
@@
-404,8
+404,13
@@
void close_files(struct thread_data *td)
for_each_file(td, f, i) {
if (f->fd != -1) {
for_each_file(td, f, i) {
if (f->fd != -1) {
- if (td->unlink && td->filetype == FIO_TYPE_FILE)
+ if (td->unlink && td->filetype == FIO_TYPE_FILE &&
+ td->filename) {
unlink(f->file_name);
unlink(f->file_name);
+ td->filename = NULL;
+ }
+ free(f->file_name);
+ f->file_name = NULL;
close(f->fd);
f->fd = -1;
}
close(f->fd);
f->fd = -1;
}
@@
-414,4
+419,8
@@
void close_files(struct thread_data *td)
f->mmap = NULL;
}
}
f->mmap = NULL;
}
}
+
+ free(td->files);
+ td->files = NULL;
+ td->nr_files = 0;
}
}