diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index c9bd3fc1f..993eba545 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-23  Corinna Vinschen  <corinna@vinschen.de>
+
+	* fhandler.cc (fhandler_base::raw_write): Remove STATUS_DISK_FULL
+	special handling.
+
 2010-07-19  Eric Blake  <eblake@redhat.com>
 
 	* mktemp.cc (_gettemp): Add flags argument.  All callers updated.
diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc
index a8264e403..1998979f7 100644
--- a/winsup/cygwin/fhandler.cc
+++ b/winsup/cygwin/fhandler.cc
@@ -290,14 +290,11 @@ fhandler_base::raw_write (const void *ptr, size_t len)
 			NULL);
   if (!NT_SUCCESS (status))
     {
-      if (status == STATUS_DISK_FULL && io.Information > 0)
-	goto written;
       __seterrno_from_nt_status (status);
       if (get_errno () == EPIPE)
 	raise (SIGPIPE);
       return -1;
     }
-written:
   return io.Information;
 }