* fhandler_disk_file.cc (fhandler_disk_file::fchmod): Call close_fs

	instead of close to avoid calling close from wrong class when changing
	a file system based device node.
	(fhandler_disk_file::fchown): Ditto.
	(fhandler_disk_file::facl): Ditto.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index b91c83c4361ee7167de92badebaf33445aa41373..1e5896fb50db68e0c2ecc79fad4a0fad75c56387 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,11 @@
+2008-02-29  Corinna Vinschen  <corinna@vinschen.de>
+
+       * fhandler_disk_file.cc (fhandler_disk_file::fchmod): Call close_fs
+       instead of close to avoid calling close from wrong class when changing
+       a file system based device node.
+       (fhandler_disk_file::fchown): Ditto.
+       (fhandler_disk_file::facl): Ditto.
+
 2008-02-28  Corinna Vinschen  <corinna@vinschen.de>
 
        * exceptions.cc (_cygtls::handle_exceptions): When being debugged,

diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
index c06b5ffddad84d58ecb012ab9511648bb988ee95..fbd66e2ff114135ebb30da02717404e52578a5d7 100644 (file)
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ b/winsup/cygwin/fhandler_disk_file.cc
@@ -784,7 +784,7 @@ fhandler_disk_file::fchmod (mode_t mode)
     res = 0;
 
   if (oret)
-    close ();
+    close_fs ();
 
   return res;
 }
@@ -826,7 +826,7 @@ fhandler_disk_file::fchown (__uid32_t uid, __gid32_t gid)
       res = set_file_attribute (get_handle (), pc, uid, gid, attrib);
     }
   if (oret)
-    close ();
+    close_fs ();
 
   return res;
 }
@@ -941,7 +941,7 @@ cant_access_acl:
     }
 
   if (oret)
-    close ();
+    close_fs ();
 
   return res;
 }