yaffs Clean up some yaffs1 related comments and messages

Signed-off-by: Charles Manning <cdhmanning@gmail.com>

diff --git a/yaffs_guts.c b/yaffs_guts.c
index 6524f5f5dc39211897a8c7ad3d3802f711701cc2..a1782e7a5177a4293058bc7061e5c46206521887 100644 (file)
--- a/yaffs_guts.c
+++ b/yaffs_guts.c
@@ -2223,6 +2223,7 @@ static int yaffs_GarbageCollectBlock(yaffs_Device *dev, int block,
                                         * We have to decrement free chunks so this works out properly.
                                         */
                                        dev->nFreeChunks--;
+                                       bi->softDeletions--;
 
                                        object->nDataChunks--;
 

diff --git a/yaffs_verify.c b/yaffs_verify.c
index 4511c0f5871d1196f8a4a57a1db51595f78ad44a..a600aa6b1e6b3bfe4e07b13463c0cbc73db349ca 100644 (file)
--- a/yaffs_verify.c
+++ b/yaffs_verify.c
@@ -97,7 +97,6 @@ void yaffs_VerifyCollectedBlock(yaffs_Device *dev, yaffs_BlockInfo *bi, int n)
        yaffs_VerifyBlock(dev, bi, n);
 
        /* After collection the block should be in the erased state */
-       /* This will need to change if we do partial gc */
 
        if (bi->blockState != YAFFS_BLOCK_STATE_COLLECTING &&
                        bi->blockState != YAFFS_BLOCK_STATE_EMPTY) {

diff --git a/yaffs_yaffs1.c b/yaffs_yaffs1.c
index 1b8fcf1f21ffbf010a8e8879b48813bd127eeba8..78cc819946ee4958277311f823c7a27c6a927daf 100644 (file)
--- a/yaffs_yaffs1.c
+++ b/yaffs_yaffs1.c
@@ -231,6 +231,11 @@ int yaffs1_Scan(yaffs_Device *dev)
                                                shadowFixerList = fixer;
                                                fixer->objectId = tags.objectId;
                                                fixer->shadowedId = oh->shadowsObject;
+                                               T(YAFFS_TRACE_SCAN,
+                                                 (TSTR
+                                                  (" Shadow fixer: %d shadows %d" TENDSTR),
+                                                  fixer->objectId, fixer->shadowedId));
+
                                        }
 
                                }