yaffs Refactorisation first phase
authorCharles Manning <cdhmanning@gmail.com>
Thu, 1 Jul 2010 04:14:01 +0000 (16:14 +1200)
committerCharles Manning <cdhmanning@gmail.com>
Thu, 1 Jul 2010 21:54:26 +0000 (09:54 +1200)
Partitoning code. More to happen.

Signed-off-by: Charles Manning <cdhmanning@gmail.com>
Makefile
Makefile.kernel
direct/Makefile
direct/python/Makefile
direct/tests/Makefile
yaffs_guts.c
yaffs_guts.h
yaffs_verify.c [new file with mode: 0644]
yaffs_verify.h [new file with mode: 0644]
yaffs_yaffs2.c
yaffs_yaffs2.h

index f261d20..da8a9f1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,7 @@ ifneq ($(KERNELRELEASE),)
        yaffs2-objs += yaffs_allocator.o yaffs_bitmap.o
        yaffs2-objs += yaffs_yaffs1.o
        yaffs2-objs += yaffs_yaffs2.o
+       yaffs2-objs += yaffs_verify.o
 
 else
        KERNELDIR ?= /lib/modules/$(shell uname -r)/build
index 14178e7..2f95ae8 100644 (file)
@@ -13,4 +13,5 @@ yaffs-y += yaffs_linux_allocator.o
 yaffs-y += yaffs_yaffs1.o
 yaffs-y += yaffs_yaffs2.o
 yaffs-y += yaffs_bitmap.o
+yaffs-y += yaffs_verify.o
 
index fee4ea2..931fed1 100644 (file)
@@ -37,7 +37,7 @@ COMMONTESTOBJS = yaffscfg2k.o yaffs_ecc.o yaffs_fileem.o yaffs_fileem2k.o yaffsf
                 yaffs_norif1.o  ynorsim.o \
                 yaffs_allocator.o yaffs_yaffs1.o \
                 yaffs_yaffs2.o \
-                yaffs_bitmap.o
+                yaffs_bitmap.o yaffs_verify.o
 
 #               yaffs_checkptrwtest.o\
 
@@ -58,7 +58,8 @@ SYMLINKS = devextras.h yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h yaffsin
           yaffs_allocator.c yaffs_allocator.h \
          yaffs_bitmap.c yaffs_bitmap.h \
           yaffs_yaffs1.c yaffs_yaffs1.h \
-          yaffs_yaffs2.c yaffs_yaffs2.h 
+          yaffs_yaffs2.c yaffs_yaffs2.h \
+          yaffs_verify.c yaffs_verify.h
 
 #all: directtest2k boottest
 
index 50f21e6..3c952ee 100644 (file)
@@ -36,7 +36,9 @@ COMMONTESTOBJS = yaffscfg2k.o yaffs_ecc.o yaffs_fileem.o yaffs_fileem2k.o yaffsf
                 yaffs_nameval.o \
                 yaffs_allocator.o \
                 yaffs_norif1.o  ynorsim.o \
-                yaffs_bitmap.o yaffs_yaffs1.o yaffs_yaffs2.o
+                yaffs_bitmap.o \
+                yaffs_verify.o \
+                yaffs_yaffs1.o yaffs_yaffs2.o
 
 
 YAFFSLIBOBJS  = $(COMMONTESTOBJS) yaffs_python_helper.o
@@ -52,7 +54,8 @@ YAFFSSYMLINKS = devextras.h yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h ya
           yaffs_allocator.c yaffs_allocator.h \
           yaffs_yaffs1.c yaffs_yaffs1.h \
           yaffs_yaffs2.c yaffs_yaffs2.h \
-          yaffs_bitmap.c yaffs_bitmap.h
+          yaffs_bitmap.c yaffs_bitmap.h \
+          yaffs_verify.c yaffs_verify.h
           
 
 YAFFSDIRECTSYMLINKS =  yaffscfg2k.c yaffs_fileem2k.c yaffsfs.c yaffs_flashif.h yaffs_flashif2.h\
index ebe4c1e..4b92592 100644 (file)
@@ -39,7 +39,8 @@ COMMONTESTOBJS = yaffscfg2k.o yaffs_ecc.o yaffs_fileem.o yaffs_fileem2k.o yaffsf
                 yaffs_allocator.o \
                 yaffs_bitmap.o \
                 yaffs_yaffs1.o \
-                yaffs_yaffs2.o
+                yaffs_yaffs2.o \
+                yaffs_verify.o
 
 #               yaffs_checkptrwtest.o\
 
@@ -59,7 +60,8 @@ YAFFSSYMLINKS = devextras.h yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h ya
           yaffs_allocator.c yaffs_allocator.h \
           yaffs_yaffs1.c yaffs_yaffs1.h \
           yaffs_yaffs2.c yaffs_yaffs2.h \
-          yaffs_bitmap.c yaffs_bitmap.h
+          yaffs_bitmap.c yaffs_bitmap.h \
+          yaffs_verify.c yaffs_verify.h
 
 YAFFSDIRECTSYMLINKS =  yaffscfg2k.c yaffs_fileem2k.c yaffsfs.c yaffs_flashif.h yaffs_flashif2.h\
                       yaffs_fileem2k.h yaffsfs.h yaffs_malloc.h yaffs_ramdisk.h ydirectenv.h \
index 6efa94f..a8b850a 100644 (file)
@@ -25,6 +25,7 @@
 #include "yaffs_yaffs1.h"
 #include "yaffs_yaffs2.h"
 #include "yaffs_bitmap.h"
+#include "yaffs_verify.h"
 
 #include "yaffs_nand.h"
 #include "yaffs_packedtags2.h"
@@ -87,25 +88,12 @@ static int yaffs_AllocateChunk(yaffs_Device *dev, int useReserve,
 
 static void yaffs_CheckObjectDetailsLoaded(yaffs_Object *in);
 
-static void yaffs_VerifyDirectory(yaffs_Object *directory);
-#ifdef YAFFS_PARANOID
-static int yaffs_CheckFileSanity(yaffs_Object *in);
-#else
-#define yaffs_CheckFileSanity(in)
-#endif
-
 static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in);
 static void yaffs_InvalidateChunkCache(yaffs_Object *object, int chunkId);
 
 static int yaffs_FindChunkInFile(yaffs_Object *in, int chunkInInode,
                                yaffs_ExtendedTags *tags);
 
