* fhandler.cc (fhandler_base::fsync): Ignore ERROR_INVALID_FUNCTION

	error from FlushFileBuffers().

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index fb21b9d..72ea9ad 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-01  Christian Franke  <franke@computer.org>
+
+       * fhandler.cc (fhandler_base::fsync): Ignore ERROR_INVALID_FUNCTION
+       error from FlushFileBuffers().
+
 2011-01-31  Corinna Vinschen  <corinna@vinschen.de>
 
        * syscalls.cc (utmp_data): Fix potential buffer overflow.

diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc
index c97cc01..02c2857 100644 (file)
--- a/winsup/cygwin/fhandler.cc
+++ b/winsup/cygwin/fhandler.cc
@@ -1588,7 +1588,14 @@ fhandler_base::fsync ()
     return 0;
   if (FlushFileBuffers (get_handle ()))
     return 0;
-  __seterrno ();
+
+  /* Ignore ERROR_INVALID_FUNCTION because FlushFileBuffers() always fails
+     with this code on raw devices which are unbuffered by default.  */
+  DWORD errcode = GetLastError();
+  if (errcode == ERROR_INVALID_FUNCTION)
+    return 0;
+
+  __seterrno_from_win_error (errcode);
   return -1;
 }