From: hno <>
Date: Tue, 20 Feb 2001 06:10:06 +0000 (+0000)
Subject: Don't try to remove memory-only objects from the disk during cache_dir rebuild
X-Git-Tag: SQUID_3_0_PRE1~1595
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ee372dee13c1eb82a9548d1e12dbc34ea7c85ffb;p=thirdparty%2Fsquid.git

Don't try to remove memory-only objects from the disk during cache_dir rebuild
---

diff --git a/src/fs/aufs/store_dir_aufs.cc b/src/fs/aufs/store_dir_aufs.cc
index 92f7933504..31d7aa1b4e 100644
--- a/src/fs/aufs/store_dir_aufs.cc
+++ b/src/fs/aufs/store_dir_aufs.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_dir_aufs.cc,v 1.30 2001/02/10 16:40:41 hno Exp $
+ * $Id: store_dir_aufs.cc,v 1.31 2001/02/19 23:10:06 hno Exp $
  *
  * DEBUG: section 47    Store Directory Routines
  * AUTHOR: Duane Wessels
@@ -569,8 +569,8 @@ storeAufsDirRebuildFromSwapLog(void *data)
 		 */
 		storeExpireNow(e);
 		storeReleaseRequest(e);
-		storeAufsDirReplRemove(e);
 		if (e->swap_filen > -1) {
+		    storeAufsDirReplRemove(e);
 		    storeAufsDirMapBitReset(SD, e->swap_filen);
 		    e->swap_filen = -1;
 		    e->swap_dirn = -1;
@@ -657,8 +657,8 @@ storeAufsDirRebuildFromSwapLog(void *data)
 	    /* junk old, load new */
 	    storeExpireNow(e);
 	    storeReleaseRequest(e);
-	    storeAufsDirReplRemove(e);
 	    if (e->swap_filen > -1) {
+		storeAufsDirReplRemove(e);
 		/* Make sure we don't actually unlink the file */
 		storeAufsDirMapBitReset(SD, e->swap_filen);
 		e->swap_filen = -1;
diff --git a/src/fs/diskd/store_dir_diskd.cc b/src/fs/diskd/store_dir_diskd.cc
index db1b807cee..c90a6fab97 100644
--- a/src/fs/diskd/store_dir_diskd.cc
+++ b/src/fs/diskd/store_dir_diskd.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_dir_diskd.cc,v 1.40 2001/02/10 16:40:42 hno Exp $
+ * $Id: store_dir_diskd.cc,v 1.41 2001/02/19 23:10:07 hno Exp $
  *
  * DEBUG: section 47    Store Directory Routines
  * AUTHOR: Duane Wessels
@@ -761,8 +761,8 @@ storeDiskdDirRebuildFromSwapLog(void *data)
 		 */
 		storeExpireNow(e);
 		storeReleaseRequest(e);
-		storeDiskdDirReplRemove(e);
 		if (e->swap_filen > -1) {
+		    storeDiskdDirReplRemove(e);
 		    storeDiskdDirMapBitReset(SD, e->swap_filen);
 		    e->swap_filen = -1;
 		    e->swap_dirn = -1;
@@ -849,8 +849,8 @@ storeDiskdDirRebuildFromSwapLog(void *data)
 	    /* junk old, load new */
 	    storeExpireNow(e);
 	    storeReleaseRequest(e);
-	    storeDiskdDirReplRemove(e);
 	    if (e->swap_filen > -1) {
+		storeDiskdDirReplRemove(e);
 		/* Make sure we don't actually unlink the file */
 		storeDiskdDirMapBitReset(SD, e->swap_filen);
 		e->swap_filen = -1;
diff --git a/src/fs/ufs/store_dir_ufs.cc b/src/fs/ufs/store_dir_ufs.cc
index d7a86b9ce1..0d5f8037a2 100644
--- a/src/fs/ufs/store_dir_ufs.cc
+++ b/src/fs/ufs/store_dir_ufs.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_dir_ufs.cc,v 1.29 2001/02/10 16:40:43 hno Exp $
+ * $Id: store_dir_ufs.cc,v 1.30 2001/02/19 23:10:07 hno Exp $
  *
  * DEBUG: section 47    Store Directory Routines
  * AUTHOR: Duane Wessels
@@ -566,8 +566,8 @@ storeUfsDirRebuildFromSwapLog(void *data)
 		 */
 		storeExpireNow(e);
 		storeReleaseRequest(e);
-		storeUfsDirReplRemove(e);
 		if (e->swap_filen > -1) {
+		    storeUfsDirReplRemove(e);
 		    storeUfsDirMapBitReset(SD, e->swap_filen);
 		    e->swap_filen = -1;
 		    e->swap_dirn = -1;
@@ -654,8 +654,8 @@ storeUfsDirRebuildFromSwapLog(void *data)
 	    /* junk old, load new */
 	    storeExpireNow(e);
 	    storeReleaseRequest(e);
-	    storeUfsDirReplRemove(e);
 	    if (e->swap_filen > -1) {
+		storeUfsDirReplRemove(e);
 		/* Make sure we don't actually unlink the file */
 		storeUfsDirMapBitReset(SD, e->swap_filen);
 		e->swap_filen = -1;