-static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn,
-               unsigned pos);
-static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev,
-                                       yaffs_FileStructure *fStruct,
-                                       __u32 chunkId);
-
 static int yaffs_VerifyChunkWritten(yaffs_Device *dev,
                                        int chunkInNAND,
                                        const __u8 *data,
@@ -301,460 +289,7 @@ int yaffs_IsManagedTempBuffer(yaffs_Device *dev, const __u8 *buffer)
  * Verification code
  */
 
-static int yaffs_SkipVerification(yaffs_Device *dev)
-{
-       dev=dev;
-       return !(yaffs_traceMask & (YAFFS_TRACE_VERIFY | YAFFS_TRACE_VERIFY_FULL));
-}
 
-static int yaffs_SkipFullVerification(yaffs_Device *dev)
-{
-       dev=dev;
-       return !(yaffs_traceMask & (YAFFS_TRACE_VERIFY_FULL));
-}
-
-static int yaffs_SkipNANDVerification(yaffs_Device *dev)
-{
-       dev=dev;
-       return !(yaffs_traceMask & (YAFFS_TRACE_VERIFY_NAND));
-}
-
-static const char *blockStateName[] = {
-"Unknown",
-"Needs scanning",
-"Scanning",
-"Empty",
-"Allocating",
-"Full",
-"Dirty",
-"Checkpoint",
-"Collecting",
-"Dead"
-};
-
-
-static void yaffs_VerifyBlock(yaffs_Device *dev, yaffs_BlockInfo *bi, int n)
-{
-       int actuallyUsed;
-       int inUse;
-
-       if (yaffs_SkipVerification(dev))
-               return;
-
-       /* Report illegal runtime states */
-       if (bi->blockState >= YAFFS_NUMBER_OF_BLOCK_STATES)
-               T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has undefined state %d"TENDSTR), n, bi->blockState));
-
-       switch (bi->blockState) {
-       case YAFFS_BLOCK_STATE_UNKNOWN:
-       case YAFFS_BLOCK_STATE_SCANNING:
-       case YAFFS_BLOCK_STATE_NEEDS_SCANNING:
-               T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has bad run-state %s"TENDSTR),
-               n, blockStateName[bi->blockState]));
-       }
-
-       /* Check pages in use and soft deletions are legal */
-
-       actuallyUsed = bi->pagesInUse - bi->softDeletions;
-
-       if (bi->pagesInUse < 0 || bi->pagesInUse > dev->param.nChunksPerBlock ||
-          bi->softDeletions < 0 || bi->softDeletions > dev->param.nChunksPerBlock ||
-          actuallyUsed < 0 || actuallyUsed > dev->param.nChunksPerBlock)
-               T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has illegal values pagesInUsed %d softDeletions %d"TENDSTR),
-               n, bi->pagesInUse, bi->softDeletions));
-
-
-       /* Check chunk bitmap legal */
-       inUse = yaffs_CountChunkBits(dev, n);
-       if (inUse != bi->pagesInUse)
-               T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has inconsistent values pagesInUse %d counted chunk bits %d"TENDSTR),
-                       n, bi->pagesInUse, inUse));
-
-       /* Check that the sequence number is valid.
-        * Ten million is legal, but is very unlikely
-        */
-
-        yaffs2_VerifyBlock(dev,bi,n);
-}
-
-
-
-static 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) {
-               T(YAFFS_TRACE_ERROR, (TSTR("Block %d is in state %d after gc, should be erased"TENDSTR),
-                       n, bi->blockState));
-       }
-}
-
-void yaffs_VerifyBlocks(yaffs_Device *dev)
-{
-       int i;
-       int nBlocksPerState[YAFFS_NUMBER_OF_BLOCK_STATES];
-       int nIllegalBlockStates = 0;
-
-       if (yaffs_SkipVerification(dev))
-               return;
-
-       memset(nBlocksPerState, 0, sizeof(nBlocksPerState));
-
-       for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
-               yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i);
-               yaffs_VerifyBlock(dev, bi, i);
-
-               if (bi->blockState < YAFFS_NUMBER_OF_BLOCK_STATES)
-                       nBlocksPerState[bi->blockState]++;
-               else
-                       nIllegalBlockStates++;
-       }
-
-       T(YAFFS_TRACE_VERIFY, (TSTR(""TENDSTR)));
-       T(YAFFS_TRACE_VERIFY, (TSTR("Block summary"TENDSTR)));
-
-       T(YAFFS_TRACE_VERIFY, (TSTR("%d blocks have illegal states"TENDSTR), nIllegalBlockStates));
-       if (nBlocksPerState[YAFFS_BLOCK_STATE_ALLOCATING] > 1)
-               T(YAFFS_TRACE_VERIFY, (TSTR("Too many allocating blocks"TENDSTR)));
-
-       for (i = 0; i < YAFFS_NUMBER_OF_BLOCK_STATES; i++)
-               T(YAFFS_TRACE_VERIFY,
-                 (TSTR("%s %d blocks"TENDSTR),
-                 blockStateName[i], nBlocksPerState[i]));
-
-       if (dev->blocksInCheckpoint != nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT])
-               T(YAFFS_TRACE_VERIFY,
-                (TSTR("Checkpoint block count wrong dev %d count %d"TENDSTR),
-                dev->blocksInCheckpoint, nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT]));
-
-       if (dev->nErasedBlocks != nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY])
-               T(YAFFS_TRACE_VERIFY,
-                (TSTR("Erased block count wrong dev %d count %d"TENDSTR),
-                dev->nErasedBlocks, nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY]));
-
-       if (nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING] > 1)
-               T(YAFFS_TRACE_VERIFY,
-                (TSTR("Too many collecting blocks %d (max is 1)"TENDSTR),
-                nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING]));
-
-       T(YAFFS_TRACE_VERIFY, (TSTR(""TENDSTR)));
-
-}
-
-/*
- * Verify the object header. oh must be valid, but obj and tags may be NULL in which
- * case those tests will not be performed.
- */
-static void yaffs_VerifyObjectHeader(yaffs_Object *obj, yaffs_ObjectHeader *oh, yaffs_ExtendedTags *tags, int parentCheck)
-{
-       if (obj && yaffs_SkipVerification(obj->myDev))
-               return;
-
-       if (!(tags && obj && oh)) {
-               T(YAFFS_TRACE_VERIFY,
-                               (TSTR("Verifying object header tags %p obj %p oh %p"TENDSTR),
-                               tags, obj, oh));
-               return;
-       }
-
-       if (oh->type <= YAFFS_OBJECT_TYPE_UNKNOWN ||
-                       oh->type > YAFFS_OBJECT_TYPE_MAX)
-               T(YAFFS_TRACE_VERIFY,
-                       (TSTR("Obj %d header type is illegal value 0x%x"TENDSTR),
-                       tags->objectId, oh->type));
-
-       if (tags->objectId != obj->objectId)
-               T(YAFFS_TRACE_VERIFY,
-                       (TSTR("Obj %d header mismatch objectId %d"TENDSTR),
-                       tags->objectId, obj->objectId));
-
-
-       /*
-        * Check that the object's parent ids match if parentCheck requested.
-        *
-        * Tests do not apply to the root object.
-        */
-
-       if (parentCheck && tags->objectId > 1 && !obj->parent)
-               T(YAFFS_TRACE_VERIFY,
-                       (TSTR("Obj %d header mismatch parentId %d obj->parent is NULL"TENDSTR),
-                       tags->objectId, oh->parentObjectId));
-
-       if (parentCheck && obj->parent &&
-                       oh->parentObjectId != obj->parent->objectId &&
-                       (oh->parentObjectId != YAFFS_OBJECTID_UNLINKED ||
-                       obj->parent->objectId != YAFFS_OBJECTID_DELETED))
-               T(YAFFS_TRACE_VERIFY,
-                       (TSTR("Obj %d header mismatch parentId %d parentObjectId %d"TENDSTR),
-                       tags->objectId, oh->parentObjectId, obj->parent->objectId));
-
-       if (tags->objectId > 1 && oh->name[0] == 0) /* Null name */
-               T(YAFFS_TRACE_VERIFY,
-                       (TSTR("Obj %d header name is NULL"TENDSTR),
-                       obj->objectId));
-
-       if (tags->objectId > 1 && ((__u8)(oh->name[0])) == 0xff) /* Trashed name */
-               T(YAFFS_TRACE_VERIFY,
-                       (TSTR("Obj %d header name is 0xFF"TENDSTR),
-                       obj->objectId));
-}
-
-
-#if 0
-/* Not being used, but don't want to throw away yet */
-static int yaffs_VerifyTnodeWorker(yaffs_Object *obj, yaffs_Tnode *tn,
-                                       __u32 level, int chunkOffset)
-{
-       int i;
-       yaffs_Device *dev = obj->myDev;
-       int ok = 1;
-
-       if (tn) {
-               if (level > 0) {
-
-                       for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++) {
-                               if (tn->internal[i]) {
-                                       ok = yaffs_VerifyTnodeWorker(obj,
-                                                       tn->internal[i],
-                                                       level - 1,
-                                                       (chunkOffset<<YAFFS_TNODES_INTERNAL_BITS) + i);
-                               }
-                       }
-               } else if (level == 0) {
-                       yaffs_ExtendedTags tags;
-                       __u32 objectId = obj->objectId;
-
-                       chunkOffset <<=  YAFFS_TNODES_LEVEL0_BITS;
-
-                       for (i = 0; i < YAFFS_NTNODES_LEVEL0; i++) {
-                               __u32 theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
-
-                               if (theChunk > 0) {
-                                       /* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),tags.objectId,tags.chunkId,theChunk)); */
-                                       yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL, &tags);
-                                       if (tags.objectId != objectId || tags.chunkId != chunkOffset) {
-                                               T(~0, (TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
-                                                       objectId, chunkOffset, theChunk,
-                                                       tags.objectId, tags.chunkId));
-                                       }
-                               }
-                               chunkOffset++;
-                       }
-               }
-       }
-
-       return ok;
-
-}
-
-#endif
-
-static void yaffs_VerifyFile(yaffs_Object *obj)
-{
-       int requiredTallness;
-       int actualTallness;
-       __u32 lastChunk;
-       __u32 x;
-       __u32 i;
-       yaffs_Device *dev;
-       yaffs_ExtendedTags tags;
-       yaffs_Tnode *tn;
-       __u32 objectId;
-
-       if (!obj)
-               return;
-
-       if (yaffs_SkipVerification(obj->myDev))
-               return;
-
-       dev = obj->myDev;
-       objectId = obj->objectId;
-
-       /* Check file size is consistent with tnode depth */
-       lastChunk =  obj->variant.fileVariant.fileSize / dev->nDataBytesPerChunk + 1;
-       x = lastChunk >> YAFFS_TNODES_LEVEL0_BITS;
-       requiredTallness = 0;
-       while (x > 0) {
-               x >>= YAFFS_TNODES_INTERNAL_BITS;
-               requiredTallness++;
-       }
-
-       actualTallness = obj->variant.fileVariant.topLevel;
-
-       /* Check that the chunks in the tnode tree are all correct.
-        * We do this by scanning through the tnode tree and
-        * checking the tags for every chunk match.
-        */
-
-       if (yaffs_SkipNANDVerification(dev))
-               return;
-
-       for (i = 1; i <= lastChunk; i++) {
-               tn = yaffs_FindLevel0Tnode(dev, &obj->variant.fileVariant, i);
-
-               if (tn) {
-                       __u32 theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
-                       if (theChunk > 0) {
-                               /* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),objectId,i,theChunk)); */
-                               yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL, &tags);
-                               if (tags.objectId != objectId || tags.chunkId != i) {
-                                       T(~0, (TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
-                                               objectId, i, theChunk,
-                                               tags.objectId, tags.chunkId));
-                               }
-                       }
-               }
-       }
-}
-
-
-static void yaffs_VerifyHardLink(yaffs_Object *obj)
-{
-       if (obj && yaffs_SkipVerification(obj->myDev))
-               return;
-
-       /* Verify sane equivalent object */
-}
-
-static void yaffs_VerifySymlink(yaffs_Object *obj)
-{
-       if (obj && yaffs_SkipVerification(obj->myDev))
-               return;
-
-       /* Verify symlink string */
-}
-
-static void yaffs_VerifySpecial(yaffs_Object *obj)
-{
-       if (obj && yaffs_SkipVerification(obj->myDev))
-               return;
-}
-
-static void yaffs_VerifyObject(yaffs_Object *obj)
-{
-       yaffs_Device *dev;
-
-       __u32 chunkMin;
-       __u32 chunkMax;
-
-       __u32 chunkIdOk;
-       __u32 chunkInRange;
-       __u32 chunkShouldNotBeDeleted;
-       __u32 chunkValid;
-
-       if (!obj)
-               return;
-
-       if (obj->beingCreated)
-               return;
-
-       dev = obj->myDev;
-
-       if (yaffs_SkipVerification(dev))
-               return;
-
-       /* Check sane object header chunk */
-
-       chunkMin = dev->internalStartBlock * dev->param.nChunksPerBlock;
-       chunkMax = (dev->internalEndBlock+1) * dev->param.nChunksPerBlock - 1;
-
-       chunkInRange = (((unsigned)(obj->hdrChunk)) >= chunkMin && ((unsigned)(obj->hdrChunk)) <= chunkMax);
-       chunkIdOk = chunkInRange || (obj->hdrChunk == 0);
-       chunkValid = chunkInRange &&
-                       yaffs_CheckChunkBit(dev,
-                                       obj->hdrChunk / dev->param.nChunksPerBlock,
-                                       obj->hdrChunk % dev->param.nChunksPerBlock);
-       chunkShouldNotBeDeleted = chunkInRange && !chunkValid;
-
-       if (!obj->fake &&
-                       (!chunkIdOk || chunkShouldNotBeDeleted)) {
-               T(YAFFS_TRACE_VERIFY,
-                       (TSTR("Obj %d has chunkId %d %s %s"TENDSTR),
-                       obj->objectId, obj->hdrChunk,
-                       chunkIdOk ? "" : ",out of range",
-                       chunkShouldNotBeDeleted ? ",marked as deleted" : ""));
-       }
-
-       if (chunkValid && !yaffs_SkipNANDVerification(dev)) {
-               yaffs_ExtendedTags tags;
-               yaffs_ObjectHeader *oh;
-               __u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
-
-               oh = (yaffs_ObjectHeader *)buffer;
-
-               yaffs_ReadChunkWithTagsFromNAND(dev, obj->hdrChunk, buffer,
-                               &tags);
-
-               yaffs_VerifyObjectHeader(obj, oh, &tags, 1);
-
-               yaffs_ReleaseTempBuffer(dev, buffer, __LINE__);
-       }
-
-       /* Verify it has a parent */
-       if (obj && !obj->fake &&
-                       (!obj->parent || obj->parent->myDev != dev)) {
-               T(YAFFS_TRACE_VERIFY,
-                       (TSTR("Obj %d has parent pointer %p which does not look like an object"TENDSTR),
-                       obj->objectId, obj->parent));
-       }
-
-       /* Verify parent is a directory */
-       if (obj->parent && obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-               T(YAFFS_TRACE_VERIFY,
-                       (TSTR("Obj %d's parent is not a directory (type %d)"TENDSTR),
-                       obj->objectId, obj->parent->variantType));
-       }
-
-       switch (obj->variantType) {
-       case YAFFS_OBJECT_TYPE_FILE:
-               yaffs_VerifyFile(obj);
-               break;
-       case YAFFS_OBJECT_TYPE_SYMLINK:
-               yaffs_VerifySymlink(obj);
-               break;
-       case YAFFS_OBJECT_TYPE_DIRECTORY:
-               yaffs_VerifyDirectory(obj);
-               break;
-       case YAFFS_OBJECT_TYPE_HARDLINK:
-               yaffs_VerifyHardLink(obj);
-               break;
-       case YAFFS_OBJECT_TYPE_SPECIAL:
-               yaffs_VerifySpecial(obj);
-               break;
-       case YAFFS_OBJECT_TYPE_UNKNOWN:
-       default:
-               T(YAFFS_TRACE_VERIFY,
-               (TSTR("Obj %d has illegaltype %d"TENDSTR),
-               obj->objectId, obj->variantType));
-               break;
-       }
-}
-
-void yaffs_VerifyObjects(yaffs_Device *dev)
-{
-       yaffs_Object *obj;
-       int i;
-       struct ylist_head *lh;
-
-       if (yaffs_SkipVerification(dev))
-               return;
-
-       /* Iterate through the objects in each hash entry */
-
-       for (i = 0; i <  YAFFS_NOBJECT_BUCKETS; i++) {
-               ylist_for_each(lh, &dev->objectBucket[i].list) {
-                       if (lh) {
-                               obj = ylist_entry(lh, yaffs_Object, hashLink);
-                               yaffs_VerifyObject(obj);
-                       }
-               }
-       }
-}
 
 
 /*
@@ -1154,7 +689,7 @@ void yaffs_LoadLevel0Tnode(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos,
        }
 }
 
-static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn,
+__u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn,
                unsigned pos)
 {
        __u32 *map = (__u32 *)tn;
@@ -1191,7 +726,7 @@ static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn,
  */
 
 /* FindLevel0Tnode finds the level 0 tnode, if one exists. */
