Collapse internal revalidation requests (SMP-unaware caches), again.

[thirdparty/squid.git] / src / fs / rock / RockSwapDir.cc

diff --git a/src/fs/rock/RockSwapDir.cc b/src/fs/rock/RockSwapDir.cc
index 01cc52ca0d746769838ae131bd883b4f3ab0de51..52a1c211fb9c00013847c9df516ea71ea0c7c1e0 100644 (file)
--- a/src/fs/rock/RockSwapDir.cc
+++ b/src/fs/rock/RockSwapDir.cc
@@ -137,7 +137,7 @@ Rock::SwapDir::anchorEntry(StoreEntry &e, const sfileno filen, const Ipc::StoreM
     e.ping_status = PING_NONE;
 
     EBIT_CLR(e.flags, RELEASE_REQUEST);
-    EBIT_CLR(e.flags, KEY_PRIVATE);
+    e.clearPrivate();
     EBIT_SET(e.flags, ENTRY_VALIDATED);
 
     e.swap_dirn = index;
@@ -432,7 +432,7 @@ Rock::SwapDir::parseTimeOption(char const *option, const char *value, int reconf
 
     if (!value) {
         self_destruct();
-        return;
+        return false;
     }
 
     // TODO: handle time units and detect parsing errors better
@@ -440,7 +440,7 @@ Rock::SwapDir::parseTimeOption(char const *option, const char *value, int reconf
     if (parsedValue < 0) {
         debugs(3, DBG_CRITICAL, "FATAL: cache_dir " << path << ' ' << option << " must not be negative but is: " << parsedValue);
         self_destruct();
-        return;
+        return false;
     }
 
     const time_msec_t newTime = static_cast<time_msec_t>(parsedValue);
@@ -477,7 +477,7 @@ Rock::SwapDir::parseRateOption(char const *option, const char *value, int isaRec
 
     if (!value) {
         self_destruct();
-        return;
+        return false;
     }
 
     // TODO: handle time units and detect parsing errors better
@@ -485,7 +485,7 @@ Rock::SwapDir::parseRateOption(char const *option, const char *value, int isaRec
     if (parsedValue < 0) {
         debugs(3, DBG_CRITICAL, "FATAL: cache_dir " << path << ' ' << option << " must not be negative but is: " << parsedValue);
         self_destruct();
-        return;
+        return false;
     }
 
     const int newRate = static_cast<int>(parsedValue);
@@ -493,7 +493,7 @@ Rock::SwapDir::parseRateOption(char const *option, const char *value, int isaRec
     if (newRate < 0) {
         debugs(3, DBG_CRITICAL, "FATAL: cache_dir " << path << ' ' << option << " must not be negative but is: " << newRate);
         self_destruct();
-        return;
+        return false;
     }
 
     if (!isaReconfig)
@@ -527,7 +527,7 @@ Rock::SwapDir::parseSizeOption(char const *option, const char *value, int reconf
 
     if (!value) {
         self_destruct();
-        return;
+        return false;
     }
 
     // TODO: handle size units and detect parsing errors better
@@ -535,13 +535,13 @@ Rock::SwapDir::parseSizeOption(char const *option, const char *value, int reconf
     if (newSize <= 0) {
         debugs(3, DBG_CRITICAL, "FATAL: cache_dir " << path << ' ' << option << " must be positive; got: " << newSize);
         self_destruct();
-        return;
+        return false;
     }
 
     if (newSize <= sizeof(DbCellHeader)) {
         debugs(3, DBG_CRITICAL, "FATAL: cache_dir " << path << ' ' << option << " must exceed " << sizeof(DbCellHeader) << "; got: " << newSize);
         self_destruct();
-        return;
+        return false;
     }
 
     if (!reconfig)