---------------------
PatchSet 6542 
Date: 2005/03/25 10:34:11
Author: hno
Branch: lfs-2_5
Tag: (none) 
Log:
Fix rebuild of old format swap.state when there is more than one chunk
of data to rebuild.

Members: 
	src/fs/aufs/store_dir_aufs.c:1.23.6.9.8.5->1.23.6.9.8.6 
	src/fs/diskd/store_dir_diskd.c:1.32.6.8.16.3->1.32.6.8.16.4 
	src/fs/ufs/store_dir_ufs.c:1.21.6.10.8.3->1.21.6.10.8.4 

Index: squid/src/fs/aufs/store_dir_aufs.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/fs/aufs/store_dir_aufs.c,v
retrieving revision 1.23.6.9.8.5
retrieving revision 1.23.6.9.8.6
diff -u -r1.23.6.9.8.5 -r1.23.6.9.8.6
--- squid/src/fs/aufs/store_dir_aufs.c	25 Mar 2005 03:34:39 -0000	1.23.6.9.8.5
+++ squid/src/fs/aufs/store_dir_aufs.c	25 Mar 2005 10:34:11 -0000	1.23.6.9.8.6
@@ -878,7 +878,7 @@
 	    (int) rb->flags.clean);
 	storeDirSwapLog(e, SWAP_LOG_ADD);
     }
-    eventAdd("storeRebuild", storeAufsDirRebuildFromSwapLog, rb, 0.0, 1);
+    eventAdd("storeRebuild", storeAufsDirRebuildFromSwapLogOld, rb, 0.0, 1);
 }
 #endif
 
Index: squid/src/fs/diskd/store_dir_diskd.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/fs/diskd/store_dir_diskd.c,v
retrieving revision 1.32.6.8.16.3
retrieving revision 1.32.6.8.16.4
diff -u -r1.32.6.8.16.3 -r1.32.6.8.16.4
--- squid/src/fs/diskd/store_dir_diskd.c	25 Mar 2005 03:34:42 -0000	1.32.6.8.16.3
+++ squid/src/fs/diskd/store_dir_diskd.c	25 Mar 2005 10:34:12 -0000	1.32.6.8.16.4
@@ -1098,7 +1098,7 @@
 	    (int) rb->flags.clean);
 	storeDirSwapLog(e, SWAP_LOG_ADD);
     }
-    eventAdd("storeRebuild", storeDiskdDirRebuildFromSwapLog, rb, 0.0, 1);
+    eventAdd("storeRebuild", storeAufsDirRebuildFromSwapLogOld, rb, 0.0, 1);
 }
 #endif
 
Index: squid/src/fs/ufs/store_dir_ufs.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/fs/ufs/store_dir_ufs.c,v
retrieving revision 1.21.6.10.8.3
retrieving revision 1.21.6.10.8.4
diff -u -r1.21.6.10.8.3 -r1.21.6.10.8.4
--- squid/src/fs/ufs/store_dir_ufs.c	25 Mar 2005 03:34:43 -0000	1.21.6.10.8.3
+++ squid/src/fs/ufs/store_dir_ufs.c	25 Mar 2005 10:34:12 -0000	1.21.6.10.8.4
@@ -885,7 +885,7 @@
 	    (int) rb->flags.clean);
 	storeDirSwapLog(e, SWAP_LOG_ADD);
     }
-    eventAdd("storeRebuild", storeUfsDirRebuildFromSwapLog, rb, 0.0, 1);
+    eventAdd("storeRebuild", storeAufsDirRebuildFromSwapLogOld, rb, 0.0, 1);
 }
 #endif