From: wessels <>
Date: Thu, 1 Mar 2007 14:25:15 +0000 (+0000)
Subject: Bug 1908: store*DirRebuildFromSwapLog() ignores some SWAP_LOG_DEL entries
X-Git-Tag: SQUID_3_0_PRE6~138
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77fde53fddffa4ca13220a028f56fd81e5baa03f;p=thirdparty%2Fsquid.git

Bug 1908: store*DirRebuildFromSwapLog() ignores some SWAP_LOG_DEL entries

merged from squid-2 CVS
---

diff --git a/src/fs/ufs/ufscommon.cc b/src/fs/ufs/ufscommon.cc
index 8775294a8a..381511e758 100644
--- a/src/fs/ufs/ufscommon.cc
+++ b/src/fs/ufs/ufscommon.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: ufscommon.cc,v 1.6 2006/08/19 12:31:24 robertc Exp $
+ * $Id: ufscommon.cc,v 1.7 2007/03/01 07:25:15 wessels Exp $
  * vim: set et : 
  *
  * DEBUG: section 47    Store Directory Routines
@@ -373,7 +373,7 @@ RebuildState::rebuildFromSwapLog()
              */
             currentEntry (Store::Root().get(swapData.key));
 
-            if (currentEntry() != NULL && swapData.lastref > e->lastref) {
+            if (currentEntry() != NULL && swapData.lastref >= e->lastref) {
                 /*
                  * Make sure we don't unlink the file, it might be
                  * in use by a subsequent entry.  Also note that