* fhandler_disk_file.cc (fhandler_disk_file::fchmod): Remove file

	attribute check already done in NtSetAttributesFile.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 0a1b4ed..ec9228a 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-16  Corinna Vinschen  <corinna@vinschen.de>
+
+       * fhandler_disk_file.cc (fhandler_disk_file::fchmod): Remove file
+       attribute check already done in NtSetAttributesFile.
+
 2009-07-15  Corinna Vinschen  <corinna@vinschen.de>
 
        * globals.cc: Reorder constant UNICODE_STRINGs for clarity.

diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
index e94422a..f2dd1ea 100644 (file)
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ b/winsup/cygwin/fhandler_disk_file.cc
@@ -845,8 +845,7 @@ fhandler_disk_file::fchmod (mode_t mode)
   if (S_ISSOCK (mode))
     pc |= (DWORD) FILE_ATTRIBUTE_SYSTEM;
 
-  status = NtSetAttributesFile (get_handle (), pc.file_attributes ()
-                                              ?: FILE_ATTRIBUTE_NORMAL);
+  status = NtSetAttributesFile (get_handle (), pc.file_attributes ());
   /* Correct NTFS security attributes have higher priority */
   if (!pc.has_acls ())
     {