From: wessels <>
Date: Sat, 25 Mar 2000 12:14:04 +0000 (+0000)
Subject: DW:
X-Git-Tag: SQUID_3_0_PRE1~2048
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a928befc29b394aa6bfa22f0a2c82f0a1e03a474;p=thirdparty%2Fsquid.git

DW:
 - Moved sc->flags.disk_io_pending check from storeClientCopy3 to
   storeClientCopy.
---

diff --git a/src/store_client.cc b/src/store_client.cc
index 781deb2977..efcd0a0f43 100644
--- a/src/store_client.cc
+++ b/src/store_client.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_client.cc,v 1.84 2000/03/06 16:23:35 wessels Exp $
+ * $Id: store_client.cc,v 1.85 2000/03/25 05:14:04 wessels Exp $
  *
  * DEBUG: section 20    Storage Manager Client-Side Interface
  * AUTHOR: Duane Wessels
@@ -312,10 +312,7 @@ storeClientCopy3(StoreEntry * e, store_client * sc)
 	return;
     }
     assert(STORE_DISK_CLIENT == sc->type);
-    if (sc->flags.disk_io_pending) {
-	debug(20, 1) ("WARNING: Averted multiple fd operation (2)\n");
-	return;
-    }
+    assert(!sc->flags.disk_io_pending);
     debug(20, 3) ("storeClientCopy3: reading from STORE\n");
     storeClientFileRead(sc);
 }
@@ -511,7 +508,7 @@ storeUnregister(StoreEntry * e, void *data)
     delayUnregisterDelayIdPtr(&sc->delay_id);
 #endif
     cbdataUnlock(sc->callback_data);	/* we're done with it now */
-    /*assert(!sc->flags.disk_io_pending);*/
+    /*assert(!sc->flags.disk_io_pending); */
     cbdataFree(sc);
     assert(e->lock_count > 0);
     if (mem->nclients == 0)
@@ -557,6 +554,8 @@ InvokeHandlers(StoreEntry * e)
 	    continue;
 	if (sc->callback == NULL)
 	    continue;
+	if (sc->flags.disk_io_pending)
+	    continue;
 	storeClientCopy2(e, sc);
     }
 }