]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
rearrange setting disk_op_in_progress near storeClientFileRead().
authorwessels <>
Sat, 21 Mar 1998 06:10:31 +0000 (06:10 +0000)
committerwessels <>
Sat, 21 Mar 1998 06:10:31 +0000 (06:10 +0000)
I suspect maybe we called file_read() without setting disk_op_in_progress?

src/store_client.cc

index fb2a1e607c19731a043f845b78aba5826f79e3b8..5cb22ebd7d61331026a1392c314a17182f9604f4 100644 (file)
@@ -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