-static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev,
+yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev,
                                        yaffs_FileStructure *fStruct,
                                        __u32 chunkId)
 {
@@ -3152,63 +2687,6 @@ static int yaffs_FindAndDeleteChunkInFile(yaffs_Object *in, int chunkInInode,
        return retVal;
 }
 
-#ifdef YAFFS_PARANOID
-
-static int yaffs_CheckFileSanity(yaffs_Object *in)
-{
-       int chunk;
-       int nChunks;
-       int fSize;
-       int failed = 0;
-       int objId;
-       yaffs_Tnode *tn;
-       yaffs_Tags localTags;
-       yaffs_Tags *tags = &localTags;
-       int theChunk;
-       int chunkDeleted;
-
-       if (in->variantType != YAFFS_OBJECT_TYPE_FILE)
-               return YAFFS_FAIL;
-
-       objId = in->objectId;
-       fSize = in->variant.fileVariant.fileSize;
-       nChunks =
-           (fSize + in->myDev->nDataBytesPerChunk - 1) / in->myDev->nDataBytesPerChunk;
-
-       for (chunk = 1; chunk <= nChunks; chunk++) {
-               tn = yaffs_FindLevel0Tnode(in->myDev, &in->variant.fileVariant,
-                                          chunk);
-
-               if (tn) {
-
-                       theChunk = yaffs_GetChunkGroupBase(dev, tn, chunk);
-
-                       if (yaffs_CheckChunkBits
-                           (dev, theChunk / dev->param.nChunksPerBlock,
-                            theChunk % dev->param.nChunksPerBlock)) {
-
-                               yaffs_ReadChunkTagsFromNAND(in->myDev, theChunk,
-                                                           tags,
-                                                           &chunkDeleted);
-                               if (yaffs_TagsMatch
-                                   (tags, in->objectId, chunk, chunkDeleted)) {
-                                       /* found it; */
-
-                               }
-                       } else {
-
-                               failed = 1;
-                       }
-
-               } else {
-                       /* T(("No level 0 found for %d\n", chunk)); */
-               }
-       }
-
-       return failed ? YAFFS_FAIL : YAFFS_OK;
-}
-
-#endif
 
 int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode,
                                int chunkInNAND, int inScan)
