yaffs Improve hard link handling in yaffs direct

[yaffs2.git] / yaffs_yaffs2.c

diff --git a/yaffs_yaffs2.c b/yaffs_yaffs2.c
index 90646fd37ae2f5b44160d9aea964ec72ae0f579a..e13dd41c5272a23dfe8bebc452f76ac02d7641c1 100644 (file)
--- a/yaffs_yaffs2.c
+++ b/yaffs_yaffs2.c
@@ -20,6 +20,7 @@
 #include "yaffs_qsort.h"
 #include "yaffs_nand.h"
 #include "yaffs_getblockinfo.h"
+#include "yaffs_verify.h"
 
 /*
  * Checkpoints are really no benefit on very small partitions.
@@ -206,6 +207,7 @@ int yaffs2_CheckpointRequired(yaffs_Device *dev)
        nblocks = dev->internalEndBlock - dev->internalStartBlock + 1 ;
 
        return  !dev->param.skipCheckpointWrite &&
+               !dev->readOnly &&
                (nblocks >= YAFFS_CHECKPOINT_MIN_BLOCKS);
 }
 
@@ -1132,7 +1134,8 @@ int yaffs2_ScanBackwards(yaffs_Device *dev)
 
                        } else if (tags.objectId > YAFFS_MAX_OBJECT_ID ||
                                tags.chunkId > YAFFS_MAX_CHUNK_ID ||
-                               (tags.chunkId > 0 && tags.byteCount > dev->nDataBytesPerChunk)) {
+                               (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));
@@ -1313,7 +1316,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
@@ -1331,11 +1333,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;
 
@@ -1373,7 +1375,7 @@ int yaffs2_ScanBackwards(yaffs_Device *dev)
                                                        
 
 
-                                               yaffs_SetObjectName(in, oh->name);
+                                               yaffs_SetObjectNameFromOH(in, oh);
                                                parent =
                                                    yaffs_FindOrCreateObjectByNumber
                                                        (dev, oh->parentObjectId,