From 547584dd2168e2bc3da6088db47541f8bdf03dba Mon Sep 17 00:00:00 2001
From: arton <arton@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 7 Nov 2011 14:45:27 +0000
Subject: [PATCH] * io.c (io_fflush): remove fsync(). * io.c (rb_io_flush,
 rb_io_rewind): fsync() here. These pathces are backports of trunk r33651 for
 [Bug #5585]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog |  6 ++++++
 io.c      | 15 ++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c4ea779a3c..530aa34696 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Nov  7 23:39:23 2011  Tajima Akio <artonx@yahoo.co.jp>
+
+       	* io.c (io_fflush): remove fsync().
+	* io.c (rb_io_flush, rb_io_rewind): fsync() here.
+	  These pathces are backports of trunk r33651 for [Bug #5585]
+
 Mon Oct 10 22:33:12 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
 	* test/-ext-/old_thread_select/test_old_thread_select.rb:
diff --git a/io.c b/io.c
index acb6253e26..c8f941b065 100644
--- a/io.c
+++ b/io.c
@@ -684,11 +684,6 @@ io_fflush(rb_io_t *fptr)
 	    return -1;
         rb_io_check_closed(fptr);
     }
-#ifdef _WIN32
-    if (GetFileType((HANDLE)rb_w32_get_osfhandle(fptr->fd)) == FILE_TYPE_DISK) {
-	fsync(fptr->fd);
-    }
-#endif
     return 0;
 }
 
@@ -1067,6 +1062,11 @@ rb_io_flush(VALUE io)
     if (fptr->mode & FMODE_WRITABLE) {
         if (io_fflush(fptr) < 0)
             rb_sys_fail(0);
+#ifdef _WIN32
+        if (GetFileType((HANDLE)rb_w32_get_osfhandle(fptr->fd)) == FILE_TYPE_DISK) {
+	    fsync(fptr->fd);
+        }
+#endif
     }
     if (fptr->mode & FMODE_READABLE) {
         io_unread(fptr);
@@ -1199,6 +1199,11 @@ rb_io_rewind(VALUE io)
 
     GetOpenFile(io, fptr);
     if (io_seek(fptr, 0L, 0) < 0 && errno) rb_sys_fail_path(fptr->pathv);
+#ifdef _WIN32
+    if (GetFileType((HANDLE)rb_w32_get_osfhandle(fptr->fd)) == FILE_TYPE_DISK) {
+	fsync(fptr->fd);
+    }
+#endif
     if (io == ARGF.current_file) {
 	ARGF.lineno -= fptr->lineno;
     }