From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Sun, 28 Jul 2013 22:34:46 +0000 (-0600)
Subject: Followup for the StoreEntry::mayStartSwapOut() fix (branch r12569).
X-Git-Tag: SQUID_3_5_0_1~444^2~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d4dea47354166b5be6dd069d200a35a2c8ddc13;p=thirdparty%2Fsquid.git

Followup for the StoreEntry::mayStartSwapOut() fix (branch r12569).

Fixed swapout condition after adding swStarted to allow an already started
swapout to continue.
---

diff --git a/src/store_swapout.cc b/src/store_swapout.cc
index f77fab1aaa..3223ffbe8f 100644
--- a/src/store_swapout.cc
+++ b/src/store_swapout.cc
@@ -205,7 +205,7 @@ StoreEntry::swapOut()
 
     Store::Root().memoryOut(*this, weAreOrMayBeSwappingOut);
 
-    if (mem_obj->swapout.decision != MemObject::SwapOut::swPossible)
+    if (mem_obj->swapout.decision < MemObject::SwapOut::swPossible)
         return; // nothing else to do
 
     // Aborted entries have STORE_OK, but swapoutPossible rejects them. Thus,