From: wessels <> Date: Tue, 10 Feb 1998 04:17:25 +0000 (+0000) Subject: I think we dont need FD_WRITE_PENDING X-Git-Tag: SQUID_3_0_PRE1~4133 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=18b23dc113e11d765cd12b430494d10c52b8ef90;p=thirdparty%2Fsquid.git I think we dont need FD_WRITE_PENDING --- diff --git a/src/disk.cc b/src/disk.cc index 31048a3fc2..b3e2085627 100644 --- a/src/disk.cc +++ b/src/disk.cc @@ -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; diff --git a/src/enums.h b/src/enums.h index a337c8f813..78f7520f5d 100644 --- a/src/enums.h +++ b/src/enums.h @@ -341,7 +341,6 @@ enum { enum { FD_CLOSE_REQUEST, FD_WRITE_DAEMON, - FD_WRITE_PENDING, FD_CLOSING, FD_SOCKET_EOF };