Fix free space reporting as per Mikhail Rileev's patch

diff --git a/yaffs_guts.c b/yaffs_guts.c
index 0ab8d8a051dcf81706e0f6ffce91e167ba144fe8..e949e319aa2fb1a5b60dad1ae117839c8b10fa93 100644 (file)
--- a/yaffs_guts.c
+++ b/yaffs_guts.c
@@ -13,7 +13,7 @@
  */
 
 const char *yaffs_guts_c_version =
  */
 
 const char *yaffs_guts_c_version =

-    "$Id: yaffs_guts.c,v 1.28 2006-02-02 22:14:44 charles Exp $";
+    "$Id: yaffs_guts.c,v 1.29 2006-02-08 22:29:14 charles Exp $";

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


@@ -2347,6 +2347,7 @@ static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block)
                                   ("yaffs: About to finally delete object %d"
                                    TENDSTR), object->objectId));
                                yaffs_DoGenericObjectDeletion(object);
                                   ("yaffs: About to finally delete object %d"
                                    TENDSTR), object->objectId));
                                yaffs_DoGenericObjectDeletion(object);

+                               object->myDev->nDeletedFiles--;

                        }
 
                }
                        }
 
                }


@@ -5691,6 +5692,8 @@ int yaffs_GetNumberOfFreeChunks(yaffs_Device * dev)
        nFree = yaffs_CountFreeChunks(dev);
 #endif
 
        nFree = yaffs_CountFreeChunks(dev);
 #endif
 

+       nFree += dev->nDeletedFiles;
+       

        /* Now count the number of dirty chunks in the cache and subtract those */
 
        {
        /* Now count the number of dirty chunks in the cache and subtract those */
 
        {