Turn file ->open and ->unlink into flags

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index 948cecda7fb56e70de64c0c00ef9723e7564be74..f6e997438c885e7d70aa07b36c212c8c39aa917e 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -148,9 +148,11 @@ static int create_files(struct thread_data *td)
                /*
                 * Only unlink files that we created.
                 */
-               f->unlink = 0;
+               f->flags &= ~FIO_FILE_UNLINK;
                if (file_ok(td, f)) {
-                       f->unlink = td->unlink;
+                       if (td->unlink)
+                               f->flags |= FIO_FILE_UNLINK;
+
                        err = create_file(td, f);
                        if (err)
                                break;
@@ -394,7 +396,7 @@ void close_files(struct thread_data *td)
        unsigned int i;
 
        for_each_file(td, f, i) {
-               if (!td->filename && f->unlink &&
+               if (!td->filename && (f->flags & FIO_FILE_UNLINK) &&
                    f->filetype == FIO_TYPE_FILE) {
                        unlink(f->file_name);
                        f->file_name = NULL;