X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_yaffs2.c;h=b2fd8e47472fc545e31da2e7bfc82b846743e18c;hp=faba0280fbc9eb1f26e56bae8a29c1a8e253a233;hb=de6470acd795b2daab5372dd4a9edce3f186afea;hpb=780469359d1051ab37ab281b0520137d73fee2e9

diff --git a/yaffs_yaffs2.c b/yaffs_yaffs2.c
index faba028..b2fd8e4 100644
--- a/yaffs_yaffs2.c
+++ b/yaffs_yaffs2.c
@@ -31,16 +31,6 @@
 
 #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.
@@ -216,6 +206,7 @@ int yaffs2_CheckpointRequired(yaffs_Device *dev)
 	nblocks = dev->internalEndBlock - dev->internalStartBlock + 1 ;
 
 	return 	!dev->param.skipCheckpointWrite &&
+		!dev->readOnly &&
 		(nblocks >= YAFFS_CHECKPOINT_MIN_BLOCKS);
 }
 
@@ -1140,6 +1131,16 @@ int yaffs2_ScanBackwards(yaffs_Device *dev)
 
 				  dev->nFreeChunks++;
 
+			} else if (tags.objectId > YAFFS_MAX_OBJECT_ID ||
+				tags.chunkId > YAFFS_MAX_CHUNK_ID ||
+				(tags.chunkId > 0 && tags.byteCount > dev->nDataBytesPerChunk) ||
+				tags.sequenceNumber != bi->sequenceNumber ) {
+				T(YAFFS_TRACE_SCAN,
+				  (TSTR("Chunk (%d:%d) with bad tags:obj = %d, chunkId = %d, byteCount = %d, ignored"TENDSTR),
+				  blk, c,tags.objectId, tags.chunkId, tags.byteCount));
+
+				  dev->nFreeChunks++;
+
 			} else if (tags.chunkId > 0) {
 				/* chunkId > 0 so it is a data chunk... */
 				unsigned int endpos;
@@ -1314,7 +1315,6 @@ int yaffs2_ScanBackwards(yaffs_Device *dev)
 					in->valid = 1;
 
 					if (oh) {
-						in->variantType = oh->type;
 
 						in->yst_mode = oh->yst_mode;
 #ifdef CONFIG_YAFFS_WINCE
@@ -1332,11 +1332,11 @@ int yaffs2_ScanBackwards(yaffs_Device *dev)
 						in->yst_ctime = oh->yst_ctime;
 						in->yst_rdev = oh->yst_rdev;
 
+						in->lazyLoaded = 0;
+
 #endif
-					} else {
-						in->variantType = tags.extraObjectType;
+					} else
 						in->lazyLoaded = 1;
-					}
 
 					in->hdrChunk = chunk;
 
@@ -1374,7 +1374,7 @@ int yaffs2_ScanBackwards(yaffs_Device *dev)
 							
 
 
-						yaffs_SetObjectName(in, oh->name);
+						yaffs_SetObjectNameFromOH(in, oh);
 						parent =
 						    yaffs_FindOrCreateObjectByNumber
 							(dev, oh->parentObjectId,