@@ -3475,7 +2953,7 @@ static int yaffs_WriteChunkDataToObject(yaffs_Object *in, int chunkInInode,
                if (prevChunkId > 0)
                        yaffs_DeleteChunk(dev, prevChunkId, 1, __LINE__);
 
-               yaffs_CheckFileSanity(in);
+               yaffs_VerifyFileSanity(in);
        }
        return newChunkId;
 
@@ -4887,82 +4365,6 @@ static void yaffs_CheckObjectDetailsLoaded(yaffs_Object *in)
 
 /*------------------------------  Directory Functions ----------------------------- */
 
-static void yaffs_VerifyObjectInDirectory(yaffs_Object *obj)
-{
-       struct ylist_head *lh;
-       yaffs_Object *listObj;
-
-       int count = 0;
-
-       if (!obj) {
-               T(YAFFS_TRACE_ALWAYS, (TSTR("No object to verify" TENDSTR)));
-               YBUG();
-               return;
-       }
-
-       if (yaffs_SkipVerification(obj->myDev))
-               return;
-
-       if (!obj->parent) {
-               T(YAFFS_TRACE_ALWAYS, (TSTR("Object does not have parent" TENDSTR)));
-               YBUG();
-               return;
-       }
-
-       if (obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-               T(YAFFS_TRACE_ALWAYS, (TSTR("Parent is not directory" TENDSTR)));
-               YBUG();
-       }
-
-       /* Iterate through the objects in each hash entry */
-
-       ylist_for_each(lh, &obj->parent->variant.directoryVariant.children) {
-               if (lh) {
-                       listObj = ylist_entry(lh, yaffs_Object, siblings);
-                       yaffs_VerifyObject(listObj);
-                       if (obj == listObj)
-                               count++;
-               }
-        }
-
-       if (count != 1) {
-               T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory %d times" TENDSTR), count));
-               YBUG();
-       }
-}
-
-static void yaffs_VerifyDirectory(yaffs_Object *directory)
-{
-       struct ylist_head *lh;
-       yaffs_Object *listObj;
-
-       if (!directory) {
-               YBUG();
-               return;
-       }
-
-       if (yaffs_SkipFullVerification(directory->myDev))
-               return;
-
-       if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-               T(YAFFS_TRACE_ALWAYS, (TSTR("Directory has wrong type: %d" TENDSTR), directory->variantType));
-               YBUG();
-       }
-
-       /* Iterate through the objects in each hash entry */
-
-       ylist_for_each(lh, &directory->variant.directoryVariant.children) {
-               if (lh) {
-                       listObj = ylist_entry(lh, yaffs_Object, siblings);
-                       if (listObj->parent != directory) {
-                               T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory list has wrong parent %p" TENDSTR), listObj->parent));
-                               YBUG();
-                       }
-                       yaffs_VerifyObjectInDirectory(listObj);
-               }
-       }
-}
-
 /*
  *yaffs_UpdateParent() handles fixing a directories mtime and ctime when a new
  * link (ie. name) is created or deleted in the directory.
@@ -5902,7 +5304,7 @@ void yaffs_Deinitialise(yaffs_Device *dev)
        }
 }
 
-static int yaffs_CountFreeChunks(yaffs_Device *dev)
+int yaffs_CountFreeChunks(yaffs_Device *dev)
 {
        int nFree=0;
        int b;
@@ -5969,27 +5371,6 @@ int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev)
 
 }
 
-static int yaffs_freeVerificationFailures;
-
-void yaffs_VerifyFreeChunks(yaffs_Device *dev)
-{
-       int counted;
-       int difference;
-
-       if (yaffs_SkipVerification(dev))
-               return;
-
-       counted = yaffs_CountFreeChunks(dev);
-
-       difference = dev->nFreeChunks - counted;
-
-       if (difference) {
-               T(YAFFS_TRACE_ALWAYS,
-                 (TSTR("Freechunks verification failure %d %d %d" TENDSTR),
-                  dev->nFreeChunks, counted, difference));
-               yaffs_freeVerificationFailures++;
-       }
-}
 
 /*---------------------------------------- YAFFS test code ----------------------*/
 
