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 92f7933504098d66975d5e78373285081de731a2..31d7aa1b4e530398d2bc787cedb430a2ae2ade4c 100644 (file)
--- 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 db1b807cee45c45ca4b475a843afb221d0923e29..c90a6fab97d13cc9c232914e24d821e93bf645fc 100644 (file)
--- 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 d7a86b9ce15744300e68dd0fa9005880782df506..0d5f8037a274c8892bbffc392a85e85726680991 100644 (file)
--- 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;