From: wessels <>
Date: Sat, 21 Mar 1998 06:10:31 +0000 (+0000)
Subject: rearrange setting disk_op_in_progress near storeClientFileRead().
X-Git-Tag: SQUID_3_0_PRE1~3773
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62e2f81ea2f822f2882adbd61fe1c11146a792b4;p=thirdparty%2Fsquid.git

rearrange setting disk_op_in_progress near storeClientFileRead().
I suspect maybe we called file_read() without setting disk_op_in_progress?
---

diff --git a/src/store_client.cc b/src/store_client.cc
index fb2a1e607c..5cb22ebd7d 100644
--- a/src/store_client.cc
+++ b/src/store_client.cc
@@ -189,7 +189,6 @@ storeClientCopy2(StoreEntry * e, store_client * sc)
 	    sc->swapin_fd);
 	assert(sc->type == STORE_DISK_CLIENT);
 	if (sc->disk_op_in_progress == 0) {
-	    sc->disk_op_in_progress = 1;
 	    storeClientFileRead(sc);
 	} else {
 	    debug(20, 2) ("storeClientCopy2: Averted multiple fd operation\n");
@@ -233,6 +232,7 @@ storeClientFileRead(store_client * sc)
 	    sc->copy_offset + mem->swap_hdr_sz,
 	    storeClientReadBody,
 	    sc);
+    sc->disk_op_in_progress = 1;
 }
 
 static void