From 0e126cb141e7c9d3d8d8704bc31b3470d46acd0b Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 1 Feb 2011 08:46:48 +0000 Subject: [PATCH] * fhandler.cc (fhandler_base::fsync): Ignore ERROR_INVALID_FUNCTION error from FlushFileBuffers(). --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/fhandler.cc | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index fb21b9dbd..72ea9ad7b 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2011-02-01 Christian Franke + + * fhandler.cc (fhandler_base::fsync): Ignore ERROR_INVALID_FUNCTION + error from FlushFileBuffers(). + 2011-01-31 Corinna Vinschen * syscalls.cc (utmp_data): Fix potential buffer overflow. diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc index c97cc0139..02c285706 100644 --- 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; }