index d09a965..ca18503 100644 (file)
@@ -951,4 +951,13 @@ int yaffs_DoWriteDataToFile(yaffs_Object *in, const __u8 *buffer, loff_t offset,
                        int nBytes, int writeThrough);
 void yaffs_ResizeDown( yaffs_Object *obj, loff_t newSize);
 void yaffs_SkipRestOfBlock(yaffs_Device *dev);
+
+int yaffs_CountFreeChunks(yaffs_Device *dev);
+
+yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev,
+                               yaffs_FileStructure *fStruct,
+                               __u32 chunkId);
+
+__u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos);
+
 #endif
diff --git a/yaffs_verify.c b/yaffs_verify.c
new file mode 100644 (file)
index 0000000..b8083ad
--- /dev/null
@@ -0,0 +1,626 @@
+/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2010 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+
+#include "yaffs_verify.h"
+#include "yaffs_trace.h"
+#include "yaffs_bitmap.h"
+#include "yaffs_getblockinfo.h"
+#include "yaffs_nand.h"
+
+int yaffs_SkipVerification(yaffs_Device *dev)
+{
+       dev=dev;
+       return !(yaffs_traceMask & (YAFFS_TRACE_VERIFY | YAFFS_TRACE_VERIFY_FULL));
+}
+
+static int yaffs_SkipFullVerification(yaffs_Device *dev)
+{
+       dev=dev;
+       return !(yaffs_traceMask & (YAFFS_TRACE_VERIFY_FULL));
+}
+
+static int yaffs_SkipNANDVerification(yaffs_Device *dev)
+{
+       dev=dev;
+       return !(yaffs_traceMask & (YAFFS_TRACE_VERIFY_NAND));
+}
+
+
+static const char *blockStateName[] = {
+"Unknown",
+"Needs scanning",
+"Scanning",
+"Empty",
+"Allocating",
+"Full",
+"Dirty",
+"Checkpoint",
+"Collecting",
+"Dead"
+};
+
+
+void yaffs_VerifyBlock(yaffs_Device *dev, yaffs_BlockInfo *bi, int n)
+{
+       int actuallyUsed;
+       int inUse;
+
+       if (yaffs_SkipVerification(dev))
+               return;
+
+       /* Report illegal runtime states */
+       if (bi->blockState >= YAFFS_NUMBER_OF_BLOCK_STATES)
+               T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has undefined state %d"TENDSTR), n, bi->blockState));
+
+       switch (bi->blockState) {
+       case YAFFS_BLOCK_STATE_UNKNOWN:
+       case YAFFS_BLOCK_STATE_SCANNING:
+       case YAFFS_BLOCK_STATE_NEEDS_SCANNING:
+               T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has bad run-state %s"TENDSTR),
+               n, blockStateName[bi->blockState]));
+       }
+
+       /* Check pages in use and soft deletions are legal */
+
+       actuallyUsed = bi->pagesInUse - bi->softDeletions;
+
+       if (bi->pagesInUse < 0 || bi->pagesInUse > dev->param.nChunksPerBlock ||
+          bi->softDeletions < 0 || bi->softDeletions > dev->param.nChunksPerBlock ||
+          actuallyUsed < 0 || actuallyUsed > dev->param.nChunksPerBlock)
+               T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has illegal values pagesInUsed %d softDeletions %d"TENDSTR),
+               n, bi->pagesInUse, bi->softDeletions));
+
+
+       /* Check chunk bitmap legal */
+       inUse = yaffs_CountChunkBits(dev, n);
+       if (inUse != bi->pagesInUse)
+               T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has inconsistent values pagesInUse %d counted chunk bits %d"TENDSTR),
+                       n, bi->pagesInUse, inUse));
+
+}
+
+
+
+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) {
+               T(YAFFS_TRACE_ERROR, (TSTR("Block %d is in state %d after gc, should be erased"TENDSTR),
+                       n, bi->blockState));
+       }
+}
+
+void yaffs_VerifyBlocks(yaffs_Device *dev)
+{
+       int i;
+       int nBlocksPerState[YAFFS_NUMBER_OF_BLOCK_STATES];
+       int nIllegalBlockStates = 0;
+
+       if (yaffs_SkipVerification(dev))
+               return;
+
+       memset(nBlocksPerState, 0, sizeof(nBlocksPerState));
+
+       for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
+               yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i);
+               yaffs_VerifyBlock(dev, bi, i);
+
+               if (bi->blockState < YAFFS_NUMBER_OF_BLOCK_STATES)
+                       nBlocksPerState[bi->blockState]++;
+               else
+                       nIllegalBlockStates++;
+       }
+
+       T(YAFFS_TRACE_VERIFY, (TSTR(""TENDSTR)));
+       T(YAFFS_TRACE_VERIFY, (TSTR("Block summary"TENDSTR)));
+
+       T(YAFFS_TRACE_VERIFY, (TSTR("%d blocks have illegal states"TENDSTR), nIllegalBlockStates));
+       if (nBlocksPerState[YAFFS_BLOCK_STATE_ALLOCATING] > 1)
+               T(YAFFS_TRACE_VERIFY, (TSTR("Too many allocating blocks"TENDSTR)));
+
+       for (i = 0; i < YAFFS_NUMBER_OF_BLOCK_STATES; i++)
+               T(YAFFS_TRACE_VERIFY,
+                 (TSTR("%s %d blocks"TENDSTR),
+                 blockStateName[i], nBlocksPerState[i]));
+
+       if (dev->blocksInCheckpoint != nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT])
+               T(YAFFS_TRACE_VERIFY,
+                (TSTR("Checkpoint block count wrong dev %d count %d"TENDSTR),
+                dev->blocksInCheckpoint, nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT]));
+
+       if (dev->nErasedBlocks != nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY])
+               T(YAFFS_TRACE_VERIFY,
+                (TSTR("Erased block count wrong dev %d count %d"TENDSTR),
+                dev->nErasedBlocks, nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY]));
+
+       if (nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING] > 1)
+               T(YAFFS_TRACE_VERIFY,
+                (TSTR("Too many collecting blocks %d (max is 1)"TENDSTR),
+                nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING]));
+
+       T(YAFFS_TRACE_VERIFY, (TSTR(""TENDSTR)));
+
+}
+
+/*
+ * Verify the object header. oh must be valid, but obj and tags may be NULL in which
+ * case those tests will not be performed.
+ */
+void yaffs_VerifyObjectHeader(yaffs_Object *obj, yaffs_ObjectHeader *oh, yaffs_ExtendedTags *tags, int parentCheck)
+{
+       if (obj && yaffs_SkipVerification(obj->myDev))
+               return;
+
+       if (!(tags && obj && oh)) {
+               T(YAFFS_TRACE_VERIFY,
+                               (TSTR("Verifying object header tags %p obj %p oh %p"TENDSTR),
+                               tags, obj, oh));
+               return;
+       }
+
+       if (oh->type <= YAFFS_OBJECT_TYPE_UNKNOWN ||
+                       oh->type > YAFFS_OBJECT_TYPE_MAX)
+               T(YAFFS_TRACE_VERIFY,
+                       (TSTR("Obj %d header type is illegal value 0x%x"TENDSTR),
+                       tags->objectId, oh->type));
+
+       if (tags->objectId != obj->objectId)
+               T(YAFFS_TRACE_VERIFY,
+                       (TSTR("Obj %d header mismatch objectId %d"TENDSTR),
+                       tags->objectId, obj->objectId));
+
+
+       /*
+        * Check that the object's parent ids match if parentCheck requested.
+        *
+        * Tests do not apply to the root object.
+        */
+
+       if (parentCheck && tags->objectId > 1 && !obj->parent)
+               T(YAFFS_TRACE_VERIFY,
+                       (TSTR("Obj %d header mismatch parentId %d obj->parent is NULL"TENDSTR),
+                       tags->objectId, oh->parentObjectId));
+
+       if (parentCheck && obj->parent &&
+                       oh->parentObjectId != obj->parent->objectId &&
+                       (oh->parentObjectId != YAFFS_OBJECTID_UNLINKED ||
+                       obj->parent->objectId != YAFFS_OBJECTID_DELETED))
+               T(YAFFS_TRACE_VERIFY,
+                       (TSTR("Obj %d header mismatch parentId %d parentObjectId %d"TENDSTR),
+                       tags->objectId, oh->parentObjectId, obj->parent->objectId));
+
+       if (tags->objectId > 1 && oh->name[0] == 0) /* Null name */
+               T(YAFFS_TRACE_VERIFY,
+                       (TSTR("Obj %d header name is NULL"TENDSTR),
+                       obj->objectId));
+
+       if (tags->objectId > 1 && ((__u8)(oh->name[0])) == 0xff) /* Trashed name */
+               T(YAFFS_TRACE_VERIFY,
+                       (TSTR("Obj %d header name is 0xFF"TENDSTR),
+                       obj->objectId));
+}
+
+
+#if 0
+/* Not being used, but don't want to throw away yet */
+int yaffs_VerifyTnodeWorker(yaffs_Object *obj, yaffs_Tnode *tn,
+                                       __u32 level, int chunkOffset)
+{
+       int i;
+       yaffs_Device *dev = obj->myDev;
+       int ok = 1;
+
+       if (tn) {
+               if (level > 0) {
+
+                       for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++) {
+                               if (tn->internal[i]) {
+                                       ok = yaffs_VerifyTnodeWorker(obj,
+                                                       tn->internal[i],
+                                                       level - 1,
+                                                       (chunkOffset<<YAFFS_TNODES_INTERNAL_BITS) + i);
+                               }
+                       }
+               } else if (level == 0) {
+                       yaffs_ExtendedTags tags;
+                       __u32 objectId = obj->objectId;
+
+                       chunkOffset <<=  YAFFS_TNODES_LEVEL0_BITS;
+
+                       for (i = 0; i < YAFFS_NTNODES_LEVEL0; i++) {
+                               __u32 theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
+
+                               if (theChunk > 0) {
+                                       /* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),tags.objectId,tags.chunkId,theChunk)); */
+                                       yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL, &tags);
+                                       if (tags.objectId != objectId || tags.chunkId != chunkOffset) {
+                                               T(~0, (TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
+                                                       objectId, chunkOffset, theChunk,
+                                                       tags.objectId, tags.chunkId));
+                                       }
+                               }
+                               chunkOffset++;
+                       }
+               }
+       }
+
+       return ok;
+
+}
+
+#endif
+
+void yaffs_VerifyFile(yaffs_Object *obj)
+{
+       int requiredTallness;
+       int actualTallness;
+       __u32 lastChunk;
+       __u32 x;
+       __u32 i;
+       yaffs_Device *dev;
+       yaffs_ExtendedTags tags;
+       yaffs_Tnode *tn;
+       __u32 objectId;
+
+       if (!obj)
+               return;
+
+       if (yaffs_SkipVerification(obj->myDev))
+               return;
+
+       dev = obj->myDev;
+       objectId = obj->objectId;
+
+       /* Check file size is consistent with tnode depth */
+       lastChunk =  obj->variant.fileVariant.fileSize / dev->nDataBytesPerChunk + 1;
+       x = lastChunk >> YAFFS_TNODES_LEVEL0_BITS;
+       requiredTallness = 0;
+       while (x > 0) {
+               x >>= YAFFS_TNODES_INTERNAL_BITS;
+               requiredTallness++;
+       }
+
+       actualTallness = obj->variant.fileVariant.topLevel;
+
+       /* Check that the chunks in the tnode tree are all correct.
+        * We do this by scanning through the tnode tree and
+        * checking the tags for every chunk match.
+        */
+
+       if (yaffs_SkipNANDVerification(dev))
+               return;
+
+       for (i = 1; i <= lastChunk; i++) {
+               tn = yaffs_FindLevel0Tnode(dev, &obj->variant.fileVariant, i);
+
+               if (tn) {
+                       __u32 theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
+                       if (theChunk > 0) {
+                               /* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),objectId,i,theChunk)); */
+                               yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL, &tags);
+                               if (tags.objectId != objectId || tags.chunkId != i) {
+                                       T(~0, (TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
+                                               objectId, i, theChunk,
+                                               tags.objectId, tags.chunkId));
+                               }
+                       }
+               }
+       }
+}
+
+
+void yaffs_VerifyHardLink(yaffs_Object *obj)
+{
+       if (obj && yaffs_SkipVerification(obj->myDev))
+               return;
+
+       /* Verify sane equivalent object */
+}
+
+void yaffs_VerifySymlink(yaffs_Object *obj)
+{
+       if (obj && yaffs_SkipVerification(obj->myDev))
+               return;
+
+       /* Verify symlink string */
+}
+
+void yaffs_VerifySpecial(yaffs_Object *obj)
+{
+       if (obj && yaffs_SkipVerification(obj->myDev))
+               return;
+}
+
+void yaffs_VerifyObject(yaffs_Object *obj)
+{
+       yaffs_Device *dev;
+
+       __u32 chunkMin;
+       __u32 chunkMax;
+
+       __u32 chunkIdOk;
+       __u32 chunkInRange;
+       __u32 chunkShouldNotBeDeleted;
+       __u32 chunkValid;
+
+       if (!obj)
+               return;
+
+       if (obj->beingCreated)
+               return;
+
+       dev = obj->myDev;
+
+       if (yaffs_SkipVerification(dev))
+               return;
+
+       /* Check sane object header chunk */
+
+       chunkMin = dev->internalStartBlock * dev->param.nChunksPerBlock;
+       chunkMax = (dev->internalEndBlock+1) * dev->param.nChunksPerBlock - 1;
+
+       chunkInRange = (((unsigned)(obj->hdrChunk)) >= chunkMin && ((unsigned)(obj->hdrChunk)) <= chunkMax);
+       chunkIdOk = chunkInRange || (obj->hdrChunk == 0);
+       chunkValid = chunkInRange &&
+                       yaffs_CheckChunkBit(dev,
+                                       obj->hdrChunk / dev->param.nChunksPerBlock,
+                                       obj->hdrChunk % dev->param.nChunksPerBlock);
+       chunkShouldNotBeDeleted = chunkInRange && !chunkValid;
+
+       if (!obj->fake &&
+                       (!chunkIdOk || chunkShouldNotBeDeleted)) {
+               T(YAFFS_TRACE_VERIFY,
+                       (TSTR("Obj %d has chunkId %d %s %s"TENDSTR),
+                       obj->objectId, obj->hdrChunk,
+                       chunkIdOk ? "" : ",out of range",
+                       chunkShouldNotBeDeleted ? ",marked as deleted" : ""));
+       }
+
+       if (chunkValid && !yaffs_SkipNANDVerification(dev)) {
+               yaffs_ExtendedTags tags;
+               yaffs_ObjectHeader *oh;
+               __u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
+
+               oh = (yaffs_ObjectHeader *)buffer;
+
+               yaffs_ReadChunkWithTagsFromNAND(dev, obj->hdrChunk, buffer,
+                               &tags);
+
+               yaffs_VerifyObjectHeader(obj, oh, &tags, 1);
+
+               yaffs_ReleaseTempBuffer(dev, buffer, __LINE__);
+       }
+
+       /* Verify it has a parent */
+       if (obj && !obj->fake &&
+                       (!obj->parent || obj->parent->myDev != dev)) {
+               T(YAFFS_TRACE_VERIFY,
+                       (TSTR("Obj %d has parent pointer %p which does not look like an object"TENDSTR),
+                       obj->objectId, obj->parent));
+       }
+
+       /* Verify parent is a directory */
+       if (obj->parent && obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
+               T(YAFFS_TRACE_VERIFY,
+                       (TSTR("Obj %d's parent is not a directory (type %d)"TENDSTR),
+                       obj->objectId, obj->parent->variantType));
+       }
+
+       switch (obj->variantType) {
+       case YAFFS_OBJECT_TYPE_FILE:
+               yaffs_VerifyFile(obj);
+               break;
+       case YAFFS_OBJECT_TYPE_SYMLINK:
+               yaffs_VerifySymlink(obj);
+               break;
+       case YAFFS_OBJECT_TYPE_DIRECTORY:
+               yaffs_VerifyDirectory(obj);
+               break;
+       case YAFFS_OBJECT_TYPE_HARDLINK:
+               yaffs_VerifyHardLink(obj);
+               break;
+       case YAFFS_OBJECT_TYPE_SPECIAL:
+               yaffs_VerifySpecial(obj);
+               break;
+       case YAFFS_OBJECT_TYPE_UNKNOWN:
+       default:
+               T(YAFFS_TRACE_VERIFY,
+               (TSTR("Obj %d has illegaltype %d"TENDSTR),
+               obj->objectId, obj->variantType));
+               break;
+       }
+}
+
+void yaffs_VerifyObjects(yaffs_Device *dev)
+{
+       yaffs_Object *obj;
+       int i;
+       struct ylist_head *lh;
+
+       if (yaffs_SkipVerification(dev))
+               return;
+
+       /* Iterate through the objects in each hash entry */
+
+       for (i = 0; i <  YAFFS_NOBJECT_BUCKETS; i++) {
+               ylist_for_each(lh, &dev->objectBucket[i].list) {
+                       if (lh) {
+                               obj = ylist_entry(lh, yaffs_Object, hashLink);
+                               yaffs_VerifyObject(obj);
+                       }
+               }
+       }
+}
+
+
+void yaffs_VerifyObjectInDirectory(yaffs_Object *obj)
+{
+       struct ylist_head *lh;
+       yaffs_Object *listObj;
+
+       int count = 0;
+
+       if (!obj) {
+               T(YAFFS_TRACE_ALWAYS, (TSTR("No object to verify" TENDSTR)));
+               YBUG();
+               return;
+       }
+
+       if (yaffs_SkipVerification(obj->myDev))
+               return;
+
+       if (!obj->parent) {
+               T(YAFFS_TRACE_ALWAYS, (TSTR("Object does not have parent" TENDSTR)));
+               YBUG();
+               return;
+       }
+
+       if (obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
+               T(YAFFS_TRACE_ALWAYS, (TSTR("Parent is not directory" TENDSTR)));
+               YBUG();
+       }
+
+       /* Iterate through the objects in each hash entry */
+
+       ylist_for_each(lh, &obj->parent->variant.directoryVariant.children) {
+               if (lh) {
+                       listObj = ylist_entry(lh, yaffs_Object, siblings);
+                       yaffs_VerifyObject(listObj);
+                       if (obj == listObj)
+                               count++;
+               }
+        }
+
+       if (count != 1) {
+               T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory %d times" TENDSTR), count));
+               YBUG();
+       }
+}
+
+void yaffs_VerifyDirectory(yaffs_Object *directory)
+{
+       struct ylist_head *lh;
+       yaffs_Object *listObj;
+
+       if (!directory) {
+               YBUG();
+               return;
+       }
+
+       if (yaffs_SkipFullVerification(directory->myDev))
+               return;
+
+       if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
+               T(YAFFS_TRACE_ALWAYS, (TSTR("Directory has wrong type: %d" TENDSTR), directory->variantType));
+               YBUG();
+       }
+
+       /* Iterate through the objects in each hash entry */
+
+       ylist_for_each(lh, &directory->variant.directoryVariant.children) {
+               if (lh) {
+                       listObj = ylist_entry(lh, yaffs_Object, siblings);
+                       if (listObj->parent != directory) {
+                               T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory list has wrong parent %p" TENDSTR), listObj->parent));
+                               YBUG();
+                       }
+                       yaffs_VerifyObjectInDirectory(listObj);
+               }
+       }
+}
+
+static int yaffs_freeVerificationFailures;
+
+void yaffs_VerifyFreeChunks(yaffs_Device *dev)
+{
+       int counted;
+       int difference;
+
+       if (yaffs_SkipVerification(dev))
+               return;
+
+       counted = yaffs_CountFreeChunks(dev);
+
+       difference = dev->nFreeChunks - counted;
+
+       if (difference) {
+               T(YAFFS_TRACE_ALWAYS,
+                 (TSTR("Freechunks verification failure %d %d %d" TENDSTR),
+                  dev->nFreeChunks, counted, difference));
+               yaffs_freeVerificationFailures++;
+       }
+}
+
+int yaffs_VerifyFileSanity(yaffs_Object *in)
+{
+#if 0
+       int chunk;
+       int nChunks;
+       int fSize;
+       int failed = 0;
+       int objId;
+       yaffs_Tnode *tn;
+       yaffs_Tags localTags;
+       yaffs_Tags *tags = &localTags;
+       int theChunk;
+       int chunkDeleted;
+
+       if (in->variantType != YAFFS_OBJECT_TYPE_FILE)
+               return YAFFS_FAIL;
+
+       objId = in->objectId;
+       fSize = in->variant.fileVariant.fileSize;
+       nChunks =
+           (fSize + in->myDev->nDataBytesPerChunk - 1) / in->myDev->nDataBytesPerChunk;
+
+       for (chunk = 1; chunk <= nChunks; chunk++) {
+               tn = yaffs_FindLevel0Tnode(in->myDev, &in->variant.fileVariant,
+                                          chunk);
+
+               if (tn) {
+
+                       theChunk = yaffs_GetChunkGroupBase(dev, tn, chunk);
+
+                       if (yaffs_CheckChunkBits
+                           (dev, theChunk / dev->param.nChunksPerBlock,
+                            theChunk % dev->param.nChunksPerBlock)) {
+
+                               yaffs_ReadChunkTagsFromNAND(in->myDev, theChunk,
+                                                           tags,
+                                                           &chunkDeleted);
+                               if (yaffs_TagsMatch
+                                   (tags, in->objectId, chunk, chunkDeleted)) {
+                                       /* found it; */
+
+                               }
+                       } else {
+
+                               failed = 1;
+                       }
+
+               } else {
+                       /* T(("No level 0 found for %d\n", chunk)); */
+               }
+       }
+
+       return failed ? YAFFS_FAIL : YAFFS_OK;
+#else
+       return YAFFS_OK;
+#endif
+}
diff --git a/yaffs_verify.h b/yaffs_verify.h
new file mode 100644 (file)
index 0000000..8a6f751
--- /dev/null
@@ -0,0 +1,39 @@
+/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2010 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef __YAFFS_VERIFY_H__
+#define __YAFFS_VERIFY_H__
+
+#include "yaffs_guts.h"
+
+void yaffs_VerifyBlock(yaffs_Device *dev, yaffs_BlockInfo *bi, int n);
+void yaffs_VerifyCollectedBlock(yaffs_Device *dev, yaffs_BlockInfo *bi, int n);
+void yaffs_VerifyBlocks(yaffs_Device *dev);
+
+void yaffs_VerifyObjectHeader(yaffs_Object *obj, yaffs_ObjectHeader *oh, yaffs_ExtendedTags *tags, int parentCheck);
+void yaffs_VerifyFile(yaffs_Object *obj);
+void yaffs_VerifyHardLink(yaffs_Object *obj);
+void yaffs_VerifySymlink(yaffs_Object *obj);
+void yaffs_VerifySpecial(yaffs_Object *obj);
+void yaffs_VerifyObject(yaffs_Object *obj);
+void yaffs_VerifyObjects(yaffs_Device *dev);
+void yaffs_VerifyObjectInDirectory(yaffs_Object *obj);
+void yaffs_VerifyDirectory(yaffs_Object *directory);
+void yaffs_VerifyFreeChunks(yaffs_Device *dev);
+
+int yaffs_VerifyFileSanity(yaffs_Object *obj);
+
+int yaffs_SkipVerification(yaffs_Device *dev);
+
+#endif
+
index faba028..40d9771 100644 (file)
 
 #define YAFFS_SMALL_HOLE_THRESHOLD 4
 
-void yaffs2_VerifyBlock(yaffs_Device *dev, yaffs_BlockInfo *bi, int n)
-{
-       if (!dev->param.isYaffs2)
-               return;
-
-       if((bi->blockState == YAFFS_BLOCK_STATE_ALLOCATING || bi->blockState == YAFFS_BLOCK_STATE_FULL) &&
-          (bi->sequenceNumber < YAFFS_LOWEST_SEQUENCE_NUMBER || bi->sequenceNumber > 10000000))
-               T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has suspect sequence number of %d"TENDSTR),
-               n, bi->sequenceNumber));
-}
 
 /*
  * Oldest Dirty Sequence Number handling.
index e26bbf4..67dc8f1 100644 (file)
@@ -33,6 +33,4 @@ int yaffs2_CheckpointRestore(yaffs_Device *dev);
 int yaffs2_HandleHole(yaffs_Object *obj, loff_t newSize);
 int yaffs2_ScanBackwards(yaffs_Device *dev);
 
-void yaffs2_VerifyBlock(yaffs_Device *dev, yaffs_BlockInfo *bi, int n);
-
 #endif