Some more bits of blktrace support

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index 6ccd357ec4f5d0b9dde6cb92d2691139eeb2aa34..d79fc61081278c934fd1c4aecbfe344666c75811 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -222,7 +222,7 @@ int generic_open_file(struct thread_data *td, struct fio_file *f)
        if (td->o.sync_io)
                flags |= O_SYNC;
 
-       if (td_write(td) || td_rw(td)) {
+       if (td_write(td)) {
                flags |= O_RDWR;
 
                if (f->filetype == FIO_TYPE_FILE)
@@ -474,8 +474,7 @@ void close_files(struct thread_data *td)
        unsigned int i;
 
        for_each_file(td, f, i) {
-               if ((f->flags & FIO_FILE_UNLINK) &&
-                   f->filetype == FIO_TYPE_FILE)
+               if (td->o.unlink && f->filetype == FIO_TYPE_FILE)
                        unlink(f->file_name);
 
                td_io_close_file(td, f);