File close fixes

[fio.git] / filesetup.c

diff --git a/filesetup.c b/filesetup.c
index 15c431603718291d04b3ab50cf623ea6c83b80c7..a0a4b80d33483d70c00db8fe56882ce073136286 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -436,7 +436,7 @@ open_again:
                char buf[FIO_VERROR_SIZE];
                int __e = errno;
 
-               if (errno == EPERM && (flags & FIO_O_NOATIME)) {
+               if (__e == EPERM && (flags & FIO_O_NOATIME)) {
                        flags &= ~FIO_O_NOATIME;
                        goto open_again;
                }
@@ -710,8 +710,10 @@ void close_files(struct thread_data *td)
        struct fio_file *f;
        unsigned int i;
 
-       for_each_file(td, f, i)
-               td_io_close_file(td, f);
+       for_each_file(td, f, i) {
+               if (fio_file_open(f))
+                       td_io_close_file(td, f);
+       }
 }
 
 void close_and_free_files(struct thread_data *td)