Various fixes/updates

[fio.git] / os / os-windows.h

diff --git a/os/os-windows.h b/os/os-windows.h
index 74c0f9e8e6cb63e07857206e11a81be8bdd006ad..9edacf335090882d82e53201b01e8cec1bb2b28b 100644 (file)
--- a/os/os-windows.h
+++ b/os/os-windows.h
@@ -1,7 +1,6 @@
 #ifndef FIO_OS_WINDOWS_H\r
 #define FIO_OS_WINDOWS_H\r
 \r
 #ifndef FIO_OS_WINDOWS_H\r
 #define FIO_OS_WINDOWS_H\r
 \r

-\r

 #include <sys/types.h>\r
 #include <errno.h>\r
 #include <windows.h>\r
 #include <sys/types.h>\r
 #include <errno.h>\r
 #include <windows.h>\r


@@ -37,8 +36,8 @@ static inline int blockdev_size(struct fio_file *f, unsigned long long *bytes)
        HANDLE hFile;\r
 \r
        if (f->hFile == NULL) {\r
        HANDLE hFile;\r
 \r
        if (f->hFile == NULL) {\r

-               hFile = CreateFile(f->file_name, (GENERIC_READ | GENERIC_WRITE),\r
-                       (FILE_SHARE_READ | FILE_SHARE_WRITE), NULL, OPEN_EXISTING, 0, NULL);\r
+               hFile = CreateFile(f->file_name, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,\r
+                               NULL, OPEN_EXISTING, 0, NULL);\r

        } else {\r
                hFile = f->hFile;\r
        }\r
        } else {\r
                hFile = f->hFile;\r
        }\r


@@ -51,7 +50,6 @@ static inline int blockdev_size(struct fio_file *f, unsigned long long *bytes)
                *bytes = info.Length.QuadPart;\r
        else\r
                rc = EIO;\r
                *bytes = info.Length.QuadPart;\r
        else\r
                rc = EIO;\r

-       }\r

 \r
        /* If we were passed a POSIX fd,\r
         * close the HANDLE we created via CreateFile */\r
 \r
        /* If we were passed a POSIX fd,\r
         * close the HANDLE we created via CreateFile */\r


@@ -66,14 +64,10 @@ static inline int chardev_size(struct fio_file *f, unsigned long long *bytes)
        return blockdev_size(f, bytes);\r
 }\r
 \r
        return blockdev_size(f, bytes);\r
 }\r
 \r

-{\r
-\r

 static inline int blockdev_invalidate_cache(struct fio_file *f)\r
 {\r
 static inline int blockdev_invalidate_cache(struct fio_file *f)\r
 {\r

-       BOOL bSuccess = FlushFileBuffers(f->hFile);\r
-       if (!bSuccess)\r
-               log_info("blockdev_invalidate_cache - FlushFileBuffers failed\n");\r
-\r
+       /* There's no way to invalidate the cache in Windows\r
+        * so just pretend to succeed */\r

        return 0;\r
 }\r
 \r
        return 0;\r
 }\r
 \r


@@ -95,5 +89,4 @@ static inline void os_get_tmpdir(char *path, int len)
 #define FIO_MADV_FREE  MADV_FREE\r
 #endif\r
 \r
 #define FIO_MADV_FREE  MADV_FREE\r
 #endif\r
 \r

-\r

 #endif /* FIO_OS_WINDOWS_H */\r
 #endif /* FIO_OS_WINDOWS_H */\r