[haiku-commits] r40699 - haiku/trunk/src/system/kernel/fs

  • From: korli@xxxxxxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sat, 26 Feb 2011 11:45:03 +0100 (CET)

Author: korli
Date: 2011-02-26 11:45:03 +0100 (Sat, 26 Feb 2011)
New Revision: 40699
Changeset: http://dev.haiku-os.org/changeset/40699

Modified:
   haiku/trunk/src/system/kernel/fs/fd.cpp
Log:
reverted r40686


Modified: haiku/trunk/src/system/kernel/fs/fd.cpp
===================================================================
--- haiku/trunk/src/system/kernel/fs/fd.cpp     2011-02-26 09:56:48 UTC (rev 
40698)
+++ haiku/trunk/src/system/kernel/fs/fd.cpp     2011-02-26 10:45:03 UTC (rev 
40699)
@@ -12,7 +12,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <sys/ioctl.h>
 
 #include <OS.h>
 
@@ -516,17 +515,6 @@
        if (descriptor == NULL)
                return B_FILE_ERROR;
 
-       if (op == FIONBIO || op == FIONREAD) {
-               switch (descriptor->type) {
-                       case FDTYPE_FILE:
-                       case FDTYPE_DIR:
-                       case FDTYPE_ATTR_DIR:
-                       case FDTYPE_ATTR:
-                               put_fd(descriptor);
-                               return ENOTTY;
-               }
-       }       
-
        if (descriptor->ops->fd_ioctl)
                status = descriptor->ops->fd_ioctl(descriptor, op, buffer, 
length);
        else


Other related posts:

  • » [haiku-commits] r40699 - haiku/trunk/src/system/kernel/fs - korli