yaffs Reactoring WIP
[yaffs2.git] / yaffs_guts.c
index d55aa95b91e450758bf54474e047f7766100515f..6efa94f57d268a8b4d2beddbcdb996eb20907024 100644 (file)
 #include "yaffs_getblockinfo.h"
 
 #include "yaffs_tagscompat.h"
-#ifndef CONFIG_YAFFS_USE_OWN_SORT
-#include "yaffs_qsort.h"
-#endif
+
 #include "yaffs_nand.h"
 
-#include "yaffs_checkptrw.h"
+#include "yaffs_yaffs1.h"
+#include "yaffs_yaffs2.h"
+#include "yaffs_bitmap.h"
 
 #include "yaffs_nand.h"
 #include "yaffs_packedtags2.h"
 
+#include "yaffs_nameval.h"
+#include "yaffs_allocator.h"
 
 /* Note YAFFS_GC_GOOD_ENOUGH must be <= YAFFS_GC_PASSIVE_THRESHOLD */
 #define YAFFS_GC_GOOD_ENOUGH 2
 #define YAFFS_GC_PASSIVE_THRESHOLD 4
 
-#define YAFFS_SMALL_HOLE_THRESHOLD 3
-
-/*
- * Checkpoints are really no benefit on very small partitions.
- *
- * To save space on small partitions don't bother with checkpoints unless
- * the partition is at least this big.
- */
-#define YAFFS_CHECKPOINT_MIN_BLOCKS 60
-
 #include "yaffs_ecc.h"
 
 
+
 /* Robustification (if it ever comes about...) */
 static void yaffs_RetireBlock(yaffs_Device *dev, int blockInNAND);
 static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND,
@@ -62,21 +55,18 @@ static void yaffs_UpdateParent(yaffs_Object *obj);
 static int yaffs_UnlinkObject(yaffs_Object *obj);
 static int yaffs_ObjectHasCachedWriteData(yaffs_Object *obj);
 
-static void yaffs_HardlinkFixup(yaffs_Device *dev, yaffs_Object *hardList);
-
 static int yaffs_WriteNewChunkWithTagsToNAND(yaffs_Device *dev,
                                        const __u8 *buffer,
                                        yaffs_ExtendedTags *tags,
                                        int useReserve);
-static int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode,
-                               int chunkInNAND, int inScan);
+
 
 static yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev, int number,
                                        yaffs_ObjectType type);
-static void yaffs_AddObjectToDirectory(yaffs_Object *directory,
-                               yaffs_Object *obj);
-static int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name,
-                               int force, int isShrink, int shadows);
+
+
+static int yaffs_ApplyXMod(yaffs_Device *dev, char *buffer, yaffs_XAttrMod *xmod);
+
 static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj);
 static int yaffs_CheckStructures(void);
 static int yaffs_DoGenericObjectDeletion(yaffs_Object *in);
@@ -95,8 +85,6 @@ static int yaffs_TagsMatch(const yaffs_ExtendedTags *tags, int objectId,
 static int yaffs_AllocateChunk(yaffs_Device *dev, int useReserve,
                                yaffs_BlockInfo **blockUsedPtr);
 
-static void yaffs_VerifyFreeChunks(yaffs_Device *dev);
-
 static void yaffs_CheckObjectDetailsLoaded(yaffs_Object *in);
 
 static void yaffs_VerifyDirectory(yaffs_Object *directory);
@@ -109,8 +97,6 @@ static int yaffs_CheckFileSanity(yaffs_Object *in);
 static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in);
 static void yaffs_InvalidateChunkCache(yaffs_Object *object, int chunkId);
 
-static void yaffs_InvalidateCheckpoint(yaffs_Device *dev);
-
 static int yaffs_FindChunkInFile(yaffs_Object *in, int chunkInInode,
                                yaffs_ExtendedTags *tags);
 
@@ -120,8 +106,6 @@ static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev,
                                        yaffs_FileStructure *fStruct,
                                        __u32 chunkId);
 
-static int yaffs_HandleHole(yaffs_Object *obj, loff_t newSize);
-static void yaffs_SkipRestOfBlock(yaffs_Device *dev);
 static int yaffs_VerifyChunkWritten(yaffs_Device *dev,
                                        int chunkInNAND,
                                        const __u8 *data,
@@ -313,98 +297,6 @@ int yaffs_IsManagedTempBuffer(yaffs_Device *dev, const __u8 *buffer)
        return 0;
 }
 
-
-
-/*
- * Chunk bitmap manipulations
- */
-
-static Y_INLINE __u8 *yaffs_BlockBits(yaffs_Device *dev, int blk)
-{
-       if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
-               T(YAFFS_TRACE_ERROR,
-                       (TSTR("**>> yaffs: BlockBits block %d is not valid" TENDSTR),
-                       blk));
-               YBUG();
-       }
-       return dev->chunkBits +
-               (dev->chunkBitmapStride * (blk - dev->internalStartBlock));
-}
-
-static Y_INLINE void yaffs_VerifyChunkBitId(yaffs_Device *dev, int blk, int chunk)
-{
-       if (blk < dev->internalStartBlock || blk > dev->internalEndBlock ||
-                       chunk < 0 || chunk >= dev->param.nChunksPerBlock) {
-               T(YAFFS_TRACE_ERROR,
-               (TSTR("**>> yaffs: Chunk Id (%d:%d) invalid"TENDSTR),
-                       blk, chunk));
-               YBUG();
-       }
-}
-
-static Y_INLINE void yaffs_ClearChunkBits(yaffs_Device *dev, int blk)
-{
-       __u8 *blkBits = yaffs_BlockBits(dev, blk);
-
-       memset(blkBits, 0, dev->chunkBitmapStride);
-}
-
-static Y_INLINE void yaffs_ClearChunkBit(yaffs_Device *dev, int blk, int chunk)
-{
-       __u8 *blkBits = yaffs_BlockBits(dev, blk);
-
-       yaffs_VerifyChunkBitId(dev, blk, chunk);
-
-       blkBits[chunk / 8] &= ~(1 << (chunk & 7));
-}
-
-static Y_INLINE void yaffs_SetChunkBit(yaffs_Device *dev, int blk, int chunk)
-{
-       __u8 *blkBits = yaffs_BlockBits(dev, blk);
-
-       yaffs_VerifyChunkBitId(dev, blk, chunk);
-
-       blkBits[chunk / 8] |= (1 << (chunk & 7));
-}
-
-static Y_INLINE int yaffs_CheckChunkBit(yaffs_Device *dev, int blk, int chunk)
-{
-       __u8 *blkBits = yaffs_BlockBits(dev, blk);
-       yaffs_VerifyChunkBitId(dev, blk, chunk);
-
-       return (blkBits[chunk / 8] & (1 << (chunk & 7))) ? 1 : 0;
-}
-
-static Y_INLINE int yaffs_StillSomeChunkBits(yaffs_Device *dev, int blk)
-{
-       __u8 *blkBits = yaffs_BlockBits(dev, blk);
-       int i;
-       for (i = 0; i < dev->chunkBitmapStride; i++) {
-               if (*blkBits)
-                       return 1;
-               blkBits++;
-       }
-       return 0;
-}
-
-static int yaffs_CountChunkBits(yaffs_Device *dev, int blk)
-{
-       __u8 *blkBits = yaffs_BlockBits(dev, blk);
-       int i;
-       int n = 0;
-       for (i = 0; i < dev->chunkBitmapStride; i++) {
-               __u8 x = *blkBits;
-               while (x) {
-                       if (x & 1)
-                               n++;
-                       x >>= 1;
-               }
-
-               blkBits++;
-       }
-       return n;
-}
-
 /*
  * Verification code
  */
@@ -440,6 +332,7 @@ static const char *blockStateName[] = {
 "Dead"
 };
 
+
 static void yaffs_VerifyBlock(yaffs_Device *dev, yaffs_BlockInfo *bi, int n)
 {
        int actuallyUsed;
@@ -480,13 +373,12 @@ static void yaffs_VerifyBlock(yaffs_Device *dev, yaffs_BlockInfo *bi, int n)
        /* Check that the sequence number is valid.
         * Ten million is legal, but is very unlikely
         */
-       if (dev->param.isYaffs2 &&
-          (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));
+
+        yaffs2_VerifyBlock(dev,bi,n);
 }
 
+
+
 static void yaffs_VerifyCollectedBlock(yaffs_Device *dev, yaffs_BlockInfo *bi,
                int n)
 {
@@ -502,7 +394,7 @@ static void yaffs_VerifyCollectedBlock(yaffs_Device *dev, yaffs_BlockInfo *bi,
        }
 }
 
-static void yaffs_VerifyBlocks(yaffs_Device *dev)
+void yaffs_VerifyBlocks(yaffs_Device *dev)
 {
        int i;
        int nBlocksPerState[YAFFS_NUMBER_OF_BLOCK_STATES];
@@ -843,7 +735,7 @@ static void yaffs_VerifyObject(yaffs_Object *obj)
        }
 }
 
-static void yaffs_VerifyObjects(yaffs_Device *dev)
+void yaffs_VerifyObjects(yaffs_Device *dev)
 {
        yaffs_Object *obj;
        int i;
@@ -963,7 +855,7 @@ static int yaffs_WriteNewChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev,
        int writeOk = 0;
        int chunk;
 
-       yaffs_InvalidateCheckpoint(dev);
+       yaffs2_InvalidateCheckpoint(dev);
 
        do {
                yaffs_BlockInfo *bi = 0;
@@ -1057,83 +949,6 @@ static int yaffs_WriteNewChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev,
 }
 
 
-/*
- * Oldest Dirty Sequence Number handling.
- */
-/* yaffs_CalcOldestDirtySequence()
- * yaffs_FindOldestDirtySequence()
- * Calculate the oldest dirty sequence number if we don't know it.
- */
-static void yaffs_CalcOldestDirtySequence(yaffs_Device *dev)
-{
-       int i;
-       unsigned seq;
-       unsigned blockNo = 0;
-       yaffs_BlockInfo *b;
-
-       if(!dev->param.isYaffs2)
-               return;
-
-       /* Find the oldest dirty sequence number. */
-       seq = dev->sequenceNumber + 1;
-       b = dev->blockInfo;
-       for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
-               if (b->blockState == YAFFS_BLOCK_STATE_FULL &&
-                       (b->pagesInUse - b->softDeletions) < dev->param.nChunksPerBlock &&
-                       b->sequenceNumber < seq) {
-                       seq = b->sequenceNumber;
-                       blockNo = i;
-               }
-               b++;
-       }
-
-       if(blockNo){
-               dev->oldestDirtySequence = seq;
-               dev->oldestDirtyBlock = blockNo;
-       }
-
-}
-
-
-static void yaffs_FindOldestDirtySequence(yaffs_Device *dev)
-{
-       if(dev->param.isYaffs2 && !dev->oldestDirtySequence)
-               yaffs_CalcOldestDirtySequence(dev);
-}
-
-/*
- * yaffs_ClearOldestDirtySequence()
- * Called when a block is erased or marked bad. (ie. when its sequenceNumber
- * becomes invalid). If the value matches the oldest then we clear 
- * dev->oldestDirtySequence to force its recomputation.
- */
-static void yaffs_ClearOldestDirtySequence(yaffs_Device *dev, yaffs_BlockInfo *bi)
-{
-
-       if(!dev->param.isYaffs2)
-               return;
-
-       if(!bi || bi->sequenceNumber == dev->oldestDirtySequence){
-               dev->oldestDirtySequence = 0;
-               dev->oldestDirtyBlock = 0;
-       }
-}
-
-/*
- * yaffs_UpdateOldestDirtySequence()
- * Update the oldest dirty sequence number whenever we dirty a block.
- * Only do this if the oldestDirtySequence is actually being tracked.
- */
-static void yaffs_UpdateOldestDirtySequence(yaffs_Device *dev, unsigned blockNo, yaffs_BlockInfo *bi)
-{
-       if(dev->param.isYaffs2 && dev->oldestDirtySequence){
-               if(dev->oldestDirtySequence > bi->sequenceNumber){
-                       dev->oldestDirtySequence = bi->sequenceNumber;
-                       dev->oldestDirtyBlock = blockNo;
-               }
-       }
-}
  
 /*
  * Block retiring for handling a broken block.
@@ -1143,9 +958,9 @@ static void yaffs_RetireBlock(yaffs_Device *dev, int blockInNAND)
 {
        yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockInNAND);
 
-       yaffs_InvalidateCheckpoint(dev);
+       yaffs2_InvalidateCheckpoint(dev);
        
-       yaffs_ClearOldestDirtySequence(dev,bi);
+       yaffs2_ClearOldestDirtySequence(dev,bi);
 
        if (yaffs_MarkBlockBad(dev, blockInNAND) != YAFFS_OK) {
                if (yaffs_EraseBlockInNAND(dev, blockInNAND) != YAFFS_OK) {
@@ -1260,7 +1075,7 @@ static __u16 yaffs_CalcNameSum(const YCHAR *name)
        return sum;
 }
 
-static void yaffs_SetObjectName(yaffs_Object *obj, const YCHAR *name)
+void yaffs_SetObjectName(yaffs_Object *obj, const YCHAR *name)
 {
 #ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM
        memset(obj->shortName, 0, sizeof(YCHAR) * (YAFFS_SHORT_NAME_LENGTH+1));
@@ -1279,194 +1094,33 @@ static void yaffs_SetObjectName(yaffs_Object *obj, const YCHAR *name)
  * in the tnode.
  */
 
-/* yaffs_CreateTnodes creates a bunch more tnodes and
- * adds them to the tnode free list.
- * Don't use this function directly
- */
-static Y_INLINE int yaffs_CalcTnodeSize(yaffs_Device *dev)
-{
-       int tnodeSize;
-       /* Calculate the tnode size in bytes for variable width tnode support.
-        * Must be a multiple of 32-bits  */
-       tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-
-       if (tnodeSize < sizeof(yaffs_Tnode))
-               tnodeSize = sizeof(yaffs_Tnode);
-       return tnodeSize;
-}
 
-static int yaffs_CreateTnodes(yaffs_Device *dev, int nTnodes)
+yaffs_Tnode *yaffs_GetTnode(yaffs_Device *dev)
 {
-       int i;
-       int tnodeSize = yaffs_CalcTnodeSize(dev);
-       yaffs_Tnode *newTnodes;
-       __u8 *mem;
-       yaffs_Tnode *curr;
-       yaffs_Tnode *next;
-       yaffs_TnodeList *tnl;
-
-       if (nTnodes < 1)
-               return YAFFS_OK;
-
-
-       /* make these things */
-
-       newTnodes = YMALLOC(nTnodes * tnodeSize);
-       mem = (__u8 *)newTnodes;
-
-       if (!newTnodes) {
-               T(YAFFS_TRACE_ERROR,
-                       (TSTR("yaffs: Could not allocate Tnodes" TENDSTR)));
-               return YAFFS_FAIL;
-       }
-
-       /* Hook them into the free list */
-#if 0
-       for (i = 0; i < nTnodes - 1; i++) {
-               newTnodes[i].internal[0] = &newTnodes[i + 1];
-#ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG
-               newTnodes[i].internal[YAFFS_NTNODES_INTERNAL] = (void *)1;
-#endif
-       }
-
-       newTnodes[nTnodes - 1].internal[0] = dev->freeTnodes;
-#ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG
-       newTnodes[nTnodes - 1].internal[YAFFS_NTNODES_INTERNAL] = (void *)1;
-#endif
-       dev->freeTnodes = newTnodes;
-#else
-       /* New hookup for wide tnodes */
-       for (i = 0; i < nTnodes - 1; i++) {
-               curr = (yaffs_Tnode *) &mem[i * tnodeSize];
-               next = (yaffs_Tnode *) &mem[(i+1) * tnodeSize];
-               curr->internal[0] = next;
-       }
-
-       curr = (yaffs_Tnode *) &mem[(nTnodes - 1) * tnodeSize];
-       curr->internal[0] = dev->freeTnodes;
-       dev->freeTnodes = (yaffs_Tnode *)mem;
-
-#endif
-
-
-       dev->nFreeTnodes += nTnodes;
-       dev->nTnodesCreated += nTnodes;
-
-       /* Now add this bunch of tnodes to a list for freeing up.
-        * NB If we can't add this to the management list it isn't fatal
-        * but it just means we can't free this bunch of tnodes later.
-        */
-
-       tnl = YMALLOC(sizeof(yaffs_TnodeList));
-       if (!tnl) {
-               T(YAFFS_TRACE_ERROR,
-                 (TSTR
-                  ("yaffs: Could not add tnodes to management list" TENDSTR)));
-                  return YAFFS_FAIL;
-       } else {
-               tnl->tnodes = newTnodes;
-               tnl->next = dev->allocatedTnodeList;
-               dev->allocatedTnodeList = tnl;
+       yaffs_Tnode *tn = yaffs_AllocateRawTnode(dev);
+       if (tn){
+               memset(tn, 0, dev->tnodeSize);
+               dev->nTnodes++;
        }
 
-       T(YAFFS_TRACE_ALLOCATE, (TSTR("yaffs: Tnodes added" TENDSTR)));
-
-       return YAFFS_OK;
-}
-
-/* GetTnode gets us a clean tnode. Tries to make allocate more if we run out */
-
-static yaffs_Tnode *yaffs_GetTnodeRaw(yaffs_Device *dev)
-{
-       yaffs_Tnode *tn = NULL;
-
-#ifdef CONFIG_YAFFS_VALGRIND_TEST
-       tn = YMALLOC(yaffs_CalcTnodeSize(dev));
-       if(tn)
-               dev->nTnodesCreated++;
-#else
-       /* If there are none left make more */
-       if (!dev->freeTnodes)
-               yaffs_CreateTnodes(dev, YAFFS_ALLOCATION_NTNODES);
-
-       if (dev->freeTnodes) {
-               tn = dev->freeTnodes;
-#ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG
-               if (tn->internal[YAFFS_NTNODES_INTERNAL] != (void *)1) {
-                       /* Hoosterman, this thing looks like it isn't in the list */
-                       T(YAFFS_TRACE_ALWAYS,
-                         (TSTR("yaffs: Tnode list bug 1" TENDSTR)));
-               }
-#endif
-               dev->freeTnodes = dev->freeTnodes->internal[0];
-               dev->nFreeTnodes--;
-       }
-#endif
        dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
 
        return tn;
 }
 
-static yaffs_Tnode *yaffs_GetTnode(yaffs_Device *dev)
-{
-       yaffs_Tnode *tn = yaffs_GetTnodeRaw(dev);
-       int tnodeSize = yaffs_CalcTnodeSize(dev);
-
-       if (tn)
-               memset(tn, 0, tnodeSize);
-
-       return tn;
-}
-
 /* FreeTnode frees up a tnode and puts it back on the free list */
 static void yaffs_FreeTnode(yaffs_Device *dev, yaffs_Tnode *tn)
 {
-       if (tn) {
-#ifdef CONFIG_YAFFS_VALGRIND_TEST
-               YFREE(tn);
-               dev->nTnodesCreated--;
-#else
-#ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG
-               if (tn->internal[YAFFS_NTNODES_INTERNAL] != 0) {
-                       /* Hoosterman, this thing looks like it is already in the list */
-                       T(YAFFS_TRACE_ALWAYS,
-                         (TSTR("yaffs: Tnode list bug 2" TENDSTR)));
-               }
-               tn->internal[YAFFS_NTNODES_INTERNAL] = (void *)1;
-#endif
-               tn->internal[0] = dev->freeTnodes;
-               dev->freeTnodes = tn;
-               dev->nFreeTnodes++;
-#endif
-       }
+       yaffs_FreeRawTnode(dev,tn);
+       dev->nTnodes--;
        dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
 }
 
-static void yaffs_DeinitialiseTnodes(yaffs_Device *dev)
-{
-       /* Free the list of allocated tnodes */
-       yaffs_TnodeList *tmp;
-
-       while (dev->allocatedTnodeList) {
-               tmp = dev->allocatedTnodeList->next;
-
-               YFREE(dev->allocatedTnodeList->tnodes);
-               YFREE(dev->allocatedTnodeList);
-               dev->allocatedTnodeList = tmp;
-
-       }
-
-       dev->freeTnodes = NULL;
-       dev->nFreeTnodes = 0;
-       dev->nTnodesCreated = 0;
-}
-
-static void yaffs_InitialiseTnodes(yaffs_Device *dev)
+static void yaffs_DeinitialiseTnodesAndObjects(yaffs_Device *dev)
 {
-       dev->allocatedTnodeList = NULL;
-       dev->freeTnodes = NULL;
-       dev->nFreeTnodes = 0;
-       dev->nTnodesCreated = 0;
+       yaffs_DeinitialiseRawTnodesAndObjects(dev);
+       dev->nObjects = 0;
+       dev->nTnodes = 0;
 }
 
 
@@ -1591,7 +1245,7 @@ static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev,
  *  be plugged into the ttree.
  */
 
-static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device *dev,
+yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device *dev,
                                        yaffs_FileStructure *fStruct,
                                        __u32 chunkId,
                                        yaffs_Tnode *passedTn)
@@ -1822,7 +1476,7 @@ static void yaffs_SoftDeleteChunk(yaffs_Device *dev, int chunk)
        if (theBlock) {
                theBlock->softDeletions++;
                dev->nFreeChunks++;
-               yaffs_UpdateOldestDirtySequence(dev, blockNo, theBlock);
+               yaffs2_UpdateOldestDirtySequence(dev, blockNo, theBlock);
        }
 }
 
