Fix cache hits (swapins) during reloading

diff --git a/src/store_swapin.cc b/src/store_swapin.cc
index 721e418e519fdb62a8b6b66d8b4d46271e1259a2..2281e266c87b9716f5cc3fe3c8fd82c494952dd8 100644 (file)
--- a/src/store_swapin.cc
+++ b/src/store_swapin.cc
@@ -15,15 +15,11 @@ storeSwapInStart(StoreEntry * e, SIH * callback, void *callback_data)
 {
     swapin_ctrl_t *ctrlp;
     assert(e->mem_status == NOT_IN_MEMORY);
-#if OLD_CODE
     if (!EBIT_TEST(e->flag, ENTRY_VALIDATED)) {
-       if (storeDirMapBitTest(e->swap_file_number)) {
-           /* someone took our file while we weren't looking */
-           callback(-1, callback_data);
-           return;
-       }
+       /* We're still reloading and haven't validated this entry yet */
+       callback(-1, callback_data);
+       return;
     }
-#endif
     debug(20, 3) ("storeSwapInStart: called for %08X %s \n",
        e->swap_file_number, storeKeyText(e->key));
     assert(e->swap_status == SWAPOUT_WRITING || e->swap_status == SWAPOUT_DONE);