]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
I think we dont need FD_WRITE_PENDING
authorwessels <>
Tue, 10 Feb 1998 04:17:25 +0000 (04:17 +0000)
committerwessels <>
Tue, 10 Feb 1998 04:17:25 +0000 (04:17 +0000)
src/disk.cc
src/enums.h

index 31048a3fc2a81aa7ed8d1d1e08c7dd8d2496c46c..b3e2085627db929a3052284b4e476de8d1448153 100644 (file)
@@ -1,6 +1,6 @@
 
 /*
- * $Id: disk.cc,v 1.102 1998/02/05 20:47:35 wessels Exp $
+ * $Id: disk.cc,v 1.103 1998/02/09 21:17:25 wessels Exp $
  *
  * DEBUG: section 6     Disk I/O Routines
  * AUTHOR: Harvest Derived
@@ -209,10 +209,6 @@ file_close(int fd)
        EBIT_SET(F->flags, FD_CLOSE_REQUEST);
        return;
     }
-    if (EBIT_TEST(F->flags, FD_WRITE_PENDING)) {
-       EBIT_SET(F->flags, FD_CLOSE_REQUEST);
-       return;
-    }
 #if USE_ASYNC_IO
     aioClose(fd);
 #else
@@ -338,7 +334,6 @@ diskHandleWriteComplete(void *data, int len, int errcode)
     if (fdd->write_q == NULL) {
        /* no more data */
        fdd->write_q_tail = NULL;
-       EBIT_CLR(F->flags, FD_WRITE_PENDING);
        EBIT_CLR(F->flags, FD_WRITE_DAEMON);
     } else {
        /* another block is queued */
@@ -379,7 +374,6 @@ file_write(int fd,
     F->disk.wrt_handle = handle;
     F->disk.wrt_handle_data = handle_data;
     /* add to queue */
-    EBIT_SET(F->flags, FD_WRITE_PENDING);
     if (F->disk.write_q == NULL) {
        /* empty queue */
        F->disk.write_q = F->disk.write_q_tail = wq;
index a337c8f813acf9d5ad3f763f295f7ec1d7625544..78f7520f5d28f0ca80d63373f5673116bdfab4a5 100644 (file)
@@ -341,7 +341,6 @@ enum {
 enum {
     FD_CLOSE_REQUEST,
     FD_WRITE_DAEMON,
-    FD_WRITE_PENDING,
     FD_CLOSING,
     FD_SOCKET_EOF
 };