Only subtract softDeletions once ber block gc.

diff --git a/yaffs_guts.c b/yaffs_guts.c
index 0db60b971b2f5c8c5fd9de667f955d9cd7cb47e9..33ba5e652745d0dae67c2d4bc4de30ee1fdaeb86 100644 (file)
--- a/yaffs_guts.c
+++ b/yaffs_guts.c
@@ -12,7 +12,7 @@
  */
 
 const char *yaffs_guts_c_version =
  */
 
 const char *yaffs_guts_c_version =

-    "$Id: yaffs_guts.c,v 1.84 2009-05-26 04:50:08 charles Exp $";
+    "$Id: yaffs_guts.c,v 1.85 2009-06-08 23:50:44 charles Exp $";

 
 #include "yportenv.h"
 
 
 #include "yportenv.h"
 


@@ -2985,7 +2985,8 @@ static int yaffs_GarbageCollectBlock(yaffs_Device *dev, int block,
        /* Take off the number of soft deleted entries because
         * they're going to get really deleted during GC.
         */
        /* Take off the number of soft deleted entries because
         * they're going to get really deleted during GC.
         */

-       dev->nFreeChunks -= bi->softDeletions;
+       if(dev->gcChunk == 0) /* first time through for this block */
+               dev->nFreeChunks -= bi->softDeletions;

 
        dev->isDoingGC = 1;
 
 
        dev->isDoingGC = 1;