@@ -1950,7 +1604,7 @@ static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device *dev, yaffs_Tnode *tn,
                                        hasData++;
                        }
                } else {
-                       int tnodeSize_u32 = yaffs_CalcTnodeSize(dev)/sizeof(__u32);
+                       int tnodeSize_u32 = dev->tnodeSize/sizeof(__u32);
                        __u32 *map = (__u32 *)tn;
 
                         for(i = 0; !hasData && i < tnodeSize_u32; i++){
@@ -2015,96 +1669,32 @@ static int yaffs_PruneFileStructure(yaffs_Device *dev,
 
 /*-------------------- End of File Structure functions.-------------------*/
 
-/* yaffs_CreateFreeObjects creates a bunch more objects and
- * adds them to the object free list.
- */
-static int yaffs_CreateFreeObjects(yaffs_Device *dev, int nObjects)
-{
-       int i;
-       yaffs_Object *newObjects;
-       yaffs_ObjectList *list;
-
-       if (nObjects < 1)
-               return YAFFS_OK;
-
-       /* make these things */
-       newObjects = YMALLOC(nObjects * sizeof(yaffs_Object));
-       list = YMALLOC(sizeof(yaffs_ObjectList));
-
-       if (!newObjects || !list) {
-               if (newObjects){
-                       YFREE(newObjects);
-                       newObjects = NULL;
-               }
-               if (list){
-                       YFREE(list);
-                       list = NULL;
-               }
-               T(YAFFS_TRACE_ALLOCATE,
-                 (TSTR("yaffs: Could not allocate more objects" TENDSTR)));
-               return YAFFS_FAIL;
-       }
-
-       /* Hook them into the free list */
-       for (i = 0; i < nObjects - 1; i++) {
-               newObjects[i].siblings.next =
-                               (struct ylist_head *)(&newObjects[i + 1]);
-       }
-
-       newObjects[nObjects - 1].siblings.next = (void *)dev->freeObjects;
-       dev->freeObjects = newObjects;
-       dev->nFreeObjects += nObjects;
-       dev->nObjectsCreated += nObjects;
-
-       /* Now add this bunch of Objects to a list for freeing up. */
-
-       list->objects = newObjects;
-       list->next = dev->allocatedObjectList;
-       dev->allocatedObjectList = list;
-
-       return YAFFS_OK;
-}
-
 
 /* AllocateEmptyObject gets us a clean Object. Tries to make allocate more if we run out */
 static yaffs_Object *yaffs_AllocateEmptyObject(yaffs_Device *dev)
 {
-       yaffs_Object *tn = NULL;
+       yaffs_Object *obj = yaffs_AllocateRawObject(dev);
 
-#ifdef CONFIG_YAFFS_VALGRIND_TEST
-       tn = YMALLOC(sizeof(yaffs_Object));
-       if(tn)
-               dev->nObjectsCreated++;
-#else
-       /* If there are none left make more */
-       if (!dev->freeObjects)
-               yaffs_CreateFreeObjects(dev, YAFFS_ALLOCATION_NOBJECTS);
+       if (obj) {
+               dev->nObjects++;
 
-       if (dev->freeObjects) {
-               tn = dev->freeObjects;
-               dev->freeObjects =
-                       (yaffs_Object *) (dev->freeObjects->siblings.next);
-               dev->nFreeObjects--;
-       }
-#endif
-       if (tn) {
                /* Now sweeten it up... */
 
-               memset(tn, 0, sizeof(yaffs_Object));
-               tn->beingCreated = 1;
+               memset(obj, 0, sizeof(yaffs_Object));
+               obj->beingCreated = 1;
 
-               tn->myDev = dev;
-               tn->hdrChunk = 0;
-               tn->variantType = YAFFS_OBJECT_TYPE_UNKNOWN;
-               YINIT_LIST_HEAD(&(tn->hardLinks));
-               YINIT_LIST_HEAD(&(tn->hashLink));
-               YINIT_LIST_HEAD(&tn->siblings);
+               obj->myDev = dev;
+               obj->hdrChunk = 0;
+               obj->variantType = YAFFS_OBJECT_TYPE_UNKNOWN;
+               YINIT_LIST_HEAD(&(obj->hardLinks));
+               YINIT_LIST_HEAD(&(obj->hashLink));
+               YINIT_LIST_HEAD(&obj->siblings);
 
 
                /* Now make the directory sane */
                if (dev->rootDir) {
-                       tn->parent = dev->rootDir;
-                       ylist_add(&(tn->siblings), &dev->rootDir->variant.directoryVariant.children);
+                       obj->parent = dev->rootDir;
+                       ylist_add(&(obj->siblings), &dev->rootDir->variant.directoryVariant.children);
                }
 
                /* Add it to the lost and found directory.
@@ -2112,14 +1702,14 @@ static yaffs_Object *yaffs_AllocateEmptyObject(yaffs_Device *dev)
                 * check if lostNFound exists first
                 */
                if (dev->lostNFoundDir)
-                       yaffs_AddObjectToDirectory(dev->lostNFoundDir, tn);
+                       yaffs_AddObjectToDirectory(dev->lostNFoundDir, obj);
 
-               tn->beingCreated = 0;
+               obj->beingCreated = 0;
        }
 
        dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
 
-       return tn;
+       return obj;
 }
 
 static yaffs_Object *yaffs_CreateFakeDirectory(yaffs_Device *dev, int number,
@@ -2143,54 +1733,46 @@ static yaffs_Object *yaffs_CreateFakeDirectory(yaffs_Device *dev, int number,
 
 }
 
-static void yaffs_UnhashObject(yaffs_Object *tn)
+static void yaffs_UnhashObject(yaffs_Object *obj)
 {
        int bucket;
-       yaffs_Device *dev = tn->myDev;
+       yaffs_Device *dev = obj->myDev;
 
        /* If it is still linked into the bucket list, free from the list */
-       if (!ylist_empty(&tn->hashLink)) {
-               ylist_del_init(&tn->hashLink);
-               bucket = yaffs_HashFunction(tn->objectId);
+       if (!ylist_empty(&obj->hashLink)) {
+               ylist_del_init(&obj->hashLink);
+               bucket = yaffs_HashFunction(obj->objectId);
                dev->objectBucket[bucket].count--;
        }
 }
 
 /*  FreeObject frees up a Object and puts it back on the free list */
-static void yaffs_FreeObject(yaffs_Object *tn)
+static void yaffs_FreeObject(yaffs_Object *obj)
 {
-       yaffs_Device *dev = tn->myDev;
+       yaffs_Device *dev = obj->myDev;
 
-       T(YAFFS_TRACE_OS, (TSTR("FreeObject %p inode %p"TENDSTR), tn, tn->myInode));
+       T(YAFFS_TRACE_OS, (TSTR("FreeObject %p inode %p"TENDSTR), obj, obj->myInode));
 
-       if (!tn)
+       if (!obj)
                YBUG();
-       if (tn->parent)
+       if (obj->parent)
                YBUG();
-       if (!ylist_empty(&tn->siblings))
+       if (!ylist_empty(&obj->siblings))
                YBUG();
 
 
-       if (tn->myInode) {
+       if (obj->myInode) {
                /* We're still hooked up to a cached inode.
                 * Don't delete now, but mark for later deletion
                 */
-               tn->deferedFree = 1;
+               obj->deferedFree = 1;
                return;
        }
 
-       yaffs_UnhashObject(tn);
+       yaffs_UnhashObject(obj);
 
-#ifdef CONFIG_YAFFS_VALGRIND_TEST
-       YFREE(tn);
-       dev->nObjectsCreated--;
-       tn = NULL;
-#else
-       /* Link into the free list. */
-       tn->siblings.next = (struct ylist_head *)(dev->freeObjects);
-       dev->freeObjects = tn;
-       dev->nFreeObjects++;
-#endif
+       yaffs_FreeRawObject(dev,obj);
+       dev->nObjects--;
        dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
 }
 
@@ -2201,33 +1783,14 @@ void yaffs_HandleDeferedFree(yaffs_Object *obj)
                yaffs_FreeObject(obj);
 }
 
-
-static void yaffs_DeinitialiseObjects(yaffs_Device *dev)
-{
-       /* Free the list of allocated Objects */
-
-       yaffs_ObjectList *tmp;
-
-       while (dev->allocatedObjectList) {
-               tmp = dev->allocatedObjectList->next;
-               YFREE(dev->allocatedObjectList->objects);
-               YFREE(dev->allocatedObjectList);
-
-               dev->allocatedObjectList = tmp;
-       }
-
-       dev->freeObjects = NULL;
-       dev->nFreeObjects = 0;
-       dev->nObjectsCreated = 0;
-}
-
-static void yaffs_InitialiseObjects(yaffs_Device *dev)
+static void yaffs_InitialiseTnodesAndObjects(yaffs_Device *dev)
 {
        int i;
 
-       dev->allocatedObjectList = NULL;
-       dev->freeObjects = NULL;
-       dev->nFreeObjects = 0;
+       dev->nObjects = 0;
+       dev->nTnodes = 0;
+
+       yaffs_InitialiseRawTnodesAndObjects(dev);
 
        for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) {
                YINIT_LIST_HEAD(&dev->objectBucket[i].list);
@@ -2394,9 +1957,9 @@ yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev, int number,
        return theObject;
 }
 
-static yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device *dev,
-                                                     int number,
-                                                     yaffs_ObjectType type)
+yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device *dev,
+                                               int number,
+                                               yaffs_ObjectType type)
 {
        yaffs_Object *theObject = NULL;
 
@@ -2411,7 +1974,7 @@ static yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device *dev,
 }
 
 
-static YCHAR *yaffs_CloneString(const YCHAR *str)
+YCHAR *yaffs_CloneString(const YCHAR *str)
 {
        YCHAR *newStr = NULL;
        int len;
@@ -2519,7 +2082,7 @@ static yaffs_Object *yaffs_MknodObject(yaffs_ObjectType type,
                        break;
                }
 
-               if (yaffs_UpdateObjectHeader(in, name, 0, 0, 0) < 0) {
+               if (yaffs_UpdateObjectHeader(in, name, 0, 0, 0, NULL) < 0) {
                        /* Could not create the object header, fail the creation */
                        yaffs_DeleteObject(in);
                        in = NULL;
@@ -2627,7 +2190,7 @@ static int yaffs_ChangeObjectName(yaffs_Object *obj, yaffs_Object *newDir,
                        obj->unlinked = 1;
 
                /* If it is a deletion then we mark it as a shrink for gc purposes. */
-               if (yaffs_UpdateObjectHeader(obj, newName, 0, deleteOp, shadows) >= 0)
+               if (yaffs_UpdateObjectHeader(obj, newName, 0, deleteOp, shadows, NULL) >= 0)
                        return YAFFS_OK;
        }
 
@@ -2760,86 +2323,7 @@ static void yaffs_DeinitialiseBlocks(yaffs_Device *dev)
        dev->chunkBits = NULL;
 }
 
-static int yaffs_BlockNotDisqualifiedFromGC(yaffs_Device *dev,
-                                       yaffs_BlockInfo *bi)
-{
-
-       if (!dev->param.isYaffs2)
-               return 1;       /* disqualification only applies to yaffs2. */
-
-       if (!bi->hasShrinkHeader)
-               return 1;       /* can gc */
-
-       yaffs_FindOldestDirtySequence(dev);
-
-       /* Can't do gc of this block if there are any blocks older than this one that have
-        * discarded pages.
-        */
-       return (bi->sequenceNumber <= dev->oldestDirtySequence);
-}
-
-/*
- * yaffs_FindRefreshBlock()
- * periodically finds the oldest full block by sequence number for refreshing.
- * Only for yaffs2.
- */
-static __u32 yaffs_FindRefreshBlock(yaffs_Device *dev)
-{
-       __u32 b ;
-
-       __u32 oldest = 0;
-       __u32 oldestSequence = 0;
-
-       yaffs_BlockInfo *bi;
-
-       /*
-        * If refresh period < 10 then refreshing is disabled.
-        */
-       if(dev->param.refreshPeriod < 10 ||
-               !dev->param.isYaffs2)
-               return oldest;
-
-        /*
-         * Fix broken values.
-         */
-        if(dev->refreshSkip > dev->param.refreshPeriod)
-                dev->refreshSkip = dev->param.refreshPeriod;
-
-       if(dev->refreshSkip > 0)
-               return oldest;
-
-       /*
-        * Refresh skip is now zero.
-        * We'll do a refresh this time around....
-        * Update the refresh skip and find the oldest block.
-        */
-       dev->refreshSkip = dev->param.refreshPeriod;
-       dev->refreshCount++;
-       bi = dev->blockInfo;
-       for (b = dev->internalStartBlock; b <=dev->internalEndBlock; b++){
-
-               if (bi->blockState == YAFFS_BLOCK_STATE_FULL){
-
-                       if(oldest < 1 ||
-                                bi->sequenceNumber < oldestSequence){
-                                oldest = b;
-                                oldestSequence = bi->sequenceNumber;
-                        }
-               }
-               bi++;
-       }
-
-       if (oldest > 0) {
-               T(YAFFS_TRACE_GC,
-                 (TSTR("GC refresh count %d selected block %d with sequenceNumber %d" TENDSTR),
-                  dev->refreshCount, oldest, oldestSequence));
-       }
-
-       return oldest;
-}
-
-
-static void yaffs_BlockBecameDirty(yaffs_Device *dev, int blockNo)
+void yaffs_BlockBecameDirty(yaffs_Device *dev, int blockNo)
 {
        yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockNo);
 
@@ -2853,7 +2337,7 @@ static void yaffs_BlockBecameDirty(yaffs_Device *dev, int blockNo)
                (TSTR("yaffs_BlockBecameDirty block %d state %d %s"TENDSTR),
                blockNo, bi->blockState, (bi->needsRetiring) ? "needs retiring" : ""));
 
-       yaffs_ClearOldestDirtySequence(dev,bi);
+       yaffs2_ClearOldestDirtySequence(dev,bi);
 
        bi->blockState = YAFFS_BLOCK_STATE_DIRTY;
 
@@ -2868,7 +2352,7 @@ static void yaffs_BlockBecameDirty(yaffs_Device *dev, int blockNo)
        }
 
        if (!bi->needsRetiring) {
-               yaffs_InvalidateCheckpoint(dev);
+               yaffs2_InvalidateCheckpoint(dev);
                erasedOk = yaffs_EraseBlockInNAND(dev, blockNo);
                if (!erasedOk) {
                        dev->nErasureFailures++;
@@ -2963,61 +2447,17 @@ static int yaffs_FindBlockForAllocation(yaffs_Device *dev)
 }
 
 
-
-static int yaffs_CheckpointRequired(yaffs_Device *dev)
-{
-       int nblocks = dev->internalEndBlock - dev->internalStartBlock + 1 ;
-       return dev->param.isYaffs2 &&
-               !dev->param.skipCheckpointWrite &&
-               (nblocks >= YAFFS_CHECKPOINT_MIN_BLOCKS);
-}
-static int yaffs_CalcCheckpointBlocksRequired(yaffs_Device *dev)
-{
-       if (!dev->nCheckpointBlocksRequired &&
-               yaffs_CheckpointRequired(dev)){
-               /* Not a valid value so recalculate */
-               int nBytes = 0;
-               int nBlocks;
-               int devBlocks = (dev->param.endBlock - dev->param.startBlock + 1);
-               int tnodeSize = yaffs_CalcTnodeSize(dev);
-
-               nBytes += sizeof(yaffs_CheckpointValidity);
-               nBytes += sizeof(yaffs_CheckpointDevice);
-               nBytes += devBlocks * sizeof(yaffs_BlockInfo);
-               nBytes += devBlocks * dev->chunkBitmapStride;
-               nBytes += (sizeof(yaffs_CheckpointObject) + sizeof(__u32)) * (dev->nObjectsCreated - dev->nFreeObjects);
-               nBytes += (tnodeSize + sizeof(__u32)) * (dev->nTnodesCreated - dev->nFreeTnodes);
-               nBytes += sizeof(yaffs_CheckpointValidity);
-               nBytes += sizeof(__u32); /* checksum*/
-
-               /* Round up and add 2 blocks to allow for some bad blocks, so add 3 */
-
-               nBlocks = (nBytes/(dev->nDataBytesPerChunk * dev->param.nChunksPerBlock)) + 3;
-
-               dev->nCheckpointBlocksRequired = nBlocks;
-       }
-
-       return dev->nCheckpointBlocksRequired;
-}
-
-/*
- * Check if there's space to allocate...
- * Thinks.... do we need top make this ths same as yaffs_GetFreeChunks()?
- */
-static int yaffs_CheckSpaceForAllocation(yaffs_Device *dev, int nChunks)
+/*
+ * Check if there's space to allocate...
+ * Thinks.... do we need top make this ths same as yaffs_GetFreeChunks()?
+ */
+int yaffs_CheckSpaceForAllocation(yaffs_Device *dev, int nChunks)
 {
        int reservedChunks;
        int reservedBlocks = dev->param.nReservedBlocks;
        int checkpointBlocks;
 
-       if (dev->param.isYaffs2) {
-               checkpointBlocks =  yaffs_CalcCheckpointBlocksRequired(dev) -
-                                   dev->blocksInCheckpoint;
-               if (checkpointBlocks < 0)
-                       checkpointBlocks = 0;
-       } else {
-               checkpointBlocks = 0;
-       }
+       checkpointBlocks = yaffs2_CalcCheckpointBlocksRequired(dev);
 
        reservedChunks = ((reservedBlocks + checkpointBlocks) * dev->param.nChunksPerBlock);
 
@@ -3095,7 +2535,7 @@ static int yaffs_GetErasedChunks(yaffs_Device *dev)
  * yaffs_SkipRestOfBlock() skips over the rest of the allocation block
  * if we don't want to write to it.
  */
-static void yaffs_SkipRestOfBlock(yaffs_Device *dev)
+void yaffs_SkipRestOfBlock(yaffs_Device *dev)
 {
        if(dev->allocationBlock > 0){
                yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, dev->allocationBlock);
@@ -3404,7 +2844,7 @@ static unsigned yaffs_FindBlockForGarbageCollection(yaffs_Device *dev,
                        if (bi->gcPrioritise) {
                                prioritisedExists = 1;
                                if (bi->blockState == YAFFS_BLOCK_STATE_FULL &&
-                                  yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
+                                  yaffs2_BlockNotDisqualifiedFromGC(dev, bi)) {
                                        selected = i;
                                        prioritised = 1;
                                }
@@ -3470,7 +2910,7 @@ static unsigned yaffs_FindBlockForGarbageCollection(yaffs_Device *dev,
                        if (bi->blockState == YAFFS_BLOCK_STATE_FULL &&
                                pagesUsed < dev->param.nChunksPerBlock &&
                                (dev->gcDirtiest < 1 || pagesUsed < dev->gcPagesInUse) &&
-                               yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
+                               yaffs2_BlockNotDisqualifiedFromGC(dev, bi)) {
                                dev->gcDirtiest = dev->gcBlockFinder;
                                dev->gcPagesInUse = pagesUsed;
                        }
@@ -3487,7 +2927,7 @@ static unsigned yaffs_FindBlockForGarbageCollection(yaffs_Device *dev,
 
        if(!selected && dev->param.isYaffs2 &&
                dev->gcNotDone >= ( background ? 10 : 20)){
-               yaffs_FindOldestDirtySequence(dev);
+               yaffs2_FindOldestDirtySequence(dev);
                if(dev->oldestDirtyBlock > 0) {
                        selected = dev->oldestDirtyBlock;
                        dev->gcDirtiest = selected;
@@ -3562,9 +3002,7 @@ static int yaffs_CheckGarbageCollection(yaffs_Device *dev, int background)
        do {
                maxTries++;
 
-               checkpointBlockAdjust = yaffs_CalcCheckpointBlocksRequired(dev) - dev->blocksInCheckpoint;
-               if (checkpointBlockAdjust < 0)
-                       checkpointBlockAdjust = 0;
+               checkpointBlockAdjust = yaffs2_CalcCheckpointBlocksRequired(dev);
 
                minErased  = dev->param.nReservedBlocks + checkpointBlockAdjust + 1;
                erasedChunks = dev->nErasedBlocks * dev->param.nChunksPerBlock;
@@ -3590,7 +3028,7 @@ static int yaffs_CheckGarbageCollection(yaffs_Device *dev, int background)
                 /* If we don't already have a block being gc'd then see if we should start another */
 
                if (dev->gcBlock < 1 && !aggressive) {
-                       dev->gcBlock = yaffs_FindRefreshBlock(dev);
+                       dev->gcBlock = yaffs2_FindRefreshBlock(dev);
                        dev->gcChunk = 0;
                }
                if (dev->gcBlock < 1) {
@@ -3772,8 +3210,8 @@ static int yaffs_CheckFileSanity(yaffs_Object *in)
 
 #endif
 
-static int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode,
-                                 int chunkInNAND, int inScan)
+int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode,
+                               int chunkInNAND, int inScan)
 {
        /* NB inScan is zero unless scanning.
         * For forward scanning, inScan is > 0;
@@ -3829,7 +3267,7 @@ static int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode,
                 */
 
                if (existingChunk > 0) {
-                       /* NB Right now existing chunk will not be real chunkId if the device >= 32MB
+                       /* NB Right now existing chunk will not be real chunkId if the chunk group size > 1
                         *    thus we have to do a FindChunkInFile to get the real chunk id.
                         *
                         * We have a duplicate now we need to decide which one to use:
@@ -3871,8 +3309,7 @@ static int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode,
                        }
 
                        if ((inScan > 0) &&
-                           (in->myDev->param.isYaffs2 ||
-                            existingChunk <= 0 ||
+                           (existingChunk <= 0 ||
                             ((existingSerial + 1) & 3) == newSerial)) {
                                /* Forward scanning.
                                 * Use new
@@ -3942,13 +3379,13 @@ void yaffs_DeleteChunk(yaffs_Device *dev, int chunkId, int markNAND, int lyn)
 
        bi = yaffs_GetBlockInfo(dev, block);
        
-       yaffs_UpdateOldestDirtySequence(dev, block, bi);
+       yaffs2_UpdateOldestDirtySequence(dev, block, bi);
 
        T(YAFFS_TRACE_DELETION,
          (TSTR("line %d delete of chunk %d" TENDSTR), lyn, chunkId));
 
-       if (markNAND &&
-           bi->blockState != YAFFS_BLOCK_STATE_COLLECTING && !dev->param.isYaffs2) {
+       if (!dev->param.isYaffs2 && markNAND &&
+           bi->blockState != YAFFS_BLOCK_STATE_COLLECTING) {
 
                yaffs_InitialiseTags(&tags);
 
@@ -4048,7 +3485,7 @@ static int yaffs_WriteChunkDataToObject(yaffs_Object *in, int chunkInInode,
  * If name is not NULL, then that new name is used.
  */
 int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name, int force,
-                            int isShrink, int shadows)
+                            int isShrink, int shadows, yaffs_XAttrMod *xmod)
 {
 
        yaffs_BlockInfo *bi;
@@ -4074,7 +3511,7 @@ int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name, int force,
 
        if (!in->fake ||
                in == dev->rootDir || /* The rootDir should also be saved */
-               force) {
+               force  || xmod) {
 
                yaffs_CheckGarbageCollection(dev,0);
                yaffs_CheckObjectDetailsLoaded(in);
@@ -4091,9 +3528,9 @@ int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name, int force,
                        yaffs_VerifyObjectHeader(in, oh, &oldTags, 0);
 
                        memcpy(oldName, oh->name, sizeof(oh->name));
-               }
-
-               memset(buffer, 0xFF, dev->nDataBytesPerChunk);
+                       memset(buffer, 0xFF, sizeof(yaffs_ObjectHeader));
+               } else
+                       memset(buffer, 0xFF, dev->nDataBytesPerChunk);
 
                oh->type = in->variantType;
                oh->yst_mode = in->yst_mode;
@@ -4161,6 +3598,11 @@ int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name, int force,
                        break;
                }
 
+               /* process any xattrib modifications */
+               if(xmod)
+                       yaffs_ApplyXMod(dev, (char *)buffer, xmod);
+
+
                /* Tags */
                yaffs_InitialiseTags(&newTags);
                in->serial++;
@@ -4472,2730 +3914,975 @@ static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in)
        }
 }
 
-/*--------------------- Checkpointing --------------------*/
-
-
-static int yaffs_WriteCheckpointValidityMarker(yaffs_Device *dev, int head)
-{
-       yaffs_CheckpointValidity cp;
-
-       memset(&cp, 0, sizeof(cp));
-
-       cp.structType = sizeof(cp);
-       cp.magic = YAFFS_MAGIC;
-       cp.version = YAFFS_CHECKPOINT_VERSION;
-       cp.head = (head) ? 1 : 0;
 
-       return (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp)) ?
-               1 : 0;
-}
+/*--------------------- File read/write ------------------------
+ * Read and write have very similar structures.
+ * In general the read/write has three parts to it
+ * An incomplete chunk to start with (if the read/write is not chunk-aligned)
+ * Some complete chunks
+ * An incomplete chunk to end off with
+ *
+ * Curve-balls: the first chunk might also be the last chunk.
+ */
 
-static int yaffs_ReadCheckpointValidityMarker(yaffs_Device *dev, int head)
+int yaffs_ReadDataFromFile(yaffs_Object *in, __u8 *buffer, loff_t offset,
+                       int nBytes)
 {
-       yaffs_CheckpointValidity cp;
-       int ok;
 
-       ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
-
-       if (ok)
-               ok = (cp.structType == sizeof(cp)) &&
-                    (cp.magic == YAFFS_MAGIC) &&
-                    (cp.version == YAFFS_CHECKPOINT_VERSION) &&
-                    (cp.head == ((head) ? 1 : 0));
-       return ok ? 1 : 0;
-}
-
-static void yaffs_DeviceToCheckpointDevice(yaffs_CheckpointDevice *cp,
-                                          yaffs_Device *dev)
-{
-       cp->nErasedBlocks = dev->nErasedBlocks;
-       cp->allocationBlock = dev->allocationBlock;
-       cp->allocationPage = dev->allocationPage;
-       cp->nFreeChunks = dev->nFreeChunks;
+       int chunk;
+       __u32 start;
+       int nToCopy;
+       int n = nBytes;
+       int nDone = 0;
+       yaffs_ChunkCache *cache;
 
-       cp->nDeletedFiles = dev->nDeletedFiles;
-       cp->nUnlinkedFiles = dev->nUnlinkedFiles;
-       cp->nBackgroundDeletions = dev->nBackgroundDeletions;
-       cp->sequenceNumber = dev->sequenceNumber;
+       yaffs_Device *dev;
 
-}
+       dev = in->myDev;
 
-static void yaffs_CheckpointDeviceToDevice(yaffs_Device *dev,
-                                          yaffs_CheckpointDevice *cp)
-{
-       dev->nErasedBlocks = cp->nErasedBlocks;
-       dev->allocationBlock = cp->allocationBlock;
-       dev->allocationPage = cp->allocationPage;
-       dev->nFreeChunks = cp->nFreeChunks;
+       while (n > 0) {
+               /* chunk = offset / dev->nDataBytesPerChunk + 1; */
+               /* start = offset % dev->nDataBytesPerChunk; */
+               yaffs_AddrToChunk(dev, offset, &chunk, &start);
+               chunk++;
 
-       dev->nDeletedFiles = cp->nDeletedFiles;
-       dev->nUnlinkedFiles = cp->nUnlinkedFiles;
-       dev->nBackgroundDeletions = cp->nBackgroundDeletions;
-       dev->sequenceNumber = cp->sequenceNumber;
-}
+               /* OK now check for the curveball where the start and end are in
+                * the same chunk.
+                */
+               if ((start + n) < dev->nDataBytesPerChunk)
+                       nToCopy = n;
+               else
+                       nToCopy = dev->nDataBytesPerChunk - start;
 
+               cache = yaffs_FindChunkCache(in, chunk);
 
-static int yaffs_WriteCheckpointDevice(yaffs_Device *dev)
-{
-       yaffs_CheckpointDevice cp;
-       __u32 nBytes;
-       __u32 nBlocks = (dev->internalEndBlock - dev->internalStartBlock + 1);
+               /* If the chunk is already in the cache or it is less than a whole chunk
+                * or we're using inband tags then use the cache (if there is caching)
+                * else bypass the cache.
+                */
+               if (cache || nToCopy != dev->nDataBytesPerChunk || dev->param.inbandTags) {
+                       if (dev->param.nShortOpCaches > 0) {
 
-       int ok;
+                               /* If we can't find the data in the cache, then load it up. */
 
-       /* Write device runtime values*/
-       yaffs_DeviceToCheckpointDevice(&cp, dev);
-       cp.structType = sizeof(cp);
+                               if (!cache) {
+                                       cache = yaffs_GrabChunkCache(in->myDev);
+                                       cache->object = in;
+                                       cache->chunkId = chunk;
+                                       cache->dirty = 0;
+                                       cache->locked = 0;
+                                       yaffs_ReadChunkDataFromObject(in, chunk,
+                                                                     cache->
+                                                                     data);
+                                       cache->nBytes = 0;
+                               }
 
-       ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
+                               yaffs_UseChunkCache(dev, cache, 0);
 
-       /* Write block info */
-       if (ok) {
-               nBytes = nBlocks * sizeof(yaffs_BlockInfo);
-               ok = (yaffs_CheckpointWrite(dev, dev->blockInfo, nBytes) == nBytes);
-       }
+                               cache->locked = 1;
 
-       /* Write chunk bits */
-       if (ok) {
-               nBytes = nBlocks * dev->chunkBitmapStride;
-               ok = (yaffs_CheckpointWrite(dev, dev->chunkBits, nBytes) == nBytes);
-       }
-       return   ok ? 1 : 0;
 
-}
+                               memcpy(buffer, &cache->data[start], nToCopy);
 
-static int yaffs_ReadCheckpointDevice(yaffs_Device *dev)
-{
-       yaffs_CheckpointDevice cp;
-       __u32 nBytes;
-       __u32 nBlocks = (dev->internalEndBlock - dev->internalStartBlock + 1);
+                               cache->locked = 0;
+                       } else {
+                               /* Read into the local buffer then copy..*/
 
-       int ok;
+                               __u8 *localBuffer =
+                                   yaffs_GetTempBuffer(dev, __LINE__);
+                               yaffs_ReadChunkDataFromObject(in, chunk,
+                                                             localBuffer);
 
-       ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
-       if (!ok)
-               return 0;
+                               memcpy(buffer, &localBuffer[start], nToCopy);
 
-       if (cp.structType != sizeof(cp))
-               return 0;
 
+                               yaffs_ReleaseTempBuffer(dev, localBuffer,
+                                                       __LINE__);
+                       }
 
-       yaffs_CheckpointDeviceToDevice(dev, &cp);
+               } else {
 
-       nBytes = nBlocks * sizeof(yaffs_BlockInfo);
+                       /* A full chunk. Read directly into the supplied buffer. */
+                       yaffs_ReadChunkDataFromObject(in, chunk, buffer);
 
-       ok = (yaffs_CheckpointRead(dev, dev->blockInfo, nBytes) == nBytes);
+               }
 
-       if (!ok)
-               return 0;
-       nBytes = nBlocks * dev->chunkBitmapStride;
+               n -= nToCopy;
+               offset += nToCopy;
+               buffer += nToCopy;
+               nDone += nToCopy;
 
-       ok = (yaffs_CheckpointRead(dev, dev->chunkBits, nBytes) == nBytes);
+       }
 
-       return ok ? 1 : 0;
+       return nDone;
 }
 
-static void yaffs_ObjectToCheckpointObject(yaffs_CheckpointObject *cp,
-                                          yaffs_Object *obj)
+int yaffs_DoWriteDataToFile(yaffs_Object *in, const __u8 *buffer, loff_t offset,
+                       int nBytes, int writeThrough)
 {
 
-       cp->objectId = obj->objectId;
-       cp->parentId = (obj->parent) ? obj->parent->objectId : 0;
-       cp->hdrChunk = obj->hdrChunk;
-       cp->variantType = obj->variantType;
-       cp->deleted = obj->deleted;
-       cp->softDeleted = obj->softDeleted;
-       cp->unlinked = obj->unlinked;
-       cp->fake = obj->fake;
-       cp->renameAllowed = obj->renameAllowed;
-       cp->unlinkAllowed = obj->unlinkAllowed;
-       cp->serial = obj->serial;
-       cp->nDataChunks = obj->nDataChunks;
-
-       if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
-               cp->fileSizeOrEquivalentObjectId = obj->variant.fileVariant.fileSize;
-       else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
-               cp->fileSizeOrEquivalentObjectId = obj->variant.hardLinkVariant.equivalentObjectId;
-}
-
-static int yaffs_CheckpointObjectToObject(yaffs_Object *obj, yaffs_CheckpointObject *cp)
-{
+       int chunk;
+       __u32 start;
+       int nToCopy;
+       int n = nBytes;
+       int nDone = 0;
+       int nToWriteBack;
+       int startOfWrite = offset;
+       int chunkWritten = 0;
+       __u32 nBytesRead;
+       __u32 chunkStart;
 
-       yaffs_Object *parent;
+       yaffs_Device *dev;
 
-       if (obj->variantType != cp->variantType) {
-               T(YAFFS_TRACE_ERROR, (TSTR("Checkpoint read object %d type %d "
-                       TCONT("chunk %d does not match existing object type %d")
-                       TENDSTR), cp->objectId, cp->variantType, cp->hdrChunk,
-                       obj->variantType));
-               return 0;
-       }
+       dev = in->myDev;
 
-       obj->objectId = cp->objectId;
+       while (n > 0 && chunkWritten >= 0) {
+               yaffs_AddrToChunk(dev, offset, &chunk, &start);
 
-       if (cp->parentId)
-               parent = yaffs_FindOrCreateObjectByNumber(
-                                       obj->myDev,
-                                       cp->parentId,
-                                       YAFFS_OBJECT_TYPE_DIRECTORY);
-       else
-               parent = NULL;
-
-       if (parent) {
-               if (parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-                       T(YAFFS_TRACE_ALWAYS, (TSTR("Checkpoint read object %d parent %d type %d"
-                               TCONT(" chunk %d Parent type, %d, not directory")
-                               TENDSTR),
-                               cp->objectId, cp->parentId, cp->variantType,
-                               cp->hdrChunk, parent->variantType));
-                       return 0;
+               if (chunk * dev->nDataBytesPerChunk + start != offset ||
+                               start >= dev->nDataBytesPerChunk) {
+                       T(YAFFS_TRACE_ERROR, (
+                          TSTR("AddrToChunk of offset %d gives chunk %d start %d"
+                          TENDSTR),
+                          (int)offset, chunk, start));
                }
-               yaffs_AddObjectToDirectory(parent, obj);
-       }
+               chunk++; /* File pos to chunk in file offset */
 
-       obj->hdrChunk = cp->hdrChunk;
-       obj->variantType = cp->variantType;
-       obj->deleted = cp->deleted;
-       obj->softDeleted = cp->softDeleted;
-       obj->unlinked = cp->unlinked;
-       obj->fake = cp->fake;
-       obj->renameAllowed = cp->renameAllowed;
-       obj->unlinkAllowed = cp->unlinkAllowed;
-       obj->serial = cp->serial;
-       obj->nDataChunks = cp->nDataChunks;
+               /* OK now check for the curveball where the start and end are in
+                * the same chunk.
+                */
 
-       if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
-               obj->variant.fileVariant.fileSize = cp->fileSizeOrEquivalentObjectId;
-       else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
-               obj->variant.hardLinkVariant.equivalentObjectId = cp->fileSizeOrEquivalentObjectId;
+               if ((start + n) < dev->nDataBytesPerChunk) {
+                       nToCopy = n;
 
-       if (obj->hdrChunk > 0)
-               obj->lazyLoaded = 1;
-       return 1;
-}
+                       /* Now folks, to calculate how many bytes to write back....
+                        * If we're overwriting and not writing to then end of file then
+                        * we need to write back as much as was there before.
+                        */
 
+                       chunkStart = ((chunk - 1) * dev->nDataBytesPerChunk);
 
+                       if (chunkStart > in->variant.fileVariant.fileSize)
+                               nBytesRead = 0; /* Past end of file */
+                       else
+                               nBytesRead = in->variant.fileVariant.fileSize - chunkStart;
 
-static int yaffs_CheckpointTnodeWorker(yaffs_Object *in, yaffs_Tnode *tn,
-                                       __u32 level, int chunkOffset)
-{
-       int i;
-       yaffs_Device *dev = in->myDev;
-       int ok = 1;
-       int tnodeSize = yaffs_CalcTnodeSize(dev);
+                       if (nBytesRead > dev->nDataBytesPerChunk)
+                               nBytesRead = dev->nDataBytesPerChunk;
 
-       if (tn) {
-               if (level > 0) {
+                       nToWriteBack =
+                           (nBytesRead >
+                            (start + n)) ? nBytesRead : (start + n);
 
-                       for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++) {
-                               if (tn->internal[i]) {
-                                       ok = yaffs_CheckpointTnodeWorker(in,
-                                                       tn->internal[i],
-                                                       level - 1,
-                                                       (chunkOffset<<YAFFS_TNODES_INTERNAL_BITS) + i);
-                               }
-                       }
-               } else if (level == 0) {
-                       __u32 baseOffset = chunkOffset <<  YAFFS_TNODES_LEVEL0_BITS;
-                       ok = (yaffs_CheckpointWrite(dev, &baseOffset, sizeof(baseOffset)) == sizeof(baseOffset));
-                       if (ok)
-                               ok = (yaffs_CheckpointWrite(dev, tn, tnodeSize) == tnodeSize);
+                       if (nToWriteBack < 0 || nToWriteBack > dev->nDataBytesPerChunk)
+                               YBUG();
+
+               } else {
+                       nToCopy = dev->nDataBytesPerChunk - start;
+                       nToWriteBack = dev->nDataBytesPerChunk;
                }
-       }
 
-       return ok;
+               if (nToCopy != dev->nDataBytesPerChunk || dev->param.inbandTags) {
+                       /* An incomplete start or end chunk (or maybe both start and end chunk),
+                        * or we're using inband tags, so we want to use the cache buffers.
+                        */
+                       if (dev->param.nShortOpCaches > 0) {
+                               yaffs_ChunkCache *cache;
+                               /* If we can't find the data in the cache, then load the cache */
+                               cache = yaffs_FindChunkCache(in, chunk);
 
-}
+                               if (!cache
+                                   && yaffs_CheckSpaceForAllocation(dev, 1)) {
+                                       cache = yaffs_GrabChunkCache(dev);
+                                       cache->object = in;
+                                       cache->chunkId = chunk;
+                                       cache->dirty = 0;
+                                       cache->locked = 0;
+                                       yaffs_ReadChunkDataFromObject(in, chunk,
+                                                                     cache->data);
+                               } else if (cache &&
+                                       !cache->dirty &&
+                                       !yaffs_CheckSpaceForAllocation(dev, 1)) {
+                                       /* Drop the cache if it was a read cache item and
+                                        * no space check has been made for it.
+                                        */
+                                        cache = NULL;
+                               }
 
-static int yaffs_WriteCheckpointTnodes(yaffs_Object *obj)
-{
-       __u32 endMarker = ~0;
-       int ok = 1;
+                               if (cache) {
+                                       yaffs_UseChunkCache(dev, cache, 1);
+                                       cache->locked = 1;
 
-       if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
-               ok = yaffs_CheckpointTnodeWorker(obj,
-                                           obj->variant.fileVariant.top,
-                                           obj->variant.fileVariant.topLevel,
-                                           0);
-               if (ok)
-                       ok = (yaffs_CheckpointWrite(obj->myDev, &endMarker, sizeof(endMarker)) ==
-                               sizeof(endMarker));
-       }
 
-       return ok ? 1 : 0;
-}
+                                       memcpy(&cache->data[start], buffer,
+                                              nToCopy);
 
-static int yaffs_ReadCheckpointTnodes(yaffs_Object *obj)
-{
-       __u32 baseChunk;
-       int ok = 1;
-       yaffs_Device *dev = obj->myDev;
-       yaffs_FileStructure *fileStructPtr = &obj->variant.fileVariant;
-       yaffs_Tnode *tn;
-       int nread = 0;
-       int tnodeSize = yaffs_CalcTnodeSize(dev);
 
-       ok = (yaffs_CheckpointRead(dev, &baseChunk, sizeof(baseChunk)) == sizeof(baseChunk));
+                                       cache->locked = 0;
+                                       cache->nBytes = nToWriteBack;
 
-       while (ok && (~baseChunk)) {
-               nread++;
-               /* Read level 0 tnode */
+                                       if (writeThrough) {
+                                               chunkWritten =
+                                                   yaffs_WriteChunkDataToObject
+                                                   (cache->object,
+                                                    cache->chunkId,
+                                                    cache->data, cache->nBytes,
+                                                    1);
+                                               cache->dirty = 0;
+                                       }
 
+                               } else {
+                                       chunkWritten = -1;      /* fail the write */
+                               }
+                       } else {
+                               /* An incomplete start or end chunk (or maybe both start and end chunk)
+                                * Read into the local buffer then copy, then copy over and write back.
+                                */
 
-               tn = yaffs_GetTnodeRaw(dev);
-               if (tn)
-                       ok = (yaffs_CheckpointRead(dev, tn, tnodeSize) == tnodeSize);
-               else
-                       ok = 0;
+                               __u8 *localBuffer =
+                                   yaffs_GetTempBuffer(dev, __LINE__);
 
-               if (tn && ok)
-                       ok = yaffs_AddOrFindLevel0Tnode(dev,
-                                                       fileStructPtr,
-                                                       baseChunk,
-                                                       tn) ? 1 : 0;
+                               yaffs_ReadChunkDataFromObject(in, chunk,
+                                                             localBuffer);
 
-               if (ok)
-                       ok = (yaffs_CheckpointRead(dev, &baseChunk, sizeof(baseChunk)) == sizeof(baseChunk));
 
-       }
 
-       T(YAFFS_TRACE_CHECKPOINT, (
-               TSTR("Checkpoint read tnodes %d records, last %d. ok %d" TENDSTR),
-               nread, baseChunk, ok));
+                               memcpy(&localBuffer[start], buffer, nToCopy);
 
-       return ok ? 1 : 0;
-}
+                               chunkWritten =
+                                   yaffs_WriteChunkDataToObject(in, chunk,
+                                                                localBuffer,
+                                                                nToWriteBack,
+                                                                0);
 
+                               yaffs_ReleaseTempBuffer(dev, localBuffer,
+                                                       __LINE__);
 
-static int yaffs_WriteCheckpointObjects(yaffs_Device *dev)
-{
-       yaffs_Object *obj;
-       yaffs_CheckpointObject cp;
-       int i;
-       int ok = 1;
-       struct ylist_head *lh;
+                       }
 
+               } else {
+                       /* A full chunk. Write directly from the supplied buffer. */
 
-       /* Iterate through the objects in each hash entry,
-        * dumping them to the checkpointing stream.
-        */
 
-       for (i = 0; ok &&  i <  YAFFS_NOBJECT_BUCKETS; i++) {
-               ylist_for_each(lh, &dev->objectBucket[i].list) {
-                       if (lh) {
-                               obj = ylist_entry(lh, yaffs_Object, hashLink);
-                               if (!obj->deferedFree) {
-                                       yaffs_ObjectToCheckpointObject(&cp, obj);
-                                       cp.structType = sizeof(cp);
 
-                                       T(YAFFS_TRACE_CHECKPOINT, (
-                                               TSTR("Checkpoint write object %d parent %d type %d chunk %d obj addr %p" TENDSTR),
-                                               cp.objectId, cp.parentId, cp.variantType, cp.hdrChunk, obj));
+                       chunkWritten =
+                           yaffs_WriteChunkDataToObject(in, chunk, buffer,
+                                                        dev->nDataBytesPerChunk,
+                                                        0);
 
-                                       ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
+                       /* Since we've overwritten the cached data, we better invalidate it. */
+                       yaffs_InvalidateChunkCache(in, chunk);
+               }
 
-                                       if (ok && obj->variantType == YAFFS_OBJECT_TYPE_FILE)
-                                               ok = yaffs_WriteCheckpointTnodes(obj);
-                               }
-                       }
+               if (chunkWritten >= 0) {
+                       n -= nToCopy;
+                       offset += nToCopy;
+                       buffer += nToCopy;
+                       nDone += nToCopy;
                }
+
        }
 
-       /* Dump end of list */
-       memset(&cp, 0xFF, sizeof(yaffs_CheckpointObject));
-       cp.structType = sizeof(cp);
+       /* Update file object */
+
+       if ((startOfWrite + nDone) > in->variant.fileVariant.fileSize)
+               in->variant.fileVariant.fileSize = (startOfWrite + nDone);
 
-       if (ok)
-               ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
+       in->dirty = 1;
 
-       return ok ? 1 : 0;
+       return nDone;
 }
 
-static int yaffs_ReadCheckpointObjects(yaffs_Device *dev)
+int yaffs_WriteDataToFile(yaffs_Object *in, const __u8 *buffer, loff_t offset,
+                       int nBytes, int writeThrough)
 {
-       yaffs_Object *obj;
-       yaffs_CheckpointObject cp;
-       int ok = 1;
-       int done = 0;
-       yaffs_Object *hardList = NULL;
-
-       while (ok && !done) {
-               ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
-               if (cp.structType != sizeof(cp)) {
-                       T(YAFFS_TRACE_CHECKPOINT, (TSTR("struct size %d instead of %d ok %d"TENDSTR),
-                               cp.structType, (int)sizeof(cp), ok));
-                       ok = 0;
-               }
+       yaffs2_HandleHole(in,offset);
+       return yaffs_DoWriteDataToFile(in,buffer,offset,nBytes,writeThrough);
+}
 
-               T(YAFFS_TRACE_CHECKPOINT, (TSTR("Checkpoint read object %d parent %d type %d chunk %d " TENDSTR),
-                       cp.objectId, cp.parentId, cp.variantType, cp.hdrChunk));
-
-               if (ok && cp.objectId == ~0)
-                       done = 1;
-               else if (ok) {
-                       obj = yaffs_FindOrCreateObjectByNumber(dev, cp.objectId, cp.variantType);
-                       if (obj) {
-                               ok = yaffs_CheckpointObjectToObject(obj, &cp);
-                               if (!ok)
-                                       break;
-                               if (obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
-                                       ok = yaffs_ReadCheckpointTnodes(obj);
-                               } else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
-                                       obj->hardLinks.next =
-                                               (struct ylist_head *) hardList;
-                                       hardList = obj;
-                               }
-                       } else
-                               ok = 0;
-               }
-       }
 
-       if (ok)
-               yaffs_HardlinkFixup(dev, hardList);
 
-       return ok ? 1 : 0;
-}
+/* ---------------------- File resizing stuff ------------------ */
 
-static int yaffs_WriteCheckpointSum(yaffs_Device *dev)
+static void yaffs_PruneResizedChunks(yaffs_Object *in, int newSize)
 {
-       __u32 checkpointSum;
-       int ok;
 
-       yaffs_GetCheckpointSum(dev, &checkpointSum);
+       yaffs_Device *dev = in->myDev;
+       int oldFileSize = in->variant.fileVariant.fileSize;
 
-       ok = (yaffs_CheckpointWrite(dev, &checkpointSum, sizeof(checkpointSum)) == sizeof(checkpointSum));
+       int lastDel = 1 + (oldFileSize - 1) / dev->nDataBytesPerChunk;
 
-       if (!ok)
-               return 0;
+       int startDel = 1 + (newSize + dev->nDataBytesPerChunk - 1) /
+           dev->nDataBytesPerChunk;
+       int i;
+       int chunkId;
+
+       /* Delete backwards so that we don't end up with holes if
+        * power is lost part-way through the operation.
+        */
+       for (i = lastDel; i >= startDel; i--) {
+               /* NB this could be optimised somewhat,
+                * eg. could retrieve the tags and write them without
+                * using yaffs_DeleteChunk
+                */
+
+               chunkId = yaffs_FindAndDeleteChunkInFile(in, i, NULL);
+               if (chunkId > 0) {
+                       if (chunkId <
+                           (dev->internalStartBlock * dev->param.nChunksPerBlock)
+                           || chunkId >=
+                           ((dev->internalEndBlock +
+                             1) * dev->param.nChunksPerBlock)) {
+                               T(YAFFS_TRACE_ALWAYS,
+                                 (TSTR("Found daft chunkId %d for %d" TENDSTR),
+                                  chunkId, i));
+                       } else {
+                               in->nDataChunks--;
+                               yaffs_DeleteChunk(dev, chunkId, 1, __LINE__);
+                       }
+               }
+       }
 
-       return 1;
 }
 
-static int yaffs_ReadCheckpointSum(yaffs_Device *dev)
+
+void yaffs_ResizeDown( yaffs_Object *obj, loff_t newSize)
 {
-       __u32 checkpointSum0;
-       __u32 checkpointSum1;
-       int ok;
+       int newFullChunks;
+       __u32 newSizeOfPartialChunk;
+       yaffs_Device *dev = obj->myDev;
 
-       yaffs_GetCheckpointSum(dev, &checkpointSum0);
+       yaffs_AddrToChunk(dev, newSize, &newFullChunks, &newSizeOfPartialChunk);
 
-       ok = (yaffs_CheckpointRead(dev, &checkpointSum1, sizeof(checkpointSum1)) == sizeof(checkpointSum1));
+       yaffs_PruneResizedChunks(obj, newSize);
 
-       if (!ok)
-               return 0;
+       if (newSizeOfPartialChunk != 0) {
+               int lastChunk = 1 + newFullChunks;
+               __u8 *localBuffer = yaffs_GetTempBuffer(dev, __LINE__);
 
-       if (checkpointSum0 != checkpointSum1)
-               return 0;
+               /* Got to read and rewrite the last chunk with its new size and zero pad */
+               yaffs_ReadChunkDataFromObject(obj, lastChunk, localBuffer);
+               memset(localBuffer + newSizeOfPartialChunk, 0,
+                       dev->nDataBytesPerChunk - newSizeOfPartialChunk);
 
-       return 1;
+               yaffs_WriteChunkDataToObject(obj, lastChunk, localBuffer,
+                                            newSizeOfPartialChunk, 1);
+
+               yaffs_ReleaseTempBuffer(dev, localBuffer, __LINE__);
+       }
+
+       obj->variant.fileVariant.fileSize = newSize;
+
+       yaffs_PruneFileStructure(dev, &obj->variant.fileVariant);
 }
 
 
-static int yaffs_WriteCheckpointData(yaffs_Device *dev)
+int yaffs_ResizeFile(yaffs_Object *in, loff_t newSize)
 {
-       int ok = 1;
+       yaffs_Device *dev = in->myDev;
+       int oldFileSize = in->variant.fileVariant.fileSize;
 
-       if (!yaffs_CheckpointRequired(dev)) {
-               T(YAFFS_TRACE_CHECKPOINT, (TSTR("skipping checkpoint write" TENDSTR)));
-               ok = 0;
-       }
+       yaffs_FlushFilesChunkCache(in);
+       yaffs_InvalidateWholeChunkCache(in);
 
-       if (ok)
-               ok = yaffs_CheckpointOpen(dev, 1);
+       yaffs_CheckGarbageCollection(dev,0);
 
-       if (ok) {
-               T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint validity" TENDSTR)));
-               ok = yaffs_WriteCheckpointValidityMarker(dev, 1);
-       }
-       if (ok) {
-               T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint device" TENDSTR)));
-               ok = yaffs_WriteCheckpointDevice(dev);
-       }
-       if (ok) {
-               T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint objects" TENDSTR)));
-               ok = yaffs_WriteCheckpointObjects(dev);
-       }
-       if (ok) {
-               T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint validity" TENDSTR)));
-               ok = yaffs_WriteCheckpointValidityMarker(dev, 0);
-       }
+       if (in->variantType != YAFFS_OBJECT_TYPE_FILE)
+               return YAFFS_FAIL;
 
-       if (ok)
-               ok = yaffs_WriteCheckpointSum(dev);
+       if (newSize == oldFileSize)
+               return YAFFS_OK;
+               
+       if(newSize > oldFileSize){
+               yaffs2_HandleHole(in,newSize);
+               in->variant.fileVariant.fileSize = newSize;
+       } else {
+               /* newSize < oldFileSize */ 
+               yaffs_ResizeDown(in, newSize);
+       } 
 
-       if (!yaffs_CheckpointClose(dev))
-               ok = 0;
+       /* Write a new object header to reflect the resize.
+        * show we've shrunk the file, if need be
+        * Do this only if the file is not in the deleted directories
+        * and is not shadowed.
+        */
+       if (in->parent &&
+           !in->isShadowed &&
+           in->parent->objectId != YAFFS_OBJECTID_UNLINKED &&
+           in->parent->objectId != YAFFS_OBJECTID_DELETED)
+               yaffs_UpdateObjectHeader(in, NULL, 0, 0, 0, NULL);
 
-       if (ok)
-               dev->isCheckpointed = 1;
-       else
-               dev->isCheckpointed = 0;
 
-       return dev->isCheckpointed;
+       return YAFFS_OK;
 }
 
-static int yaffs_ReadCheckpointData(yaffs_Device *dev)
+loff_t yaffs_GetFileSize(yaffs_Object *obj)
 {
-       int ok = 1;
+       YCHAR *alias = NULL;
+       obj = yaffs_GetEquivalentObject(obj);
 
-       if (dev->param.skipCheckpointRead || !dev->param.isYaffs2) {
-               T(YAFFS_TRACE_CHECKPOINT, (TSTR("skipping checkpoint read" TENDSTR)));
-               ok = 0;
+       switch (obj->variantType) {
+       case YAFFS_OBJECT_TYPE_FILE:
+               return obj->variant.fileVariant.fileSize;
+       case YAFFS_OBJECT_TYPE_SYMLINK:
+               alias = obj->variant.symLinkVariant.alias;
+               if(!alias)
+                       return 0;
+               return yaffs_strnlen(alias,YAFFS_MAX_ALIAS_LENGTH);
+       default:
+               return 0;
        }
+}
 
-       if (ok)
-               ok = yaffs_CheckpointOpen(dev, 0); /* open for read */
 
-       if (ok) {
-               T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint validity" TENDSTR)));
-               ok = yaffs_ReadCheckpointValidityMarker(dev, 1);
-       }
-       if (ok) {
-               T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint device" TENDSTR)));
-               ok = yaffs_ReadCheckpointDevice(dev);
-       }
-       if (ok) {
-               T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint objects" TENDSTR)));
-               ok = yaffs_ReadCheckpointObjects(dev);
-       }
-       if (ok) {
-               T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint validity" TENDSTR)));
-               ok = yaffs_ReadCheckpointValidityMarker(dev, 0);
-       }
 
-       if (ok) {
-               ok = yaffs_ReadCheckpointSum(dev);
-               T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint checksum %d" TENDSTR), ok));
-       }
+int yaffs_FlushFile(yaffs_Object *in, int updateTime, int dataSync)
+{
+       int retVal;
+       if (in->dirty) {
+               yaffs_FlushFilesChunkCache(in);
+               if(dataSync) /* Only sync data */
+                       retVal=YAFFS_OK;
+               else {
+                       if (updateTime) {
+#ifdef CONFIG_YAFFS_WINCE
+                               yfsd_WinFileTimeNow(in->win_mtime);
+#else
 
-       if (!yaffs_CheckpointClose(dev))
-               ok = 0;
+                               in->yst_mtime = Y_CURRENT_TIME;
 
-       if (ok)
-               dev->isCheckpointed = 1;
-       else
-               dev->isCheckpointed = 0;
+#endif
+                       }
 
-       return ok ? 1 : 0;
+                       retVal = (yaffs_UpdateObjectHeader(in, NULL, 0, 0, 0, NULL) >=
+                               0) ? YAFFS_OK : YAFFS_FAIL;
+               }
+       } else {
+               retVal = YAFFS_OK;
+       }
 
-}
+       return retVal;
 
-static void yaffs_InvalidateCheckpoint(yaffs_Device *dev)
-{
-       if (dev->isCheckpointed ||
-                       dev->blocksInCheckpoint > 0) {
-               dev->isCheckpointed = 0;
-               yaffs_CheckpointInvalidateStream(dev);
-       }
-       if (dev->param.markSuperBlockDirty)
-               dev->param.markSuperBlockDirty(dev);
 }
 
-
-int yaffs_CheckpointSave(yaffs_Device *dev)
+static int yaffs_DoGenericObjectDeletion(yaffs_Object *in)
 {
 
-       T(YAFFS_TRACE_CHECKPOINT, (TSTR("save entry: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
+       /* First off, invalidate the file's data in the cache, without flushing. */
+       yaffs_InvalidateWholeChunkCache(in);
 
-       yaffs_VerifyObjects(dev);
-       yaffs_VerifyBlocks(dev);
-       yaffs_VerifyFreeChunks(dev);
+       if (in->myDev->param.isYaffs2 && (in->parent != in->myDev->deletedDir)) {
+               /* Move to the unlinked directory so we have a record that it was deleted. */
+               yaffs_ChangeObjectName(in, in->myDev->deletedDir, _Y("deleted"), 0, 0);
 
-       if (!dev->isCheckpointed) {
-               yaffs_InvalidateCheckpoint(dev);
-               yaffs_WriteCheckpointData(dev);
        }
 
-       T(YAFFS_TRACE_ALWAYS, (TSTR("save exit: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
+       yaffs_RemoveObjectFromDirectory(in);
+       yaffs_DeleteChunk(in->myDev, in->hdrChunk, 1, __LINE__);
+       in->hdrChunk = 0;
+
+       yaffs_FreeObject(in);
+       return YAFFS_OK;
 
-       return dev->isCheckpointed;
 }
 
-int yaffs_CheckpointRestore(yaffs_Device *dev)
+/* yaffs_DeleteFile deletes the whole file data
+ * and the inode associated with the file.
+ * It does not delete the links associated with the file.
+ */
+static int yaffs_UnlinkFileIfNeeded(yaffs_Object *in)
 {
-       int retval;
-       T(YAFFS_TRACE_CHECKPOINT, (TSTR("restore entry: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
 
-       retval = yaffs_ReadCheckpointData(dev);
+       int retVal;
+       int immediateDeletion = 0;
+       yaffs_Device *dev = in->myDev;
+
+       if (!in->myInode)
+               immediateDeletion = 1;
 
-       if (dev->isCheckpointed) {
-               yaffs_VerifyObjects(dev);
-               yaffs_VerifyBlocks(dev);
-               yaffs_VerifyFreeChunks(dev);
+       if (immediateDeletion) {
+               retVal =
+                   yaffs_ChangeObjectName(in, in->myDev->deletedDir,
+                                          _Y("deleted"), 0, 0);
+               T(YAFFS_TRACE_TRACING,
+                 (TSTR("yaffs: immediate deletion of file %d" TENDSTR),
+                  in->objectId));
+               in->deleted = 1;
+               in->myDev->nDeletedFiles++;
+               if (dev->param.disableSoftDelete || dev->param.isYaffs2)
+                       yaffs_ResizeFile(in, 0);
+               yaffs_SoftDeleteFile(in);
+       } else {
+               retVal =
+                   yaffs_ChangeObjectName(in, in->myDev->unlinkedDir,
+                                          _Y("unlinked"), 0, 0);
        }
 
-       T(YAFFS_TRACE_CHECKPOINT, (TSTR("restore exit: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
 
-       return retval;
+       return retVal;
 }
 
-/*--------------------- File read/write ------------------------
- * Read and write have very similar structures.
- * In general the read/write has three parts to it
- * An incomplete chunk to start with (if the read/write is not chunk-aligned)
- * Some complete chunks
- * An incomplete chunk to end off with
- *
- * Curve-balls: the first chunk might also be the last chunk.
- */
-
-int yaffs_ReadDataFromFile(yaffs_Object *in, __u8 *buffer, loff_t offset,
-                       int nBytes)
+int yaffs_DeleteFile(yaffs_Object *in)
 {
+       int retVal = YAFFS_OK;
+       int deleted; /* Need to cache value on stack if in is freed */
+       yaffs_Device *dev = in->myDev;
 
-       int chunk;
-       __u32 start;
-       int nToCopy;
-       int n = nBytes;
-       int nDone = 0;
-       yaffs_ChunkCache *cache;
-
-       yaffs_Device *dev;
-
-       dev = in->myDev;
-
-       while (n > 0) {
-               /* chunk = offset / dev->nDataBytesPerChunk + 1; */
-               /* start = offset % dev->nDataBytesPerChunk; */
-               yaffs_AddrToChunk(dev, offset, &chunk, &start);
-               chunk++;
-
-               /* OK now check for the curveball where the start and end are in
-                * the same chunk.
-                */
-               if ((start + n) < dev->nDataBytesPerChunk)
-                       nToCopy = n;
-               else
-                       nToCopy = dev->nDataBytesPerChunk - start;
-
-               cache = yaffs_FindChunkCache(in, chunk);
-
-               /* If the chunk is already in the cache or it is less than a whole chunk
-                * or we're using inband tags then use the cache (if there is caching)
-                * else bypass the cache.
-                */
-               if (cache || nToCopy != dev->nDataBytesPerChunk || dev->param.inbandTags) {
-                       if (dev->param.nShortOpCaches > 0) {
-
-                               /* If we can't find the data in the cache, then load it up. */
-
-                               if (!cache) {
-                                       cache = yaffs_GrabChunkCache(in->myDev);
-                                       cache->object = in;
-                                       cache->chunkId = chunk;
-                                       cache->dirty = 0;
-                                       cache->locked = 0;
-                                       yaffs_ReadChunkDataFromObject(in, chunk,
-                                                                     cache->
-                                                                     data);
-                                       cache->nBytes = 0;
-                               }
-
-                               yaffs_UseChunkCache(dev, cache, 0);
-
-                               cache->locked = 1;
-
-
-                               memcpy(buffer, &cache->data[start], nToCopy);
-
-                               cache->locked = 0;
-                       } else {
-                               /* Read into the local buffer then copy..*/
-
-                               __u8 *localBuffer =
-                                   yaffs_GetTempBuffer(dev, __LINE__);
-                               yaffs_ReadChunkDataFromObject(in, chunk,
-                                                             localBuffer);
-
-                               memcpy(buffer, &localBuffer[start], nToCopy);
-
-
-                               yaffs_ReleaseTempBuffer(dev, localBuffer,
-                                                       __LINE__);
-                       }
-
-               } else {
-
-                       /* A full chunk. Read directly into the supplied buffer. */
-                       yaffs_ReadChunkDataFromObject(in, chunk, buffer);
-
-               }
-
-               n -= nToCopy;
-               offset += nToCopy;
-               buffer += nToCopy;
-               nDone += nToCopy;
-
-       }
-
-       return nDone;
-}
-
-int yaffs_DoWriteDataToFile(yaffs_Object *in, const __u8 *buffer, loff_t offset,
-                       int nBytes, int writeThrough)
-{
-
-       int chunk;
-       __u32 start;
-       int nToCopy;
-       int n = nBytes;
-       int nDone = 0;
-       int nToWriteBack;
-       int startOfWrite = offset;
-       int chunkWritten = 0;
-       __u32 nBytesRead;
-       __u32 chunkStart;
-
-       yaffs_Device *dev;
-
-       dev = in->myDev;
-
-       while (n > 0 && chunkWritten >= 0) {
-               yaffs_AddrToChunk(dev, offset, &chunk, &start);
-
-               if (chunk * dev->nDataBytesPerChunk + start != offset ||
-                               start >= dev->nDataBytesPerChunk) {
-                       T(YAFFS_TRACE_ERROR, (
-                          TSTR("AddrToChunk of offset %d gives chunk %d start %d"
-                          TENDSTR),
-                          (int)offset, chunk, start));
-               }
-               chunk++; /* File pos to chunk in file offset */
-
-               /* OK now check for the curveball where the start and end are in
-                * the same chunk.
-                */
-
-               if ((start + n) < dev->nDataBytesPerChunk) {
-                       nToCopy = n;
-
-                       /* Now folks, to calculate how many bytes to write back....
-                        * If we're overwriting and not writing to then end of file then
-                        * we need to write back as much as was there before.
-                        */
-
-                       chunkStart = ((chunk - 1) * dev->nDataBytesPerChunk);
-
-                       if (chunkStart > in->variant.fileVariant.fileSize)
-                               nBytesRead = 0; /* Past end of file */
-                       else
-                               nBytesRead = in->variant.fileVariant.fileSize - chunkStart;
-
-                       if (nBytesRead > dev->nDataBytesPerChunk)
-                               nBytesRead = dev->nDataBytesPerChunk;
-
-                       nToWriteBack =
-                           (nBytesRead >
-                            (start + n)) ? nBytesRead : (start + n);
-
-                       if (nToWriteBack < 0 || nToWriteBack > dev->nDataBytesPerChunk)
-                               YBUG();
-
-               } else {
-                       nToCopy = dev->nDataBytesPerChunk - start;
-                       nToWriteBack = dev->nDataBytesPerChunk;
-               }
-
-               if (nToCopy != dev->nDataBytesPerChunk || dev->param.inbandTags) {
-                       /* An incomplete start or end chunk (or maybe both start and end chunk),
-                        * or we're using inband tags, so we want to use the cache buffers.
-                        */
-                       if (dev->param.nShortOpCaches > 0) {
-                               yaffs_ChunkCache *cache;
-                               /* If we can't find the data in the cache, then load the cache */
-                               cache = yaffs_FindChunkCache(in, chunk);
-
-                               if (!cache
-                                   && yaffs_CheckSpaceForAllocation(dev, 1)) {
-                                       cache = yaffs_GrabChunkCache(dev);
-                                       cache->object = in;
-                                       cache->chunkId = chunk;
-                                       cache->dirty = 0;
-                                       cache->locked = 0;
-                                       yaffs_ReadChunkDataFromObject(in, chunk,
-                                                                     cache->data);
-                               } else if (cache &&
-                                       !cache->dirty &&
-                                       !yaffs_CheckSpaceForAllocation(dev, 1)) {
-                                       /* Drop the cache if it was a read cache item and
-                                        * no space check has been made for it.
-                                        */
-                                        cache = NULL;
-                               }
-
-                               if (cache) {
-                                       yaffs_UseChunkCache(dev, cache, 1);
-                                       cache->locked = 1;
-
-
-                                       memcpy(&cache->data[start], buffer,
-                                              nToCopy);
-
-
-                                       cache->locked = 0;
-                                       cache->nBytes = nToWriteBack;
-
-                                       if (writeThrough) {
-                                               chunkWritten =
-                                                   yaffs_WriteChunkDataToObject
-                                                   (cache->object,
-                                                    cache->chunkId,
-                                                    cache->data, cache->nBytes,
-                                                    1);
-                                               cache->dirty = 0;
-                                       }
-
-                               } else {
-                                       chunkWritten = -1;      /* fail the write */
-                               }
-                       } else {
-                               /* An incomplete start or end chunk (or maybe both start and end chunk)
-                                * Read into the local buffer then copy, then copy over and write back.
-                                */
-
-                               __u8 *localBuffer =
-                                   yaffs_GetTempBuffer(dev, __LINE__);
-
-                               yaffs_ReadChunkDataFromObject(in, chunk,
-                                                             localBuffer);
-
-
-
-                               memcpy(&localBuffer[start], buffer, nToCopy);
-
-                               chunkWritten =
-                                   yaffs_WriteChunkDataToObject(in, chunk,
-                                                                localBuffer,
-                                                                nToWriteBack,
-                                                                0);
-
-                               yaffs_ReleaseTempBuffer(dev, localBuffer,
-                                                       __LINE__);
-
-                       }
-
-               } else {
-                       /* A full chunk. Write directly from the supplied buffer. */
-
-
-
-                       chunkWritten =
-                           yaffs_WriteChunkDataToObject(in, chunk, buffer,
-                                                        dev->nDataBytesPerChunk,
-                                                        0);
-
-                       /* Since we've overwritten the cached data, we better invalidate it. */
-                       yaffs_InvalidateChunkCache(in, chunk);
-               }
-
-               if (chunkWritten >= 0) {
-                       n -= nToCopy;
-                       offset += nToCopy;
-                       buffer += nToCopy;
-                       nDone += nToCopy;
-               }
-
-       }
-
-       /* Update file object */
-
-       if ((startOfWrite + nDone) > in->variant.fileVariant.fileSize)
-               in->variant.fileVariant.fileSize = (startOfWrite + nDone);
-
-       in->dirty = 1;
-
-       return nDone;
-}
-
-int yaffs_WriteDataToFile(yaffs_Object *in, const __u8 *buffer, loff_t offset,
-                       int nBytes, int writeThrough)
-{
-       yaffs_HandleHole(in,offset);
-       return yaffs_DoWriteDataToFile(in,buffer,offset,nBytes,writeThrough);
-}
-
-
-
-/* ---------------------- File resizing stuff ------------------ */
-
-static void yaffs_PruneResizedChunks(yaffs_Object *in, int newSize)
-{
-
-       yaffs_Device *dev = in->myDev;
-       int oldFileSize = in->variant.fileVariant.fileSize;
-
-       int lastDel = 1 + (oldFileSize - 1) / dev->nDataBytesPerChunk;
-
-       int startDel = 1 + (newSize + dev->nDataBytesPerChunk - 1) /
-           dev->nDataBytesPerChunk;
-       int i;
-       int chunkId;
-
-       /* Delete backwards so that we don't end up with holes if
-        * power is lost part-way through the operation.
-        */
-       for (i = lastDel; i >= startDel; i--) {
-               /* NB this could be optimised somewhat,
-                * eg. could retrieve the tags and write them without
-                * using yaffs_DeleteChunk
-                */
-
-               chunkId = yaffs_FindAndDeleteChunkInFile(in, i, NULL);
-               if (chunkId > 0) {
-                       if (chunkId <
-                           (dev->internalStartBlock * dev->param.nChunksPerBlock)
-                           || chunkId >=
-                           ((dev->internalEndBlock +
-                             1) * dev->param.nChunksPerBlock)) {
-                               T(YAFFS_TRACE_ALWAYS,
-                                 (TSTR("Found daft chunkId %d for %d" TENDSTR),
-                                  chunkId, i));
-                       } else {
-                               in->nDataChunks--;
-                               yaffs_DeleteChunk(dev, chunkId, 1, __LINE__);
-                       }
-               }
-       }
-
-}
-
-
-static void yaffs_ResizeDown( yaffs_Object *obj, loff_t newSize)
-{
-       int newFullChunks;
-       __u32 newSizeOfPartialChunk;
-       yaffs_Device *dev = obj->myDev;
-
-       yaffs_AddrToChunk(dev, newSize, &newFullChunks, &newSizeOfPartialChunk);
-
-       yaffs_PruneResizedChunks(obj, newSize);
-
-       if (newSizeOfPartialChunk != 0) {
-               int lastChunk = 1 + newFullChunks;
-               __u8 *localBuffer = yaffs_GetTempBuffer(dev, __LINE__);
-
-               /* Got to read and rewrite the last chunk with its new size and zero pad */
-               yaffs_ReadChunkDataFromObject(obj, lastChunk, localBuffer);
-               memset(localBuffer + newSizeOfPartialChunk, 0,
-                       dev->nDataBytesPerChunk - newSizeOfPartialChunk);
-
-               yaffs_WriteChunkDataToObject(obj, lastChunk, localBuffer,
-                                            newSizeOfPartialChunk, 1);
-
-               yaffs_ReleaseTempBuffer(dev, localBuffer, __LINE__);
-       }
-
-       obj->variant.fileVariant.fileSize = newSize;
-
-       yaffs_PruneFileStructure(dev, &obj->variant.fileVariant);
-}
-
-
-static int yaffs_HandleHole(yaffs_Object *obj, loff_t newSize)
-{
-       /* if newsSize > oldFileSize.
-        * We're going to be writing a hole.
-        * If the hole is small then write zeros otherwise write a start of hole marker.
-        */
-               
-
-       loff_t oldFileSize;
-       int increase;
-       int smallHole   ;
-       int result = YAFFS_OK;
-       yaffs_Device *dev = NULL;
-
-       __u8 *localBuffer = NULL;
-       
-       int smallIncreaseOk = 0;
-       
-       if(!obj)
-               return YAFFS_FAIL;
-
-       if(obj->variantType != YAFFS_OBJECT_TYPE_FILE)
-               return YAFFS_FAIL;
-       
-       dev = obj->myDev;
-       
-       /* Bail out if not yaffs2 mode */
-       if(!dev->param.isYaffs2)
-               return YAFFS_OK;
-
-       oldFileSize = obj->variant.fileVariant.fileSize;
-
-       if (newSize <= oldFileSize)
-               return YAFFS_OK;
-
-       increase = newSize - oldFileSize;
-
-       if(increase < YAFFS_SMALL_HOLE_THRESHOLD * dev->nDataBytesPerChunk &&
-               yaffs_CheckSpaceForAllocation(dev, YAFFS_SMALL_HOLE_THRESHOLD + 1))
-               smallHole = 1;
-       else
-               smallHole = 0;
-
-       if(smallHole)
-               localBuffer= yaffs_GetTempBuffer(dev, __LINE__);
-       
-       if(localBuffer){
-               /* fill hole with zero bytes */
-               int pos = oldFileSize;
-               int thisWrite;
-               int written;
-               memset(localBuffer,0,dev->nDataBytesPerChunk);
-               smallIncreaseOk = 1;
-
-               while(increase > 0 && smallIncreaseOk){
-                       thisWrite = increase;
-                       if(thisWrite > dev->nDataBytesPerChunk)
-                               thisWrite = dev->nDataBytesPerChunk;
-                       written = yaffs_DoWriteDataToFile(obj,localBuffer,pos,thisWrite,0);
-                       if(written == thisWrite){
-                               pos += thisWrite;
-                               increase -= thisWrite;
-                       } else
-                               smallIncreaseOk = 0;
-               }
-
-               yaffs_ReleaseTempBuffer(dev,localBuffer,__LINE__);
-
-               /* If we were out of space then reverse any chunks we've added */               
-               if(!smallIncreaseOk)
-                       yaffs_ResizeDown(obj, oldFileSize);
-       }
-       
-       if (!smallIncreaseOk &&
-               obj->parent &&
-               obj->parent->objectId != YAFFS_OBJECTID_UNLINKED &&
-               obj->parent->objectId != YAFFS_OBJECTID_DELETED){
-               /* Write a hole start header with the old file size */
-               yaffs_UpdateObjectHeader(obj, NULL, 0,1,0);
-       }
-
-       return result;
-
-}
-
-int yaffs_ResizeFile(yaffs_Object *in, loff_t newSize)
-{
-       yaffs_Device *dev = in->myDev;
-       int oldFileSize = in->variant.fileVariant.fileSize;
-
-       yaffs_FlushFilesChunkCache(in);
-       yaffs_InvalidateWholeChunkCache(in);
-
-       yaffs_CheckGarbageCollection(dev,0);
-
-       if (in->variantType != YAFFS_OBJECT_TYPE_FILE)
-               return YAFFS_FAIL;
-
-       if (newSize == oldFileSize)
-               return YAFFS_OK;
-               
-       if(newSize > oldFileSize){
-               yaffs_HandleHole(in,newSize);
-               in->variant.fileVariant.fileSize = newSize;
-       } else {
-               /* newSize < oldFileSize */ 
-               yaffs_ResizeDown(in, newSize);
-       } 
-
-       /* Write a new object header to reflect the resize.
-        * show we've shrunk the file, if need be
-        * Do this only if the file is not in the deleted directories
-        * and is not shadowed.
-        */
-       if (in->parent &&
-           !in->isShadowed &&
-           in->parent->objectId != YAFFS_OBJECTID_UNLINKED &&
-           in->parent->objectId != YAFFS_OBJECTID_DELETED)
-               yaffs_UpdateObjectHeader(in, NULL, 0,0,0);
-
-
-       return YAFFS_OK;
-}
-
-loff_t yaffs_GetFileSize(yaffs_Object *obj)
-{
-       YCHAR *alias = NULL;
-       obj = yaffs_GetEquivalentObject(obj);
-
-       switch (obj->variantType) {
-       case YAFFS_OBJECT_TYPE_FILE:
-               return obj->variant.fileVariant.fileSize;
-       case YAFFS_OBJECT_TYPE_SYMLINK:
-               alias = obj->variant.symLinkVariant.alias;
-               if(!alias)
-                       return 0;
-               return yaffs_strnlen(alias,YAFFS_MAX_ALIAS_LENGTH);
-       default:
-               return 0;
-       }
-}
-
-
-
-int yaffs_FlushFile(yaffs_Object *in, int updateTime, int dataSync)
-{
-       int retVal;
-       if (in->dirty) {
-               yaffs_FlushFilesChunkCache(in);
-               if(dataSync) /* Only sync data */
-                       retVal=YAFFS_OK;
-               else {
-                       if (updateTime) {
-#ifdef CONFIG_YAFFS_WINCE
-                               yfsd_WinFileTimeNow(in->win_mtime);
-#else
-
-                               in->yst_mtime = Y_CURRENT_TIME;
-
-#endif
-                       }
-
-                       retVal = (yaffs_UpdateObjectHeader(in, NULL, 0, 0, 0) >=
-                               0) ? YAFFS_OK : YAFFS_FAIL;
-               }
-       } else {
-               retVal = YAFFS_OK;
-       }
-
-       return retVal;
-
-}
-
-static int yaffs_DoGenericObjectDeletion(yaffs_Object *in)
-{
-
-       /* First off, invalidate the file's data in the cache, without flushing. */
-       yaffs_InvalidateWholeChunkCache(in);
-
-       if (in->myDev->param.isYaffs2 && (in->parent != in->myDev->deletedDir)) {
-               /* Move to the unlinked directory so we have a record that it was deleted. */
-               yaffs_ChangeObjectName(in, in->myDev->deletedDir, _Y("deleted"), 0, 0);
-
-       }
-
-       yaffs_RemoveObjectFromDirectory(in);
-       yaffs_DeleteChunk(in->myDev, in->hdrChunk, 1, __LINE__);
-       in->hdrChunk = 0;
-
-       yaffs_FreeObject(in);
-       return YAFFS_OK;
-
-}
-
-/* yaffs_DeleteFile deletes the whole file data
- * and the inode associated with the file.
- * It does not delete the links associated with the file.
- */
-static int yaffs_UnlinkFileIfNeeded(yaffs_Object *in)
-{
-
-       int retVal;
-       int immediateDeletion = 0;
-       yaffs_Device *dev = in->myDev;
-
-       if (!in->myInode)
-               immediateDeletion = 1;
-
-       if (immediateDeletion) {
-               retVal =
-                   yaffs_ChangeObjectName(in, in->myDev->deletedDir,
-                                          _Y("deleted"), 0, 0);
-               T(YAFFS_TRACE_TRACING,
-                 (TSTR("yaffs: immediate deletion of file %d" TENDSTR),
-                  in->objectId));
-               in->deleted = 1;
-               in->myDev->nDeletedFiles++;
-               if (dev->param.disableSoftDelete || dev->param.isYaffs2)
-                       yaffs_ResizeFile(in, 0);
-               yaffs_SoftDeleteFile(in);
-       } else {
-               retVal =
-                   yaffs_ChangeObjectName(in, in->myDev->unlinkedDir,
-                                          _Y("unlinked"), 0, 0);
-       }
-
-
-       return retVal;
-}
-
-int yaffs_DeleteFile(yaffs_Object *in)
-{
-       int retVal = YAFFS_OK;
-       int deleted = in->deleted;
-       yaffs_Device *dev = in->myDev;
-
-       if (dev->param.disableSoftDelete || dev->param.isYaffs2)
-               yaffs_ResizeFile(in, 0);
-
-       if (in->nDataChunks > 0) {
-               /* Use soft deletion if there is data in the file.
-                * That won't be the case if it has been resized to zero.
-                */
-               if (!in->unlinked)
-                       retVal = yaffs_UnlinkFileIfNeeded(in);
-
-               if (retVal == YAFFS_OK && in->unlinked && !in->deleted) {
-                       in->deleted = 1;
-                       deleted = 1;
-                       in->myDev->nDeletedFiles++;
-                       yaffs_SoftDeleteFile(in);
-               }
-               return deleted ? YAFFS_OK : YAFFS_FAIL;
-       } else {
-               /* The file has no data chunks so we toss it immediately */
-               yaffs_FreeTnode(in->myDev, in->variant.fileVariant.top);
-               in->variant.fileVariant.top = NULL;
-               yaffs_DoGenericObjectDeletion(in);
-
-               return YAFFS_OK;
-       }
-}
-
-static int yaffs_IsNonEmptyDirectory(yaffs_Object *obj)
-{
-       return (obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY) &&
-               !(ylist_empty(&obj->variant.directoryVariant.children));
-}
-
-static int yaffs_DeleteDirectory(yaffs_Object *obj)
-{
-       /* First check that the directory is empty. */
-       if (yaffs_IsNonEmptyDirectory(obj))
-               return YAFFS_FAIL;
-
-       return yaffs_DoGenericObjectDeletion(obj);
-}
-
-static int yaffs_DeleteSymLink(yaffs_Object *in)
-{
-       if(in->variant.symLinkVariant.alias)
-               YFREE(in->variant.symLinkVariant.alias);
-       in->variant.symLinkVariant.alias=NULL;
-
-       return yaffs_DoGenericObjectDeletion(in);
-}
-
-static int yaffs_DeleteHardLink(yaffs_Object *in)
-{
-       /* remove this hardlink from the list assocaited with the equivalent
-        * object
-        */
-       ylist_del_init(&in->hardLinks);
-       return yaffs_DoGenericObjectDeletion(in);
-}
-
-int yaffs_DeleteObject(yaffs_Object *obj)
-{
-int retVal = -1;
-       switch (obj->variantType) {
-       case YAFFS_OBJECT_TYPE_FILE:
-               retVal = yaffs_DeleteFile(obj);
-               break;
-       case YAFFS_OBJECT_TYPE_DIRECTORY:
-               if(!ylist_empty(&obj->variant.directoryVariant.dirty)){
-                       T(YAFFS_TRACE_BACKGROUND, (TSTR("Remove object %d from dirty directories" TENDSTR),obj->objectId));
-                       ylist_del_init(&obj->variant.directoryVariant.dirty);
-               }
-               return yaffs_DeleteDirectory(obj);
-               break;
-       case YAFFS_OBJECT_TYPE_SYMLINK:
-               retVal = yaffs_DeleteSymLink(obj);
-               break;
-       case YAFFS_OBJECT_TYPE_HARDLINK:
-               retVal = yaffs_DeleteHardLink(obj);
-               break;
-       case YAFFS_OBJECT_TYPE_SPECIAL:
-               retVal = yaffs_DoGenericObjectDeletion(obj);
-               break;
-       case YAFFS_OBJECT_TYPE_UNKNOWN:
-               retVal = 0;
-               break;          /* should not happen. */
-       }
-
-       return retVal;
-}
-
-static int yaffs_UnlinkWorker(yaffs_Object *obj)
-{
-
-       int immediateDeletion = 0;
-
-       if (!obj->myInode)
-               immediateDeletion = 1;
-
-       if(obj)
-               yaffs_UpdateParent(obj->parent);
-
-       if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
-               return yaffs_DeleteHardLink(obj);
-       } else if (!ylist_empty(&obj->hardLinks)) {
-               /* Curve ball: We're unlinking an object that has a hardlink.
-                *
-                * This problem arises because we are not strictly following
-                * The Linux link/inode model.
-                *
-                * We can't really delete the object.
-                * Instead, we do the following:
-                * - Select a hardlink.
-                * - Unhook it from the hard links
-                * - Move it from its parent directory (so that the rename can work)
-                * - Rename the object to the hardlink's name.
-                * - Delete the hardlink
-                */
-
-               yaffs_Object *hl;
-               yaffs_Object *parent;
-               int retVal;
-               YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];
-
-               hl = ylist_entry(obj->hardLinks.next, yaffs_Object, hardLinks);
-
-               yaffs_GetObjectName(hl, name, YAFFS_MAX_NAME_LENGTH + 1);
-               parent = hl->parent;
-
-               ylist_del_init(&hl->hardLinks);
-
-               yaffs_AddObjectToDirectory(obj->myDev->unlinkedDir, hl);
-
-               retVal = yaffs_ChangeObjectName(obj,parent, name, 0, 0);
-
-               if (retVal == YAFFS_OK)
-                       retVal = yaffs_DoGenericObjectDeletion(hl);
-
-               return retVal;
-
-       } else if (immediateDeletion) {
-               switch (obj->variantType) {
-               case YAFFS_OBJECT_TYPE_FILE:
-                       return yaffs_DeleteFile(obj);
-                       break;
-               case YAFFS_OBJECT_TYPE_DIRECTORY:
-                       ylist_del_init(&obj->variant.directoryVariant.dirty);
-                       return yaffs_DeleteDirectory(obj);
-                       break;
-               case YAFFS_OBJECT_TYPE_SYMLINK:
-                       return yaffs_DeleteSymLink(obj);
-                       break;
-               case YAFFS_OBJECT_TYPE_SPECIAL:
-                       return yaffs_DoGenericObjectDeletion(obj);
-                       break;
-               case YAFFS_OBJECT_TYPE_HARDLINK:
-               case YAFFS_OBJECT_TYPE_UNKNOWN:
-               default:
-                       return YAFFS_FAIL;
-               }
-       } else if(yaffs_IsNonEmptyDirectory(obj))
-               return YAFFS_FAIL;
-       else
-               return yaffs_ChangeObjectName(obj, obj->myDev->unlinkedDir,
-                                          _Y("unlinked"), 0, 0);
-}
-
-
-static int yaffs_UnlinkObject(yaffs_Object *obj)
-{
-
-       if (obj && obj->unlinkAllowed)
-               return yaffs_UnlinkWorker(obj);
-
-       return YAFFS_FAIL;
-
-}
-int yaffs_Unlink(yaffs_Object *dir, const YCHAR *name)
-{
-       yaffs_Object *obj;
-
-       obj = yaffs_FindObjectByName(dir, name);
-       return yaffs_UnlinkObject(obj);
-}
-
-/*----------------------- Initialisation Scanning ---------------------- */
-
-static void yaffs_HandleShadowedObject(yaffs_Device *dev, int objId,
-                               int backwardScanning)
-{
-       yaffs_Object *obj;
-
-       if (!backwardScanning) {
-               /* Handle YAFFS1 forward scanning case
-                * For YAFFS1 we always do the deletion
-                */
-
-       } else {
-               /* Handle YAFFS2 case (backward scanning)
-                * If the shadowed object exists then ignore.
-                */
-               obj = yaffs_FindObjectByNumber(dev, objId);
-               if(obj)
-                       return;
-       }
-
-       /* Let's create it (if it does not exist) assuming it is a file so that it can do shrinking etc.
-        * We put it in unlinked dir to be cleaned up after the scanning
-        */
-       obj =
-           yaffs_FindOrCreateObjectByNumber(dev, objId,
-                                            YAFFS_OBJECT_TYPE_FILE);
-       if (!obj)
-               return;
-       obj->isShadowed = 1;
-       yaffs_AddObjectToDirectory(dev->unlinkedDir, obj);
-       obj->variant.fileVariant.shrinkSize = 0;
-       obj->valid = 1;         /* So that we don't read any other info for this file */
-
-}
-
-typedef struct {
-       int seq;
-       int block;
-} yaffs_BlockIndex;
-
-
-static void yaffs_HardlinkFixup(yaffs_Device *dev, yaffs_Object *hardList)
-{
-       yaffs_Object *hl;
-       yaffs_Object *in;
-
-       while (hardList) {
-               hl = hardList;
-               hardList = (yaffs_Object *) (hardList->hardLinks.next);
-
-               in = yaffs_FindObjectByNumber(dev,
-                                             hl->variant.hardLinkVariant.
-                                             equivalentObjectId);
-
-               if (in) {
-                       /* Add the hardlink pointers */
-                       hl->variant.hardLinkVariant.equivalentObject = in;
-                       ylist_add(&hl->hardLinks, &in->hardLinks);
-               } else {
-                       /* Todo Need to report/handle this better.
-                        * Got a problem... hardlink to a non-existant object
-                        */
-                       hl->variant.hardLinkVariant.equivalentObject = NULL;
-                       YINIT_LIST_HEAD(&hl->hardLinks);
-
-               }
-       }
-}
-
-
-
-
-
-static int ybicmp(const void *a, const void *b)
-{
-       register int aseq = ((yaffs_BlockIndex *)a)->seq;
-       register int bseq = ((yaffs_BlockIndex *)b)->seq;
-       register int ablock = ((yaffs_BlockIndex *)a)->block;
-       register int bblock = ((yaffs_BlockIndex *)b)->block;
-       if (aseq == bseq)
-               return ablock - bblock;
-       else
-               return aseq - bseq;
-}
-
-
-struct yaffs_ShadowFixerStruct {
-       int objectId;
-       int shadowedId;
-       struct yaffs_ShadowFixerStruct *next;
-};
-
-
-static void yaffs_StripDeletedObjects(yaffs_Device *dev)
-{
-       /*
-       *  Sort out state of unlinked and deleted objects after scanning.
-       */
-       struct ylist_head *i;
-       struct ylist_head *n;
-       yaffs_Object *l;
-
-       /* Soft delete all the unlinked files */
-       ylist_for_each_safe(i, n,
-               &dev->unlinkedDir->variant.directoryVariant.children) {
-               if (i) {
-                       l = ylist_entry(i, yaffs_Object, siblings);
-                       yaffs_DeleteObject(l);
-               }
-       }
-
-       ylist_for_each_safe(i, n,
-               &dev->deletedDir->variant.directoryVariant.children) {
-               if (i) {
-                       l = ylist_entry(i, yaffs_Object, siblings);
-                       yaffs_DeleteObject(l);
-               }
-       }
-
-}
-
-/*
- * This code iterates through all the objects making sure that they are rooted.
- * Any unrooted objects are re-rooted in lost+found.
- * An object needs to be in one of:
- * - Directly under deleted, unlinked
- * - Directly or indirectly under root.
- *
- * Note:
- *  This code assumes that we don't ever change the current relationships between
- *  directories:
- *   rootDir->parent == unlinkedDir->parent == deletedDir->parent == NULL
- *   lostNfound->parent == rootDir
- *
- * This fixes the problem where directories might have inadvertently been deleted
- * leaving the object "hanging" without being rooted in the directory tree.
- */
-static int yaffs_HasNULLParent(yaffs_Device *dev, yaffs_Object *obj)
-{
-       return (obj == dev->deletedDir ||
-               obj == dev->unlinkedDir||
-               obj == dev->rootDir);
-}
-
-static void yaffs_FixHangingObjects(yaffs_Device *dev)
-{
-       yaffs_Object *obj;
-       yaffs_Object *parent;
-       int i;
-       struct ylist_head *lh;
-       struct ylist_head *n;
-       int depthLimit;
-       int hanging;
-
-
-       /* Iterate through the objects in each hash entry,
-        * looking at each object.
-        * Make sure it is rooted.
-        */
-
-       for (i = 0; i <  YAFFS_NOBJECT_BUCKETS; i++) {
-               ylist_for_each_safe(lh, n, &dev->objectBucket[i].list) {
-                       if (lh) {
-                               obj = ylist_entry(lh, yaffs_Object, hashLink);
-                               parent= obj->parent;
-                               
-                               if(yaffs_HasNULLParent(dev,obj)){
-                                       /* These directories are not hanging */
-                                       hanging = 0;
-                               }
-                               else if(!parent || parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
-                                       hanging = 1;
-                               else if(yaffs_HasNULLParent(dev,parent))
-                                       hanging = 0;
-                               else {
-                                       /*
-                                        * Need to follow the parent chain to see if it is hanging.
-                                        */
-                                       hanging = 0;
-                                       depthLimit=100;
-
-                                       while(parent != dev->rootDir &&
-                                               parent->parent &&
-                                               parent->parent->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
-                                               depthLimit > 0){
-                                               parent = parent->parent;
-                                               depthLimit--;
-                                       }
-                                       if(parent != dev->rootDir)
-                                               hanging = 1;
-                               }
-                               if(hanging){
-                                       T(YAFFS_TRACE_SCAN,
-                                         (TSTR("Hanging object %d moved to lost and found" TENDSTR),
-                                               obj->objectId));
-                                       yaffs_AddObjectToDirectory(dev->lostNFoundDir,obj);
-                               }
-                       }
-               }
-       }
-}
-
-
-/*
- * Delete directory contents for cleaning up lost and found.
- */
-static void yaffs_DeleteDirectoryContents(yaffs_Object *dir)
-{
-       yaffs_Object *obj;
-       struct ylist_head *lh;
-       struct ylist_head *n;
-
-       if(dir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
-               YBUG();
-       
-       ylist_for_each_safe(lh, n, &dir->variant.directoryVariant.children) {
-               if (lh) {
-                       obj = ylist_entry(lh, yaffs_Object, siblings);
-                       if(obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY)
-                               yaffs_DeleteDirectoryContents(obj);
-
-                       T(YAFFS_TRACE_SCAN,
-                               (TSTR("Deleting lost_found object %d" TENDSTR),
-                               obj->objectId));
-
-                       /* Need to use UnlinkObject since Delete would not handle
-                        * hardlinked objects correctly.
-                        */
-                       yaffs_UnlinkObject(obj); 
-               }
-       }
-                       
-}
-
-static void yaffs_EmptyLostAndFound(yaffs_Device *dev)
-{
-       yaffs_DeleteDirectoryContents(dev->lostNFoundDir);
-}
-
-static int yaffs_Scan(yaffs_Device *dev)
-{
-       yaffs_ExtendedTags tags;
-       int blk;
-       int blockIterator;
-       int startIterator;
-       int endIterator;
-       int result;
-
-       int chunk;
-       int c;
-       int deleted;
-       yaffs_BlockState state;
-       yaffs_Object *hardList = NULL;
-       yaffs_BlockInfo *bi;
-       __u32 sequenceNumber;
-       yaffs_ObjectHeader *oh;
-       yaffs_Object *in;
-       yaffs_Object *parent;
-
-       int alloc_failed = 0;
-
-       struct yaffs_ShadowFixerStruct *shadowFixerList = NULL;
-
-
-       __u8 *chunkData;
-
-
-
-       T(YAFFS_TRACE_SCAN,
-         (TSTR("yaffs_Scan starts  intstartblk %d intendblk %d..." TENDSTR),
-          dev->internalStartBlock, dev->internalEndBlock));
-
-       chunkData = yaffs_GetTempBuffer(dev, __LINE__);
-
-       dev->sequenceNumber = YAFFS_LOWEST_SEQUENCE_NUMBER;
-
-       /* Scan all the blocks to determine their state */
-       bi = dev->blockInfo;
-       for (blk = dev->internalStartBlock; blk <= dev->internalEndBlock; blk++) {
-               yaffs_ClearChunkBits(dev, blk);
-               bi->pagesInUse = 0;
-               bi->softDeletions = 0;
-
-               yaffs_QueryInitialBlockState(dev, blk, &state, &sequenceNumber);
-
-               bi->blockState = state;
-               bi->sequenceNumber = sequenceNumber;
-
-               if (bi->sequenceNumber == YAFFS_SEQUENCE_BAD_BLOCK)
-                       bi->blockState = state = YAFFS_BLOCK_STATE_DEAD;
-
-               T(YAFFS_TRACE_SCAN_DEBUG,
-                 (TSTR("Block scanning block %d state %d seq %d" TENDSTR), blk,
-                  state, sequenceNumber));
-
-               if (state == YAFFS_BLOCK_STATE_DEAD) {
-                       T(YAFFS_TRACE_BAD_BLOCKS,
-                         (TSTR("block %d is bad" TENDSTR), blk));
-               } else if (state == YAFFS_BLOCK_STATE_EMPTY) {
-                       T(YAFFS_TRACE_SCAN_DEBUG,
-                         (TSTR("Block empty " TENDSTR)));
-                       dev->nErasedBlocks++;
-                       dev->nFreeChunks += dev->param.nChunksPerBlock;
-               }
-               bi++;
-       }
-
-       startIterator = dev->internalStartBlock;
-       endIterator = dev->internalEndBlock;
-
-       /* For each block.... */
-       for (blockIterator = startIterator; !alloc_failed && blockIterator <= endIterator;
-            blockIterator++) {
-
-               YYIELD();
-
-               YYIELD();
-
-               blk = blockIterator;
-
-               bi = yaffs_GetBlockInfo(dev, blk);
-               state = bi->blockState;
-
-               deleted = 0;
-
-               /* For each chunk in each block that needs scanning....*/
-               for (c = 0; !alloc_failed && c < dev->param.nChunksPerBlock &&
-                    state == YAFFS_BLOCK_STATE_NEEDS_SCANNING; c++) {
-                       /* Read the tags and decide what to do */
-                       chunk = blk * dev->param.nChunksPerBlock + c;
-
-                       result = yaffs_ReadChunkWithTagsFromNAND(dev, chunk, NULL,
-                                                       &tags);
-
-                       /* Let's have a good look at this chunk... */
-
-                       if (tags.eccResult == YAFFS_ECC_RESULT_UNFIXED || tags.chunkDeleted) {
-                               /* YAFFS1 only...
-                                * A deleted chunk
-                                */
-                               deleted++;
-                               dev->nFreeChunks++;
-                               /*T((" %d %d deleted\n",blk,c)); */
-                       } else if (!tags.chunkUsed) {
-                               /* An unassigned chunk in the block
-                                * This means that either the block is empty or
-                                * this is the one being allocated from
-                                */
-
-                               if (c == 0) {
-                                       /* We're looking at the first chunk in the block so the block is unused */
-                                       state = YAFFS_BLOCK_STATE_EMPTY;
-                                       dev->nErasedBlocks++;
-                               } else {
-                                       /* this is the block being allocated from */
-                                       T(YAFFS_TRACE_SCAN,
-                                         (TSTR
-                                          (" Allocating from %d %d" TENDSTR),
-                                          blk, c));
-                                       state = YAFFS_BLOCK_STATE_ALLOCATING;
-                                       dev->allocationBlock = blk;
-                                       dev->allocationPage = c;
-                                       dev->allocationBlockFinder = blk;
-                                       /* Set block finder here to encourage the allocator to go forth from here. */
-
-                               }
-
-                               dev->nFreeChunks += (dev->param.nChunksPerBlock - c);
-                       } else if (tags.chunkId > 0) {
-                               /* chunkId > 0 so it is a data chunk... */
-                               unsigned int endpos;
-
-                               yaffs_SetChunkBit(dev, blk, c);
-                               bi->pagesInUse++;
-
-                               in = yaffs_FindOrCreateObjectByNumber(dev,
-                                                                     tags.
-                                                                     objectId,
-                                                                     YAFFS_OBJECT_TYPE_FILE);
-                               /* PutChunkIntoFile checks for a clash (two data chunks with
-                                * the same chunkId).
-                                */
-
-                               if (!in)
-                                       alloc_failed = 1;
-
-                               if (in) {
-                                       if (!yaffs_PutChunkIntoFile(in, tags.chunkId, chunk, 1))
-                                               alloc_failed = 1;
-                               }
-
-                               endpos =
-                                   (tags.chunkId - 1) * dev->nDataBytesPerChunk +
-                                   tags.byteCount;
-                               if (in &&
-                                   in->variantType == YAFFS_OBJECT_TYPE_FILE
-                                   && in->variant.fileVariant.scannedFileSize <
-                                   endpos) {
-                                       in->variant.fileVariant.
-                                           scannedFileSize = endpos;
-                                       if (!dev->param.useHeaderFileSize) {
-                                               in->variant.fileVariant.
-                                                   fileSize =
-                                                   in->variant.fileVariant.
-                                                   scannedFileSize;
-                                       }
-
-                               }
-                               /* T((" %d %d data %d %d\n",blk,c,tags.objectId,tags.chunkId));   */
-                       } else {
-                               /* chunkId == 0, so it is an ObjectHeader.
-                                * Thus, we read in the object header and make the object
-                                */
-                               yaffs_SetChunkBit(dev, blk, c);
-                               bi->pagesInUse++;
-
-                               result = yaffs_ReadChunkWithTagsFromNAND(dev, chunk,
-                                                               chunkData,
-                                                               NULL);
-
-                               oh = (yaffs_ObjectHeader *) chunkData;
-
-                               in = yaffs_FindObjectByNumber(dev,
-                                                             tags.objectId);
-                               if (in && in->variantType != oh->type) {
-                                       /* This should not happen, but somehow
-                                        * Wev'e ended up with an objectId that has been reused but not yet
-                                        * deleted, and worse still it has changed type. Delete the old object.
-                                        */
-
-                                       yaffs_DeleteObject(in);
-
-                                       in = 0;
-                               }
-
-                               in = yaffs_FindOrCreateObjectByNumber(dev,
-                                                                     tags.
-                                                                     objectId,
-                                                                     oh->type);
-
-                               if (!in)
-                                       alloc_failed = 1;
-
-                               if (in && oh->shadowsObject > 0) {
-
-                                       struct yaffs_ShadowFixerStruct *fixer;
-                                       fixer = YMALLOC(sizeof(struct yaffs_ShadowFixerStruct));
-                                       if (fixer) {
-                                               fixer->next = shadowFixerList;
-                                               shadowFixerList = fixer;
-                                               fixer->objectId = tags.objectId;
-                                               fixer->shadowedId = oh->shadowsObject;
-                                       }
-
-                               }
-
-                               if (in && in->valid) {
-                                       /* We have already filled this one. We have a duplicate and need to resolve it. */
-
-                                       unsigned existingSerial = in->serial;
-                                       unsigned newSerial = tags.serialNumber;
-
-                                       if (((existingSerial + 1) & 3) == newSerial) {
-                                               /* Use new one - destroy the exisiting one */
-                                               yaffs_DeleteChunk(dev,
-                                                                 in->hdrChunk,
-                                                                 1, __LINE__);
-                                               in->valid = 0;
-                                       } else {
-                                               /* Use existing - destroy this one. */
-                                               yaffs_DeleteChunk(dev, chunk, 1,
-                                                                 __LINE__);
-                                       }
-                               }
-
-                               if (in && !in->valid &&
-                                   (tags.objectId == YAFFS_OBJECTID_ROOT ||
-                                    tags.objectId == YAFFS_OBJECTID_LOSTNFOUND)) {
-                                       /* We only load some info, don't fiddle with directory structure */
-                                       in->valid = 1;
-                                       in->variantType = oh->type;
-
-                                       in->yst_mode = oh->yst_mode;
-#ifdef CONFIG_YAFFS_WINCE
-                                       in->win_atime[0] = oh->win_atime[0];
-                                       in->win_ctime[0] = oh->win_ctime[0];
-                                       in->win_mtime[0] = oh->win_mtime[0];
-                                       in->win_atime[1] = oh->win_atime[1];
-                                       in->win_ctime[1] = oh->win_ctime[1];
-                                       in->win_mtime[1] = oh->win_mtime[1];
-#else
-                                       in->yst_uid = oh->yst_uid;
-                                       in->yst_gid = oh->yst_gid;
-                                       in->yst_atime = oh->yst_atime;
-                                       in->yst_mtime = oh->yst_mtime;
-                                       in->yst_ctime = oh->yst_ctime;
-                                       in->yst_rdev = oh->yst_rdev;
-#endif
-                                       in->hdrChunk = chunk;
-                                       in->serial = tags.serialNumber;
-
-                               } else if (in && !in->valid) {
-                                       /* we need to load this info */
-
-                                       in->valid = 1;
-                                       in->variantType = oh->type;
-
-                                       in->yst_mode = oh->yst_mode;
-#ifdef CONFIG_YAFFS_WINCE
-                                       in->win_atime[0] = oh->win_atime[0];
-                                       in->win_ctime[0] = oh->win_ctime[0];
-                                       in->win_mtime[0] = oh->win_mtime[0];
-                                       in->win_atime[1] = oh->win_atime[1];
-                                       in->win_ctime[1] = oh->win_ctime[1];
-                                       in->win_mtime[1] = oh->win_mtime[1];
-#else
-                                       in->yst_uid = oh->yst_uid;
-                                       in->yst_gid = oh->yst_gid;
-                                       in->yst_atime = oh->yst_atime;
-                                       in->yst_mtime = oh->yst_mtime;
-                                       in->yst_ctime = oh->yst_ctime;
-                                       in->yst_rdev = oh->yst_rdev;
-#endif
-                                       in->hdrChunk = chunk;
-                                       in->serial = tags.serialNumber;
-
-                                       yaffs_SetObjectName(in, oh->name);
-                                       in->dirty = 0;
-
-                                       /* directory stuff...
-                                        * hook up to parent
-                                        */
-
-                                       parent =
-                                           yaffs_FindOrCreateObjectByNumber
-                                           (dev, oh->parentObjectId,
-                                            YAFFS_OBJECT_TYPE_DIRECTORY);
-                                       if (!parent)
-                                               alloc_failed = 1;
-                                       if (parent && parent->variantType ==
-                                           YAFFS_OBJECT_TYPE_UNKNOWN) {
-                                               /* Set up as a directory */
-                                               parent->variantType =
-                                                       YAFFS_OBJECT_TYPE_DIRECTORY;
-                                               YINIT_LIST_HEAD(&parent->variant.
-                                                               directoryVariant.
-                                                               children);
-                                       } else if (!parent || parent->variantType !=
-                                                  YAFFS_OBJECT_TYPE_DIRECTORY) {
-                                               /* Hoosterman, another problem....
-                                                * We're trying to use a non-directory as a directory
-                                                */
-
-                                               T(YAFFS_TRACE_ERROR,
-                                                 (TSTR
-                                                  ("yaffs tragedy: attempting to use non-directory as a directory in scan. Put in lost+found."
-                                                   TENDSTR)));
-                                               parent = dev->lostNFoundDir;
-                                       }
-
-                                       yaffs_AddObjectToDirectory(parent, in);
-
-                                       if (0 && (parent == dev->deletedDir ||
-                                                 parent == dev->unlinkedDir)) {
-                                               in->deleted = 1;        /* If it is unlinked at start up then it wants deleting */
-                                               dev->nDeletedFiles++;
-                                       }
-                                       /* Note re hardlinks.
-                                        * Since we might scan a hardlink before its equivalent object is scanned
-                                        * we put them all in a list.
-                                        * After scanning is complete, we should have all the objects, so we run through this
-                                        * list and fix up all the chains.
-                                        */
-
-                                       switch (in->variantType) {
-                                       case YAFFS_OBJECT_TYPE_UNKNOWN:
-                                               /* Todo got a problem */
-                                               break;
-                                       case YAFFS_OBJECT_TYPE_FILE:
-                                               if (dev->param.useHeaderFileSize)
-
-                                                       in->variant.fileVariant.
-                                                           fileSize =
-                                                           oh->fileSize;
-
-                                               break;
-                                       case YAFFS_OBJECT_TYPE_HARDLINK:
-                                               in->variant.hardLinkVariant.
-                                                       equivalentObjectId =
-                                                       oh->equivalentObjectId;
-                                               in->hardLinks.next =
-                                                       (struct ylist_head *)
-                                                       hardList;
-                                               hardList = in;
-                                               break;
-                                       case YAFFS_OBJECT_TYPE_DIRECTORY:
-                                               /* Do nothing */
-                                               break;
-                                       case YAFFS_OBJECT_TYPE_SPECIAL:
-                                               /* Do nothing */
-                                               break;
-                                       case YAFFS_OBJECT_TYPE_SYMLINK:
-                                               in->variant.symLinkVariant.alias =
-                                                   yaffs_CloneString(oh->alias);
-                                               if (!in->variant.symLinkVariant.alias)
-                                                       alloc_failed = 1;
-                                               break;
-                                       }
-
-                               }
-                       }
-               }
-
-               if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
-                       /* If we got this far while scanning, then the block is fully allocated.*/
-                       state = YAFFS_BLOCK_STATE_FULL;
-               }
-
-               if (state == YAFFS_BLOCK_STATE_ALLOCATING) {
-                       /* If the block was partially allocated then treat it as fully allocated.*/
-                       state = YAFFS_BLOCK_STATE_FULL;
-                       dev->allocationBlock = -1;
-               }
-
-               bi->blockState = state;
-
-               /* Now let's see if it was dirty */
-               if (bi->pagesInUse == 0 &&
-                   !bi->hasShrinkHeader &&
-                   bi->blockState == YAFFS_BLOCK_STATE_FULL) {
-                       yaffs_BlockBecameDirty(dev, blk);
-               }
-
-       }
-
-
-       /* Ok, we've done all the scanning.
-        * Fix up the hard link chains.
-        * We should now have scanned all the objects, now it's time to add these
-        * hardlinks.
-        */
-
-       yaffs_HardlinkFixup(dev, hardList);
-
-       /* Fix up any shadowed objects */
-       {
-               struct yaffs_ShadowFixerStruct *fixer;
-               yaffs_Object *obj;
-
-               while (shadowFixerList) {
-                       fixer = shadowFixerList;
-                       shadowFixerList = fixer->next;
-                       /* Complete the rename transaction by deleting the shadowed object
-                        * then setting the object header to unshadowed.
-                        */
-                       obj = yaffs_FindObjectByNumber(dev, fixer->shadowedId);
-                       if (obj)
-                               yaffs_DeleteObject(obj);
-
-                       obj = yaffs_FindObjectByNumber(dev, fixer->objectId);
-
-                       if (obj)
-                               yaffs_UpdateObjectHeader(obj, NULL, 1, 0, 0);
-
-                       YFREE(fixer);
-               }
-       }
-
-       yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
-
-       if (alloc_failed)
-               return YAFFS_FAIL;
-
-       T(YAFFS_TRACE_SCAN, (TSTR("yaffs_Scan ends" TENDSTR)));
-
-
-       return YAFFS_OK;
-}
-
-static void yaffs_CheckObjectDetailsLoaded(yaffs_Object *in)
-{
-       __u8 *chunkData;
-       yaffs_ObjectHeader *oh;
-       yaffs_Device *dev;
-       yaffs_ExtendedTags tags;
-       int result;
-       int alloc_failed = 0;
-
-       if (!in)
-               return;
-
-       dev = in->myDev;
-
-#if 0
-       T(YAFFS_TRACE_SCAN, (TSTR("details for object %d %s loaded" TENDSTR),
-               in->objectId,
-               in->lazyLoaded ? "not yet" : "already"));
-#endif
-
-       if (in->lazyLoaded && in->hdrChunk > 0) {
-               in->lazyLoaded = 0;
-               chunkData = yaffs_GetTempBuffer(dev, __LINE__);
-
-               result = yaffs_ReadChunkWithTagsFromNAND(dev, in->hdrChunk, chunkData, &tags);
-               oh = (yaffs_ObjectHeader *) chunkData;
-
-               in->yst_mode = oh->yst_mode;
-#ifdef CONFIG_YAFFS_WINCE
-               in->win_atime[0] = oh->win_atime[0];
-               in->win_ctime[0] = oh->win_ctime[0];
-               in->win_mtime[0] = oh->win_mtime[0];
-               in->win_atime[1] = oh->win_atime[1];
-               in->win_ctime[1] = oh->win_ctime[1];
-               in->win_mtime[1] = oh->win_mtime[1];
-#else
-               in->yst_uid = oh->yst_uid;
-               in->yst_gid = oh->yst_gid;
-               in->yst_atime = oh->yst_atime;
-               in->yst_mtime = oh->yst_mtime;
-               in->yst_ctime = oh->yst_ctime;
-               in->yst_rdev = oh->yst_rdev;
-
-#endif
-               yaffs_SetObjectName(in, oh->name);
-
-               if (in->variantType == YAFFS_OBJECT_TYPE_SYMLINK) {
-                       in->variant.symLinkVariant.alias =
-                                                   yaffs_CloneString(oh->alias);
-                       if (!in->variant.symLinkVariant.alias)
-                               alloc_failed = 1; /* Not returned to caller */
-               }
-
-               yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
-       }
-}
-
-static int yaffs_ScanBackwards(yaffs_Device *dev)
-{
-       yaffs_ExtendedTags tags;
-       int blk;
-       int blockIterator;
-       int startIterator;
-       int endIterator;
-       int nBlocksToScan = 0;
-
-       int chunk;
-       int result;
-       int c;
-       int deleted;
-       yaffs_BlockState state;
-       yaffs_Object *hardList = NULL;
-       yaffs_BlockInfo *bi;
-       __u32 sequenceNumber;
-       yaffs_ObjectHeader *oh;
-       yaffs_Object *in;
-       yaffs_Object *parent;
-       int nBlocks = dev->internalEndBlock - dev->internalStartBlock + 1;
-       int itsUnlinked;
-       __u8 *chunkData;
-
-       int fileSize;
-       int isShrink;
-       int foundChunksInBlock;
-       int equivalentObjectId;
-       int alloc_failed = 0;
-
-
-       yaffs_BlockIndex *blockIndex = NULL;
-       int altBlockIndex = 0;
-
-       if (!dev->param.isYaffs2) {
-               T(YAFFS_TRACE_SCAN,
-                 (TSTR("yaffs_ScanBackwards is only for YAFFS2!" TENDSTR)));
-               return YAFFS_FAIL;
-       }
-
-       T(YAFFS_TRACE_SCAN,
-         (TSTR
-          ("yaffs_ScanBackwards starts  intstartblk %d intendblk %d..."
-           TENDSTR), dev->internalStartBlock, dev->internalEndBlock));
-
-
-       dev->sequenceNumber = YAFFS_LOWEST_SEQUENCE_NUMBER;
-
-       blockIndex = YMALLOC(nBlocks * sizeof(yaffs_BlockIndex));
-
-       if (!blockIndex) {
-               blockIndex = YMALLOC_ALT(nBlocks * sizeof(yaffs_BlockIndex));
-               altBlockIndex = 1;
-       }
-
-       if (!blockIndex) {
-               T(YAFFS_TRACE_SCAN,
-                 (TSTR("yaffs_Scan() could not allocate block index!" TENDSTR)));
-               return YAFFS_FAIL;
-       }
-
-       dev->blocksInCheckpoint = 0;
-
-       chunkData = yaffs_GetTempBuffer(dev, __LINE__);
-
-       /* Scan all the blocks to determine their state */
-       bi = dev->blockInfo;
-       for (blk = dev->internalStartBlock; blk <= dev->internalEndBlock; blk++) {
-               yaffs_ClearChunkBits(dev, blk);
-               bi->pagesInUse = 0;
-               bi->softDeletions = 0;
-
-               yaffs_QueryInitialBlockState(dev, blk, &state, &sequenceNumber);
-
-               bi->blockState = state;
-               bi->sequenceNumber = sequenceNumber;
-
-               if (bi->sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA)
-                       bi->blockState = state = YAFFS_BLOCK_STATE_CHECKPOINT;
-               if (bi->sequenceNumber == YAFFS_SEQUENCE_BAD_BLOCK)
-                       bi->blockState = state = YAFFS_BLOCK_STATE_DEAD;
-
-               T(YAFFS_TRACE_SCAN_DEBUG,
-                 (TSTR("Block scanning block %d state %d seq %d" TENDSTR), blk,
-                  state, sequenceNumber));
-
-
-               if (state == YAFFS_BLOCK_STATE_CHECKPOINT) {
-                       dev->blocksInCheckpoint++;
-
-               } else if (state == YAFFS_BLOCK_STATE_DEAD) {
-                       T(YAFFS_TRACE_BAD_BLOCKS,
-                         (TSTR("block %d is bad" TENDSTR), blk));
-               } else if (state == YAFFS_BLOCK_STATE_EMPTY) {
-                       T(YAFFS_TRACE_SCAN_DEBUG,
-                         (TSTR("Block empty " TENDSTR)));
-                       dev->nErasedBlocks++;
-                       dev->nFreeChunks += dev->param.nChunksPerBlock;
-               } else if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
-
-                       /* Determine the highest sequence number */
-                       if (sequenceNumber >= YAFFS_LOWEST_SEQUENCE_NUMBER &&
-                           sequenceNumber < YAFFS_HIGHEST_SEQUENCE_NUMBER) {
-
-                               blockIndex[nBlocksToScan].seq = sequenceNumber;
-                               blockIndex[nBlocksToScan].block = blk;
-
-                               nBlocksToScan++;
-
-                               if (sequenceNumber >= dev->sequenceNumber)
-                                       dev->sequenceNumber = sequenceNumber;
-                       } else {
-                               /* TODO: Nasty sequence number! */
-                               T(YAFFS_TRACE_SCAN,
-                                 (TSTR
-                                  ("Block scanning block %d has bad sequence number %d"
-                                   TENDSTR), blk, sequenceNumber));
-
-                       }
-               }
-               bi++;
-       }
-
-       T(YAFFS_TRACE_SCAN,
-       (TSTR("%d blocks to be sorted..." TENDSTR), nBlocksToScan));
-
+       if (dev->param.disableSoftDelete || dev->param.isYaffs2)
+               yaffs_ResizeFile(in, 0);
 
+       if (in->nDataChunks > 0) {
+               /* Use soft deletion if there is data in the file.
+                * That won't be the case if it has been resized to zero.
+                */
+               if (!in->unlinked)
+                       retVal = yaffs_UnlinkFileIfNeeded(in);
 
-       YYIELD();
+               deleted = in->deleted;
 
-       /* Sort the blocks */
-#ifndef CONFIG_YAFFS_USE_OWN_SORT
-       {
-               /* Use qsort now. */
-               yaffs_qsort(blockIndex, nBlocksToScan, sizeof(yaffs_BlockIndex), ybicmp);
-       }
-#else
-       {
-               /* Dungy old bubble sort... */
+               if (retVal == YAFFS_OK && in->unlinked && !in->deleted) {
+                       in->deleted = 1;
+                       deleted = 1;
+                       in->myDev->nDeletedFiles++;
+                       yaffs_SoftDeleteFile(in);
+               }
+               return deleted ? YAFFS_OK : YAFFS_FAIL;
+       } else {
+               /* The file has no data chunks so we toss it immediately */
+               yaffs_FreeTnode(in->myDev, in->variant.fileVariant.top);
+               in->variant.fileVariant.top = NULL;
+               yaffs_DoGenericObjectDeletion(in);
 
-               yaffs_BlockIndex temp;
-               int i;
-               int j;
-
-               for (i = 0; i < nBlocksToScan; i++)
-                       for (j = i + 1; j < nBlocksToScan; j++)
-                               if (blockIndex[i].seq > blockIndex[j].seq) {
-                                       temp = blockIndex[j];
-                                       blockIndex[j] = blockIndex[i];
-                                       blockIndex[i] = temp;
-                               }
+               return YAFFS_OK;
        }
-#endif
-
-       YYIELD();
-
-       T(YAFFS_TRACE_SCAN, (TSTR("...done" TENDSTR)));
-
-       /* Now scan the blocks looking at the data. */
-       startIterator = 0;
-       endIterator = nBlocksToScan - 1;
-       T(YAFFS_TRACE_SCAN_DEBUG,
-         (TSTR("%d blocks to be scanned" TENDSTR), nBlocksToScan));
-
-       /* For each block.... backwards */
-       for (blockIterator = endIterator; !alloc_failed && blockIterator >= startIterator;
-                       blockIterator--) {
-               /* Cooperative multitasking! This loop can run for so
-                  long that watchdog timers expire. */
-               YYIELD();
-
-               /* get the block to scan in the correct order */
-               blk = blockIndex[blockIterator].block;
-
-               bi = yaffs_GetBlockInfo(dev, blk);
-
-
-               state = bi->blockState;
-
-               deleted = 0;
-
-               /* For each chunk in each block that needs scanning.... */
-               foundChunksInBlock = 0;
-               for (c = dev->param.nChunksPerBlock - 1;
-                    !alloc_failed && c >= 0 &&
-                    (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING ||
-                     state == YAFFS_BLOCK_STATE_ALLOCATING); c--) {
-                       /* Scan backwards...
-                        * Read the tags and decide what to do
-                        */
-
-                       chunk = blk * dev->param.nChunksPerBlock + c;
-
-                       result = yaffs_ReadChunkWithTagsFromNAND(dev, chunk, NULL,
-                                                       &tags);
-
-                       /* Let's have a good look at this chunk... */
-
-                       if (!tags.chunkUsed) {
-                               /* An unassigned chunk in the block.
-                                * If there are used chunks after this one, then
-                                * it is a chunk that was skipped due to failing the erased
-                                * check. Just skip it so that it can be deleted.
-                                * But, more typically, We get here when this is an unallocated
-                                * chunk and his means that either the block is empty or
-                                * this is the one being allocated from
-                                */
-
-                               if (foundChunksInBlock) {
-                                       /* This is a chunk that was skipped due to failing the erased check */
-                               } else if (c == 0) {
-                                       /* We're looking at the first chunk in the block so the block is unused */
-                                       state = YAFFS_BLOCK_STATE_EMPTY;
-                                       dev->nErasedBlocks++;
-                               } else {
-                                       if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING ||
-                                           state == YAFFS_BLOCK_STATE_ALLOCATING) {
-                                               if (dev->sequenceNumber == bi->sequenceNumber) {
-                                                       /* this is the block being allocated from */
-
-                                                       T(YAFFS_TRACE_SCAN,
-                                                         (TSTR
-                                                          (" Allocating from %d %d"
-                                                           TENDSTR), blk, c));
-
-                                                       state = YAFFS_BLOCK_STATE_ALLOCATING;
-                                                       dev->allocationBlock = blk;
-                                                       dev->allocationPage = c;
-                                                       dev->allocationBlockFinder = blk;
-                                               } else {
-                                                       /* This is a partially written block that is not
-                                                        * the current allocation block.
-                                                        */
-
-                                                        T(YAFFS_TRACE_SCAN,
-                                                        (TSTR("Partially written block %d detected" TENDSTR),
-                                                        blk));
-                                               }
-                                       }
-                               }
-
-                               dev->nFreeChunks++;
-
-                       } else if (tags.eccResult == YAFFS_ECC_RESULT_UNFIXED) {
-                               T(YAFFS_TRACE_SCAN,
-                                 (TSTR(" Unfixed ECC in chunk(%d:%d), chunk ignored"TENDSTR),
-                                 blk, c));
-
-                                 dev->nFreeChunks++;
+}
 
-                       } else if (tags.chunkId > 0) {
-                               /* chunkId > 0 so it is a data chunk... */
-                               unsigned int endpos;
-                               __u32 chunkBase =
-                                   (tags.chunkId - 1) * dev->nDataBytesPerChunk;
+static int yaffs_IsNonEmptyDirectory(yaffs_Object *obj)
+{
+       return (obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY) &&
+               !(ylist_empty(&obj->variant.directoryVariant.children));
+}
 
-                               foundChunksInBlock = 1;
+static int yaffs_DeleteDirectory(yaffs_Object *obj)
+{
+       /* First check that the directory is empty. */
+       if (yaffs_IsNonEmptyDirectory(obj))
+               return YAFFS_FAIL;
 
+       return yaffs_DoGenericObjectDeletion(obj);
+}
 
-                               yaffs_SetChunkBit(dev, blk, c);
-                               bi->pagesInUse++;
+static int yaffs_DeleteSymLink(yaffs_Object *in)
+{
+       if(in->variant.symLinkVariant.alias)
+               YFREE(in->variant.symLinkVariant.alias);
+       in->variant.symLinkVariant.alias=NULL;
 
-                               in = yaffs_FindOrCreateObjectByNumber(dev,
-                                                                     tags.
-                                                                     objectId,
-                                                                     YAFFS_OBJECT_TYPE_FILE);
-                               if (!in) {
-                                       /* Out of memory */
-                                       alloc_failed = 1;
-                               }
+       return yaffs_DoGenericObjectDeletion(in);
+}
 
-                               if (in &&
-                                   in->variantType == YAFFS_OBJECT_TYPE_FILE
-                                   && chunkBase < in->variant.fileVariant.shrinkSize) {
-                                       /* This has not been invalidated by a resize */
-                                       if (!yaffs_PutChunkIntoFile(in, tags.chunkId, chunk, -1)) {
-                                               alloc_failed = 1;
-                                       }
+static int yaffs_DeleteHardLink(yaffs_Object *in)
+{
+       /* remove this hardlink from the list assocaited with the equivalent
+        * object
+        */
+       ylist_del_init(&in->hardLinks);
+       return yaffs_DoGenericObjectDeletion(in);
+}
 
-                                       /* File size is calculated by looking at the data chunks if we have not
-                                        * seen an object header yet. Stop this practice once we find an object header.
-                                        */
-                                       endpos = chunkBase + tags.byteCount;
+int yaffs_DeleteObject(yaffs_Object *obj)
+{
+int retVal = -1;
+       switch (obj->variantType) {
+       case YAFFS_OBJECT_TYPE_FILE:
+               retVal = yaffs_DeleteFile(obj);
+               break;
+       case YAFFS_OBJECT_TYPE_DIRECTORY:
+               if(!ylist_empty(&obj->variant.directoryVariant.dirty)){
+                       T(YAFFS_TRACE_BACKGROUND, (TSTR("Remove object %d from dirty directories" TENDSTR),obj->objectId));
+                       ylist_del_init(&obj->variant.directoryVariant.dirty);
+               }
+               return yaffs_DeleteDirectory(obj);
+               break;
+       case YAFFS_OBJECT_TYPE_SYMLINK:
+               retVal = yaffs_DeleteSymLink(obj);
+               break;
+       case YAFFS_OBJECT_TYPE_HARDLINK:
+               retVal = yaffs_DeleteHardLink(obj);
+               break;
+       case YAFFS_OBJECT_TYPE_SPECIAL:
+               retVal = yaffs_DoGenericObjectDeletion(obj);
+               break;
+       case YAFFS_OBJECT_TYPE_UNKNOWN:
+               retVal = 0;
+               break;          /* should not happen. */
+       }
 
-                                       if (!in->valid &&       /* have not got an object header yet */
-                                           in->variant.fileVariant.scannedFileSize < endpos) {
-                                               in->variant.fileVariant.scannedFileSize = endpos;
-                                               in->variant.fileVariant.fileSize = endpos;
-                                       }
+       return retVal;
+}
 
-                               } else if (in) {
-                                       /* This chunk has been invalidated by a resize, or a past file deletion
-                                        * so delete the chunk*/
-                                       yaffs_DeleteChunk(dev, chunk, 1, __LINE__);
+static int yaffs_UnlinkWorker(yaffs_Object *obj)
+{
 
-                               }
-                       } else {
-                               /* chunkId == 0, so it is an ObjectHeader.
-                                * Thus, we read in the object header and make the object
-                                */
-                               foundChunksInBlock = 1;
+       int immediateDeletion = 0;
 
-                               yaffs_SetChunkBit(dev, blk, c);
-                               bi->pagesInUse++;
+       if (!obj->myInode)
+               immediateDeletion = 1;
 
-                               oh = NULL;
-                               in = NULL;
+       if(obj)
+               yaffs_UpdateParent(obj->parent);
 
-                               if (tags.extraHeaderInfoAvailable) {
-                                       in = yaffs_FindOrCreateObjectByNumber(dev,
-                                               tags.objectId,
-                                               tags.extraObjectType);
-                                       if (!in)
-                                               alloc_failed = 1;
-                               }
+       if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
+               return yaffs_DeleteHardLink(obj);
+       } else if (!ylist_empty(&obj->hardLinks)) {
+               /* Curve ball: We're unlinking an object that has a hardlink.
+                *
+                * This problem arises because we are not strictly following
+                * The Linux link/inode model.
+                *
+                * We can't really delete the object.
+                * Instead, we do the following:
+                * - Select a hardlink.
+                * - Unhook it from the hard links
+                * - Move it from its parent directory (so that the rename can work)
+                * - Rename the object to the hardlink's name.
+                * - Delete the hardlink
+                */
 
-                               if (!in ||
-                                   (!in->valid && dev->param.disableLazyLoad) ||
-                                   tags.extraShadows ||
-                                   (!in->valid &&
-                                   (tags.objectId == YAFFS_OBJECTID_ROOT ||
-                                    tags.objectId == YAFFS_OBJECTID_LOSTNFOUND))) {
+               yaffs_Object *hl;
+               yaffs_Object *parent;
+               int retVal;
+               YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];
 
-                                       /* If we don't have  valid info then we need to read the chunk
-                                        * TODO In future we can probably defer reading the chunk and
-                                        * living with invalid data until needed.
-                                        */
+               hl = ylist_entry(obj->hardLinks.next, yaffs_Object, hardLinks);
 
-                                       result = yaffs_ReadChunkWithTagsFromNAND(dev,
-                                                                       chunk,
-                                                                       chunkData,
-                                                                       NULL);
+               yaffs_GetObjectName(hl, name, YAFFS_MAX_NAME_LENGTH + 1);
+               parent = hl->parent;
 
-                                       oh = (yaffs_ObjectHeader *) chunkData;
+               ylist_del_init(&hl->hardLinks);
 
-                                       if (dev->param.inbandTags) {
-                                               /* Fix up the header if they got corrupted by inband tags */
-                                               oh->shadowsObject = oh->inbandShadowsObject;
-                                               oh->isShrink = oh->inbandIsShrink;
-                                       }
+               yaffs_AddObjectToDirectory(obj->myDev->unlinkedDir, hl);
 
-                                       if (!in) {
-                                               in = yaffs_FindOrCreateObjectByNumber(dev, tags.objectId, oh->type);
-                                               if (!in)
-                                                       alloc_failed = 1;
-                                       }
+               retVal = yaffs_ChangeObjectName(obj,parent, name, 0, 0);
 
-                               }
+               if (retVal == YAFFS_OK)
+                       retVal = yaffs_DoGenericObjectDeletion(hl);
 
-                               if (!in) {
-                                       /* TODO Hoosterman we have a problem! */
-                                       T(YAFFS_TRACE_ERROR,
-                                         (TSTR
-                                          ("yaffs tragedy: Could not make object for object  %d at chunk %d during scan"
-                                           TENDSTR), tags.objectId, chunk));
-                                       continue;
-                               }
+               return retVal;
 
-                               if (in->valid) {
-                                       /* We have already filled this one.
-                                        * We have a duplicate that will be discarded, but
-                                        * we first have to suck out resize info if it is a file.
-                                        */
+       } else if (immediateDeletion) {
+               switch (obj->variantType) {
+               case YAFFS_OBJECT_TYPE_FILE:
+                       return yaffs_DeleteFile(obj);
+                       break;
+               case YAFFS_OBJECT_TYPE_DIRECTORY:
+                       ylist_del_init(&obj->variant.directoryVariant.dirty);
+                       return yaffs_DeleteDirectory(obj);
+                       break;
+               case YAFFS_OBJECT_TYPE_SYMLINK:
+                       return yaffs_DeleteSymLink(obj);
+                       break;
+               case YAFFS_OBJECT_TYPE_SPECIAL:
+                       return yaffs_DoGenericObjectDeletion(obj);
+                       break;
+               case YAFFS_OBJECT_TYPE_HARDLINK:
+               case YAFFS_OBJECT_TYPE_UNKNOWN:
+               default:
+                       return YAFFS_FAIL;
+               }
+       } else if(yaffs_IsNonEmptyDirectory(obj))
+               return YAFFS_FAIL;
+       else
+               return yaffs_ChangeObjectName(obj, obj->myDev->unlinkedDir,
+                                          _Y("unlinked"), 0, 0);
+}
 
-                                       if ((in->variantType == YAFFS_OBJECT_TYPE_FILE) &&
-                                            ((oh &&
-                                              oh->type == YAFFS_OBJECT_TYPE_FILE) ||
-                                             (tags.extraHeaderInfoAvailable  &&
-                                              tags.extraObjectType == YAFFS_OBJECT_TYPE_FILE))) {
-                                               __u32 thisSize =
-                                                   (oh) ? oh->fileSize : tags.
-                                                   extraFileLength;
-                                               __u32 parentObjectId =
-                                                   (oh) ? oh->
-                                                   parentObjectId : tags.
-                                                   extraParentObjectId;
-
-
-                                               isShrink =
-                                                   (oh) ? oh->isShrink : tags.
-                                                   extraIsShrinkHeader;
-
-                                               /* If it is deleted (unlinked at start also means deleted)
-                                                * we treat the file size as being zeroed at this point.
-                                                */
-                                               if (parentObjectId ==
-                                                   YAFFS_OBJECTID_DELETED
-                                                   || parentObjectId ==
-                                                   YAFFS_OBJECTID_UNLINKED) {
-                                                       thisSize = 0;
-                                                       isShrink = 1;
-                                               }
 
-                                               if (isShrink && in->variant.fileVariant.shrinkSize > thisSize)
-                                                       in->variant.fileVariant.shrinkSize = thisSize;
+static int yaffs_UnlinkObject(yaffs_Object *obj)
+{
 
-                                               if (isShrink)
-                                                       bi->hasShrinkHeader = 1;
+       if (obj && obj->unlinkAllowed)
+               return yaffs_UnlinkWorker(obj);
 
-                                       }
-                                       /* Use existing - destroy this one. */
-                                       yaffs_DeleteChunk(dev, chunk, 1, __LINE__);
+       return YAFFS_FAIL;
 
-                               }
+}
+int yaffs_Unlink(yaffs_Object *dir, const YCHAR *name)
+{
+       yaffs_Object *obj;
 
-                               if (!in->valid && in->variantType !=
-                                   (oh ? oh->type : tags.extraObjectType))
-                                       T(YAFFS_TRACE_ERROR, (
-                                               TSTR("yaffs tragedy: Bad object type, "
-                                           TCONT("%d != %d, for object %d at chunk ")
-                                           TCONT("%d during scan")
-                                               TENDSTR), oh ?
-                                           oh->type : tags.extraObjectType,
-                                           in->variantType, tags.objectId,
-                                           chunk));
-
-                               if (!in->valid &&
-                                   (tags.objectId == YAFFS_OBJECTID_ROOT ||
-                                    tags.objectId ==
-                                    YAFFS_OBJECTID_LOSTNFOUND)) {
-                                       /* We only load some info, don't fiddle with directory structure */
-                                       in->valid = 1;
-
-                                       if (oh) {
-                                               in->variantType = oh->type;
-
-                                               in->yst_mode = oh->yst_mode;
-#ifdef CONFIG_YAFFS_WINCE
-                                               in->win_atime[0] = oh->win_atime[0];
-                                               in->win_ctime[0] = oh->win_ctime[0];
-                                               in->win_mtime[0] = oh->win_mtime[0];
-                                               in->win_atime[1] = oh->win_atime[1];
-                                               in->win_ctime[1] = oh->win_ctime[1];
-                                               in->win_mtime[1] = oh->win_mtime[1];
-#else
-                                               in->yst_uid = oh->yst_uid;
-                                               in->yst_gid = oh->yst_gid;
-                                               in->yst_atime = oh->yst_atime;
-                                               in->yst_mtime = oh->yst_mtime;
-                                               in->yst_ctime = oh->yst_ctime;
-                                               in->yst_rdev = oh->yst_rdev;
+       obj = yaffs_FindObjectByName(dir, name);
+       return yaffs_UnlinkObject(obj);
+}
 
-#endif
-                                       } else {
-                                               in->variantType = tags.extraObjectType;
-                                               in->lazyLoaded = 1;
-                                       }
+/*----------------------- Initialisation Scanning ---------------------- */
 
-                                       in->hdrChunk = chunk;
+void yaffs_HandleShadowedObject(yaffs_Device *dev, int objId,
+                               int backwardScanning)
+{
+       yaffs_Object *obj;
 
-                               } else if (!in->valid) {
-                                       /* we need to load this info */
+       if (!backwardScanning) {
+               /* Handle YAFFS1 forward scanning case
+                * For YAFFS1 we always do the deletion
+                */
 
-                                       in->valid = 1;
-                                       in->hdrChunk = chunk;
+       } else {
+               /* Handle YAFFS2 case (backward scanning)
+                * If the shadowed object exists then ignore.
+                */
+               obj = yaffs_FindObjectByNumber(dev, objId);
+               if(obj)
+                       return;
+       }
 
-                                       if (oh) {
-                                               in->variantType = oh->type;
+       /* Let's create it (if it does not exist) assuming it is a file so that it can do shrinking etc.
+        * We put it in unlinked dir to be cleaned up after the scanning
+        */
+       obj =
+           yaffs_FindOrCreateObjectByNumber(dev, objId,
+                                            YAFFS_OBJECT_TYPE_FILE);
+       if (!obj)
+               return;
+       obj->isShadowed = 1;
+       yaffs_AddObjectToDirectory(dev->unlinkedDir, obj);
+       obj->variant.fileVariant.shrinkSize = 0;
+       obj->valid = 1;         /* So that we don't read any other info for this file */
 
-                                               in->yst_mode = oh->yst_mode;
-#ifdef CONFIG_YAFFS_WINCE
-                                               in->win_atime[0] = oh->win_atime[0];
-                                               in->win_ctime[0] = oh->win_ctime[0];
-                                               in->win_mtime[0] = oh->win_mtime[0];
-                                               in->win_atime[1] = oh->win_atime[1];
-                                               in->win_ctime[1] = oh->win_ctime[1];
-                                               in->win_mtime[1] = oh->win_mtime[1];
-#else
-                                               in->yst_uid = oh->yst_uid;
-                                               in->yst_gid = oh->yst_gid;
-                                               in->yst_atime = oh->yst_atime;
-                                               in->yst_mtime = oh->yst_mtime;
-                                               in->yst_ctime = oh->yst_ctime;
-                                               in->yst_rdev = oh->yst_rdev;
-#endif
+}
 
-                                               if (oh->shadowsObject > 0)
-                                                       yaffs_HandleShadowedObject(dev,
-                                                                          oh->
-                                                                          shadowsObject,
-                                                                          1);
-                                                       
 
+void yaffs_HardlinkFixup(yaffs_Device *dev, yaffs_Object *hardList)
+{
+       yaffs_Object *hl;
+       yaffs_Object *in;
 
-                                               yaffs_SetObjectName(in, oh->name);
-                                               parent =
-                                                   yaffs_FindOrCreateObjectByNumber
-                                                       (dev, oh->parentObjectId,
-                                                        YAFFS_OBJECT_TYPE_DIRECTORY);
+       while (hardList) {
+               hl = hardList;
+               hardList = (yaffs_Object *) (hardList->hardLinks.next);
 
-                                                fileSize = oh->fileSize;
-                                                isShrink = oh->isShrink;
-                                                equivalentObjectId = oh->equivalentObjectId;
+               in = yaffs_FindObjectByNumber(dev,
+                                             hl->variant.hardLinkVariant.
+                                             equivalentObjectId);
 
-                                       } else {
-                                               in->variantType = tags.extraObjectType;
-                                               parent =
-                                                   yaffs_FindOrCreateObjectByNumber
-                                                       (dev, tags.extraParentObjectId,
-                                                        YAFFS_OBJECT_TYPE_DIRECTORY);
-                                                fileSize = tags.extraFileLength;
-                                                isShrink = tags.extraIsShrinkHeader;
-                                                equivalentObjectId = tags.extraEquivalentObjectId;
-                                               in->lazyLoaded = 1;
+               if (in) {
+                       /* Add the hardlink pointers */
+                       hl->variant.hardLinkVariant.equivalentObject = in;
+                       ylist_add(&hl->hardLinks, &in->hardLinks);
+               } else {
+                       /* Todo Need to report/handle this better.
+                        * Got a problem... hardlink to a non-existant object
+                        */
+                       hl->variant.hardLinkVariant.equivalentObject = NULL;
+                       YINIT_LIST_HEAD(&hl->hardLinks);
 
-                                       }
-                                       in->dirty = 0;
+               }
+       }
+}
 
-                                       if (!parent)
-                                               alloc_failed = 1;
 
-                                       /* directory stuff...
-                                        * hook up to parent
-                                        */
+static void yaffs_StripDeletedObjects(yaffs_Device *dev)
+{
+       /*
+       *  Sort out state of unlinked and deleted objects after scanning.
+       */
+       struct ylist_head *i;
+       struct ylist_head *n;
+       yaffs_Object *l;
 
-                                       if (parent && parent->variantType ==
-                                           YAFFS_OBJECT_TYPE_UNKNOWN) {
-                                               /* Set up as a directory */
-                                               parent->variantType =
-                                                       YAFFS_OBJECT_TYPE_DIRECTORY;
-                                               YINIT_LIST_HEAD(&parent->variant.
-                                                       directoryVariant.
-                                                       children);
-                                       } else if (!parent || parent->variantType !=
-                                                  YAFFS_OBJECT_TYPE_DIRECTORY) {
-                                               /* Hoosterman, another problem....
-                                                * We're trying to use a non-directory as a directory
-                                                */
+       /* Soft delete all the unlinked files */
+       ylist_for_each_safe(i, n,
+               &dev->unlinkedDir->variant.directoryVariant.children) {
+               if (i) {
+                       l = ylist_entry(i, yaffs_Object, siblings);
+                       yaffs_DeleteObject(l);
+               }
+       }
 
-                                               T(YAFFS_TRACE_ERROR,
-                                                 (TSTR
-                                                  ("yaffs tragedy: attempting to use non-directory as a directory in scan. Put in lost+found."
-                                                   TENDSTR)));
-                                               parent = dev->lostNFoundDir;
-                                       }
+       ylist_for_each_safe(i, n,
+               &dev->deletedDir->variant.directoryVariant.children) {
+               if (i) {
+                       l = ylist_entry(i, yaffs_Object, siblings);
+                       yaffs_DeleteObject(l);
+               }
+       }
 
-                                       yaffs_AddObjectToDirectory(parent, in);
+}
 
-                                       itsUnlinked = (parent == dev->deletedDir) ||
-                                                     (parent == dev->unlinkedDir);
+/*
+ * This code iterates through all the objects making sure that they are rooted.
+ * Any unrooted objects are re-rooted in lost+found.
+ * An object needs to be in one of:
+ * - Directly under deleted, unlinked
+ * - Directly or indirectly under root.
+ *
+ * Note:
+ *  This code assumes that we don't ever change the current relationships between
+ *  directories:
+ *   rootDir->parent == unlinkedDir->parent == deletedDir->parent == NULL
+ *   lostNfound->parent == rootDir
+ *
+ * This fixes the problem where directories might have inadvertently been deleted
+ * leaving the object "hanging" without being rooted in the directory tree.
+ */
+static int yaffs_HasNULLParent(yaffs_Device *dev, yaffs_Object *obj)
+{
+       return (obj == dev->deletedDir ||
+               obj == dev->unlinkedDir||
+               obj == dev->rootDir);
+}
 
-                                       if (isShrink) {
-                                               /* Mark the block as having a shrinkHeader */
-                                               bi->hasShrinkHeader = 1;
-                                       }
+static void yaffs_FixHangingObjects(yaffs_Device *dev)
+{
+       yaffs_Object *obj;
+       yaffs_Object *parent;
+       int i;
+       struct ylist_head *lh;
+       struct ylist_head *n;
+       int depthLimit;
+       int hanging;
 
-                                       /* Note re hardlinks.
-                                        * Since we might scan a hardlink before its equivalent object is scanned
-                                        * we put them all in a list.
-                                        * After scanning is complete, we should have all the objects, so we run
-                                        * through this list and fix up all the chains.
-                                        */
 
-                                       switch (in->variantType) {
-                                       case YAFFS_OBJECT_TYPE_UNKNOWN:
-                                               /* Todo got a problem */
-                                               break;
-                                       case YAFFS_OBJECT_TYPE_FILE:
-
-                                               if (in->variant.fileVariant.
-                                                   scannedFileSize < fileSize) {
-                                                       /* This covers the case where the file size is greater
-                                                        * than where the data is
-                                                        * This will happen if the file is resized to be larger
-                                                        * than its current data extents.
-                                                        */
-                                                       in->variant.fileVariant.fileSize = fileSize;
-                                                       in->variant.fileVariant.scannedFileSize = fileSize;
-                                               }
+       /* Iterate through the objects in each hash entry,
+        * looking at each object.
+        * Make sure it is rooted.
+        */
 
-                                               if (in->variant.fileVariant.shrinkSize > fileSize)
-                                                       in->variant.fileVariant.shrinkSize = fileSize;
+       for (i = 0; i <  YAFFS_NOBJECT_BUCKETS; i++) {
+               ylist_for_each_safe(lh, n, &dev->objectBucket[i].list) {
+                       if (lh) {
+                               obj = ylist_entry(lh, yaffs_Object, hashLink);
+                               parent= obj->parent;
                                
+                               if(yaffs_HasNULLParent(dev,obj)){
+                                       /* These directories are not hanging */
+                                       hanging = 0;
+                               }
+                               else if(!parent || parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
+                                       hanging = 1;
+                               else if(yaffs_HasNULLParent(dev,parent))
+                                       hanging = 0;
+                               else {
+                                       /*
+                                        * Need to follow the parent chain to see if it is hanging.
+                                        */
+                                       hanging = 0;
+                                       depthLimit=100;
 
-                                               break;
-                                       case YAFFS_OBJECT_TYPE_HARDLINK:
-                                               if (!itsUnlinked) {
-                                                       in->variant.hardLinkVariant.equivalentObjectId =
-                                                               equivalentObjectId;
-                                                       in->hardLinks.next =
-                                                               (struct ylist_head *) hardList;
-                                                       hardList = in;
-                                               }
-                                               break;
-                                       case YAFFS_OBJECT_TYPE_DIRECTORY:
-                                               /* Do nothing */
-                                               break;
-                                       case YAFFS_OBJECT_TYPE_SPECIAL:
-                                               /* Do nothing */
-                                               break;
-                                       case YAFFS_OBJECT_TYPE_SYMLINK:
-                                               if (oh) {
-                                                       in->variant.symLinkVariant.alias =
-                                                               yaffs_CloneString(oh->alias);
-                                                       if (!in->variant.symLinkVariant.alias)
-                                                               alloc_failed = 1;
-                                               }
-                                               break;
+                                       while(parent != dev->rootDir &&
+                                               parent->parent &&
+                                               parent->parent->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
+                                               depthLimit > 0){
+                                               parent = parent->parent;
+                                               depthLimit--;
                                        }
-
+                                       if(parent != dev->rootDir)
+                                               hanging = 1;
+                               }
+                               if(hanging){
+                                       T(YAFFS_TRACE_SCAN,
+                                         (TSTR("Hanging object %d moved to lost and found" TENDSTR),
+                                               obj->objectId));
+                                       yaffs_AddObjectToDirectory(dev->lostNFoundDir,obj);
                                }
-
                        }
+               }
+       }
+}
 
-               } /* End of scanning for each chunk */
 
-               if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
-                       /* If we got this far while scanning, then the block is fully allocated. */
-                       state = YAFFS_BLOCK_STATE_FULL;
-               }
+/*
+ * Delete directory contents for cleaning up lost and found.
+ */
+static void yaffs_DeleteDirectoryContents(yaffs_Object *dir)
+{
+       yaffs_Object *obj;
+       struct ylist_head *lh;
+       struct ylist_head *n;
 
+       if(dir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
+               YBUG();
+       
+       ylist_for_each_safe(lh, n, &dir->variant.directoryVariant.children) {
+               if (lh) {
+                       obj = ylist_entry(lh, yaffs_Object, siblings);
+                       if(obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY)
+                               yaffs_DeleteDirectoryContents(obj);
 
-               bi->blockState = state;
+                       T(YAFFS_TRACE_SCAN,
+                               (TSTR("Deleting lost_found object %d" TENDSTR),
+                               obj->objectId));
 
-               /* Now let's see if it was dirty */
-               if (bi->pagesInUse == 0 &&
-                   !bi->hasShrinkHeader &&
-                   bi->blockState == YAFFS_BLOCK_STATE_FULL) {
-                       yaffs_BlockBecameDirty(dev, blk);
+                       /* Need to use UnlinkObject since Delete would not handle
+                        * hardlinked objects correctly.
+                        */
+                       yaffs_UnlinkObject(obj); 
                }
-
        }
-       
-       yaffs_SkipRestOfBlock(dev);
+                       
+}
 
-       if (altBlockIndex)
-               YFREE_ALT(blockIndex);
-       else
-               YFREE(blockIndex);
+static void yaffs_EmptyLostAndFound(yaffs_Device *dev)
+{
+       yaffs_DeleteDirectoryContents(dev->lostNFoundDir);
+}
 
-       /* Ok, we've done all the scanning.
-        * Fix up the hard link chains.
-        * We should now have scanned all the objects, now it's time to add these
-        * hardlinks.
-        */
-       yaffs_HardlinkFixup(dev, hardList);
+static void yaffs_CheckObjectDetailsLoaded(yaffs_Object *in)
+{
+       __u8 *chunkData;
+       yaffs_ObjectHeader *oh;
+       yaffs_Device *dev;
+       yaffs_ExtendedTags tags;
+       int result;
+       int alloc_failed = 0;
 
+       if (!in)
+               return;
 
-       yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
+       dev = in->myDev;
 
-       if (alloc_failed)
-               return YAFFS_FAIL;
+#if 0
+       T(YAFFS_TRACE_SCAN, (TSTR("details for object %d %s loaded" TENDSTR),
+               in->objectId,
+               in->lazyLoaded ? "not yet" : "already"));
+#endif
 
-       T(YAFFS_TRACE_SCAN, (TSTR("yaffs_ScanBackwards ends" TENDSTR)));
+       if (in->lazyLoaded && in->hdrChunk > 0) {
+               in->lazyLoaded = 0;
+               chunkData = yaffs_GetTempBuffer(dev, __LINE__);
 
-       return YAFFS_OK;
+               result = yaffs_ReadChunkWithTagsFromNAND(dev, in->hdrChunk, chunkData, &tags);
+               oh = (yaffs_ObjectHeader *) chunkData;
+
+               in->yst_mode = oh->yst_mode;
+#ifdef CONFIG_YAFFS_WINCE
+               in->win_atime[0] = oh->win_atime[0];
+               in->win_ctime[0] = oh->win_ctime[0];
+               in->win_mtime[0] = oh->win_mtime[0];
+               in->win_atime[1] = oh->win_atime[1];
+               in->win_ctime[1] = oh->win_ctime[1];
+               in->win_mtime[1] = oh->win_mtime[1];
+#else
+               in->yst_uid = oh->yst_uid;
+               in->yst_gid = oh->yst_gid;
+               in->yst_atime = oh->yst_atime;
+               in->yst_mtime = oh->yst_mtime;
+               in->yst_ctime = oh->yst_ctime;
+               in->yst_rdev = oh->yst_rdev;
+
+#endif
+               yaffs_SetObjectName(in, oh->name);
+
+               if (in->variantType == YAFFS_OBJECT_TYPE_SYMLINK) {
+                       in->variant.symLinkVariant.alias =
+                                                   yaffs_CloneString(oh->alias);
+                       if (!in->variant.symLinkVariant.alias)
+                               alloc_failed = 1; /* Not returned to caller */
+               }
+
+               yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
+       }
 }
 
 /*------------------------------  Directory Functions ----------------------------- */
@@ -7310,7 +4997,7 @@ static void yaffs_UpdateParent(yaffs_Object *obj)
                }
 
        } else
-               yaffs_UpdateObjectHeader(obj,NULL,0,0,0);
+               yaffs_UpdateObjectHeader(obj, NULL, 0, 0, 0, NULL);
 }
 
 void yaffs_UpdateDirtyDirectories(yaffs_Device *dev)
@@ -7333,7 +5020,7 @@ void yaffs_UpdateDirtyDirectories(yaffs_Device *dev)
                T(YAFFS_TRACE_BACKGROUND, (TSTR("Update directory %d" TENDSTR), obj->objectId));
 
                if(obj->dirty)
-                       yaffs_UpdateObjectHeader(obj,NULL,0,0,0);
+                       yaffs_UpdateObjectHeader(obj, NULL, 0, 0, 0, NULL);
        }
 }
 
@@ -7357,7 +5044,7 @@ static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj)
        yaffs_VerifyDirectory(parent);
 }
 
-static void yaffs_AddObjectToDirectory(yaffs_Object *directory,
+void yaffs_AddObjectToDirectory(yaffs_Object *directory,
                                        yaffs_Object *obj)
 {
        if (!directory) {
@@ -7664,7 +5351,7 @@ int yaffs_SetAttributes(yaffs_Object *obj, struct iattr *attr)
        if (valid & ATTR_SIZE)
                yaffs_ResizeFile(obj, attr->ia_size);
 
-       yaffs_UpdateObjectHeader(obj, NULL, 1, 0, 0);
+       yaffs_UpdateObjectHeader(obj, NULL, 1, 0, 0, NULL);
 
        return YAFFS_OK;
 
@@ -7697,6 +5384,104 @@ int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr)
 
 #endif
 
+
+static int yaffs_DoXMod(yaffs_Object *obj, int set, const char *name, const void *value, int size, int flags)
+{
+       yaffs_XAttrMod xmod;
+
+       int result;
+
+       xmod.set = set;
+       xmod.name = name;
+       xmod.data = value;
+       xmod.size =  size;
+       xmod.flags = flags;
+       xmod.result = -ENOSPC;
+
+       result = yaffs_UpdateObjectHeader(obj, NULL, 0, 0, 0, &xmod);
+
+       if(result > 0)
+               return xmod.result;
+       else
+               return -ENOSPC;
+}
+
+static int yaffs_ApplyXMod(yaffs_Device *dev, char *buffer, yaffs_XAttrMod *xmod)
+{
+       int retval = 0;
+       int x_offs = sizeof(yaffs_ObjectHeader);
+       int x_size = dev->nDataBytesPerChunk - sizeof(yaffs_ObjectHeader);
+
+       char * x_buffer = buffer + x_offs;
+
+       if(xmod->set)
+               retval = nval_set(x_buffer, x_size, xmod->name, xmod->data, xmod->size, xmod->flags);
+       else
+               retval = nval_del(x_buffer, x_size, xmod->name);
+
+       xmod->result = retval;
+
+       return retval;
+}
+
+static int yaffs_DoXFetch(yaffs_Object *obj, const char *name, void *value, int size)
+{
+       char *buffer = NULL;
+       int result;
+       yaffs_ExtendedTags tags;
+       yaffs_Device *dev = obj->myDev;
+       int x_offs = sizeof(yaffs_ObjectHeader);
+       int x_size = dev->nDataBytesPerChunk - sizeof(yaffs_ObjectHeader);
+
+       __u8 * x_buffer;
+
+       int retval = 0;
+
+       if(obj->hdrChunk < 1)
+               return -ENODATA;
+
+       buffer = yaffs_GetTempBuffer(dev, __LINE__);
+       if(!buffer)
+               return -ENOMEM;
+
+       result = yaffs_ReadChunkWithTagsFromNAND(dev,obj->hdrChunk, buffer, &tags);
+
+       if(result != YAFFS_OK)
+               retval = -ENOENT;
+       else{
+               x_buffer =  buffer + x_offs;
+
+               if(name)
+                       retval = nval_get(x_buffer, x_size, name, value, size);
+               else
+                       retval = nval_list(x_buffer, x_size, value,size);
+       }
+       yaffs_ReleaseTempBuffer(dev,buffer,__LINE__);
+       return retval;
+}
+
+int yaffs_SetXAttribute(yaffs_Object *obj, const char *name, const void * value, int size, int flags)
+{
+       return yaffs_DoXMod(obj, 1, name, value, size, flags);
+}
+
+int yaffs_RemoveXAttribute(yaffs_Object *obj, const char *name)
+{
+       return yaffs_DoXMod(obj, 0, name, NULL, 0, 0);
+}
+
+int yaffs_GetXAttribute(yaffs_Object *obj, const char *name, void *value, int size)
+{
+       return yaffs_DoXFetch(obj, name, value, size);
+}
+
+int yaffs_ListXAttributes(yaffs_Object *obj, char *buffer, int size)
+{
+       return yaffs_DoXFetch(obj, NULL, buffer,size);
+}
+
+
+
 #if 0
 int yaffs_DumpObject(yaffs_Object *obj)
 {
@@ -7912,6 +5697,9 @@ int yaffs_GutsInitialise(yaffs_Device *dev)
        else
                dev->chunkGroupBits = bits - dev->tnodeWidth;
 
+       dev->tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
+       if(dev->tnodeSize < sizeof(yaffs_Tnode))
+               dev->tnodeSize = sizeof(yaffs_Tnode);
 
        dev->chunkGroupSize = 1 << dev->chunkGroupBits;
 
@@ -8001,8 +5789,7 @@ int yaffs_GutsInitialise(yaffs_Device *dev)
        if (!init_failed && !yaffs_InitialiseBlocks(dev))
                init_failed = 1;
 
-       yaffs_InitialiseTnodes(dev);
-       yaffs_InitialiseObjects(dev);
+       yaffs_InitialiseTnodesAndObjects(dev);
 
        if (!init_failed && !yaffs_CreateInitialDirectories(dev))
                init_failed = 1;
@@ -8011,7 +5798,7 @@ int yaffs_GutsInitialise(yaffs_Device *dev)
        if (!init_failed) {
                /* Now scan the flash. */
                if (dev->param.isYaffs2) {
-                       if (yaffs_CheckpointRestore(dev)) {
+                       if (yaffs2_CheckpointRestore(dev)) {
                                yaffs_CheckObjectDetailsLoaded(dev->rootDir);
                                T(YAFFS_TRACE_ALWAYS,
                                  (TSTR("yaffs: restored from checkpoint" TENDSTR)));
@@ -8021,9 +5808,8 @@ int yaffs_GutsInitialise(yaffs_Device *dev)
                                 * and scan backwards.
                                 */
                                yaffs_DeinitialiseBlocks(dev);
-                               yaffs_DeinitialiseTnodes(dev);
-                               yaffs_DeinitialiseObjects(dev);
 
+                               yaffs_DeinitialiseTnodesAndObjects(dev);
 
                                dev->nErasedBlocks = 0;
                                dev->nFreeChunks = 0;
@@ -8036,16 +5822,15 @@ int yaffs_GutsInitialise(yaffs_Device *dev)
                                if (!init_failed && !yaffs_InitialiseBlocks(dev))
                                        init_failed = 1;
 
-                               yaffs_InitialiseTnodes(dev);
-                               yaffs_InitialiseObjects(dev);
+                               yaffs_InitialiseTnodesAndObjects(dev);
 
                                if (!init_failed && !yaffs_CreateInitialDirectories(dev))
                                        init_failed = 1;
 
-                               if (!init_failed && !yaffs_ScanBackwards(dev))
+                               if (!init_failed && !yaffs2_ScanBackwards(dev))
                                        init_failed = 1;
                        }
-               } else if (!yaffs_Scan(dev))
+               } else if (!yaffs1_Scan(dev))
                                init_failed = 1;
 
                yaffs_StripDeletedObjects(dev);
@@ -8077,7 +5862,7 @@ int yaffs_GutsInitialise(yaffs_Device *dev)
 
        /* Clean up any aborted checkpoint data */
        if(!dev->isCheckpointed && dev->blocksInCheckpoint > 0)
-               yaffs_InvalidateCheckpoint(dev);
+               yaffs2_InvalidateCheckpoint(dev);
 
        T(YAFFS_TRACE_TRACING,
          (TSTR("yaffs: yaffs_GutsInitialise() done.\n" TENDSTR)));
@@ -8091,8 +5876,7 @@ void yaffs_Deinitialise(yaffs_Device *dev)
                int i;
 
                yaffs_DeinitialiseBlocks(dev);
-               yaffs_DeinitialiseTnodes(dev);
-               yaffs_DeinitialiseObjects(dev);
+               yaffs_DeinitialiseTnodesAndObjects(dev);
                if (dev->param.nShortOpCaches > 0 &&
                    dev->srCache) {
 
@@ -8174,9 +5958,7 @@ int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev)
        nFree -= ((dev->param.nReservedBlocks + 1) * dev->param.nChunksPerBlock);
 
        /* Now we figure out how much to reserve for the checkpoint and report that... */
-       blocksForCheckpoint = yaffs_CalcCheckpointBlocksRequired(dev) - dev->blocksInCheckpoint;
-       if (blocksForCheckpoint < 0)
-               blocksForCheckpoint = 0;
+       blocksForCheckpoint = yaffs2_CalcCheckpointBlocksRequired(dev);
 
        nFree -= (blocksForCheckpoint * dev->param.nChunksPerBlock);
 
@@ -8189,7 +5971,7 @@ int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev)
 
 static int yaffs_freeVerificationFailures;
 
-static void yaffs_VerifyFreeChunks(yaffs_Device *dev)
+void yaffs_VerifyFreeChunks(yaffs_Device *dev)
 {
        int counted;
        int difference;