Major whitespace/style changes to match Linux checkpatch.pl code style
[yaffs2.git] / yaffs_guts.c
index ea1ffc2..4359db2 100644 (file)
@@ -12,7 +12,7 @@
  */
 
 const char *yaffs_guts_c_version =
-    "$Id: yaffs_guts.c,v 1.80 2009-03-05 21:46:46 charles Exp $";
+    "$Id: yaffs_guts.c,v 1.81 2009-03-06 17:20:51 wookey Exp $";
 
 #include "yportenv.h"
 
@@ -22,7 +22,7 @@ const char *yaffs_guts_c_version =
 #include "yaffs_getblockinfo.h"
 
 #include "yaffs_tagscompat.h"
-#ifndef  CONFIG_YAFFS_USE_OWN_SORT
+#ifndef CONFIG_YAFFS_USE_OWN_SORT
 #include "yaffs_qsort.h"
 #endif
 #include "yaffs_nand.h"
@@ -39,101 +39,102 @@ const char *yaffs_guts_c_version =
 
 
 /* Robustification (if it ever comes about...) */
-static void yaffs_RetireBlock(yaffs_Device * dev, int blockInNAND);
-static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND, int erasedOk);
-static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
-                                    const __u8 * data,
-                                    const yaffs_ExtendedTags * tags);
-static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
-                                   const yaffs_ExtendedTags * tags);
+static void yaffs_RetireBlock(yaffs_Device *dev, int blockInNAND);
+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND,
+               int erasedOk);
+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
+                               const __u8 *data,
+                               const yaffs_ExtendedTags *tags);
+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
+                               const yaffs_ExtendedTags *tags);
 
 /* Other local prototypes */
-static int yaffs_UnlinkObject( 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 void yaffs_RemoveObjectFromDirectory(yaffs_Object * obj);
+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 void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj);
 static int yaffs_CheckStructures(void);
-static int yaffs_DeleteWorker(yaffs_Object * in, yaffs_Tnode * tn, __u32 level,
-                             int chunkOffset, int *limit);
-static int yaffs_DoGenericObjectDeletion(yaffs_Object * in);
+static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level,
+                       int chunkOffset, int *limit);
+static int yaffs_DoGenericObjectDeletion(yaffs_Object *in);
 
-static yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blockNo);
+static yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device *dev, int blockNo);
 
 
 static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
-                                 int chunkInNAND);
+                               int chunkInNAND);
 
-static int yaffs_UnlinkWorker(yaffs_Object * obj);
+static int yaffs_UnlinkWorker(yaffs_Object *obj);
 
-static int yaffs_TagsMatch(const yaffs_ExtendedTags * tags, int objectId,
-                          int chunkInObject);
+static int yaffs_TagsMatch(const yaffs_ExtendedTags *tags, int objectId,
+                       int chunkInObject);
 
-loff_t yaffs_GetFileSize(yaffs_Object * obj);
+loff_t yaffs_GetFileSize(yaffs_Object *obj);
 
-static int yaffs_AllocateChunk(yaffs_Device * dev, int useReserve, yaffs_BlockInfo **blockUsedPtr);
+static int yaffs_AllocateChunk(yaffs_Device *dev, int useReserve,
+                               yaffs_BlockInfo **blockUsedPtr);
 
-static void yaffs_VerifyFreeChunks(yaffs_Device * dev);
+static void yaffs_VerifyFreeChunks(yaffs_Device *dev);
 
 static void yaffs_CheckObjectDetailsLoaded(yaffs_Object *in);
 
 static void yaffs_VerifyDirectory(yaffs_Object *directory);
 #ifdef YAFFS_PARANOID
-static int yaffs_CheckFileSanity(yaffs_Object * in);
+static int yaffs_CheckFileSanity(yaffs_Object *in);
 #else
 #define yaffs_CheckFileSanity(in)
 #endif
 
-static void yaffs_InvalidateWholeChunkCache(yaffs_Object * in);
-static void yaffs_InvalidateChunkCache(yaffs_Object * object, int chunkId);
+static 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);
+static int yaffs_FindChunkInFile(yaffs_Object *in, int chunkInInode,
+                               yaffs_ExtendedTags *tags);
 
-static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos);
-static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device * dev,
-                                         yaffs_FileStructure * fStruct,
-                                         __u32 chunkId);
+static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn,
+               unsigned pos);
+static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev,
+                                       yaffs_FileStructure *fStruct,
+                                       __u32 chunkId);
 
 
 /* Function to calculate chunk and offset */
 
-static void yaffs_AddrToChunk(yaffs_Device *dev, loff_t addr, int *chunkOut, __u32 *offsetOut)
+static void yaffs_AddrToChunk(yaffs_Device *dev, loff_t addr, int *chunkOut,
+               __u32 *offsetOut)
 {
        int chunk;
        __u32 offset;
-       
+
        chunk  = (__u32)(addr >> dev->chunkShift);
-               
-       if(dev->chunkDiv == 1)
-       {
+
+       if (dev->chunkDiv == 1) {
                /* easy power of 2 case */
                offset = (__u32)(addr & dev->chunkMask);
-       }
-       else
-       {
+       } else {
                /* Non power-of-2 case */
-               
+
                loff_t chunkBase;
-               
+
                chunk /= dev->chunkDiv;
-               
+
                chunkBase = ((loff_t)chunk) * dev->nDataBytesPerChunk;
                offset = (__u32)(addr - chunkBase);
        }
@@ -142,79 +143,80 @@ static void yaffs_AddrToChunk(yaffs_Device *dev, loff_t addr, int *chunkOut, __u
        *offsetOut = offset;
 }
 
-/* Function to return the number of shifts for a power of 2 greater than or equal 
- * to the given number
+/* Function to return the number of shifts for a power of 2 greater than or
+ * equal to the given number
  * Note we don't try to cater for all possible numbers and this does not have to
  * be hellishly efficient.
  */
+
 static __u32 ShiftsGE(__u32 x)
 {
        int extraBits;
        int nShifts;
-       
+
        nShifts = extraBits = 0;
-       
-       while(x>1){
-               if(x & 1) extraBits++;
-               x>>=1;
+
+       while (x > 1) {
+               if (x & 1)
+                       extraBits++;
+               x >>= 1;
                nShifts++;
        }
 
-       if(extraBits) 
+       if (extraBits)
                nShifts++;
-               
+
        return nShifts;
 }
 
 /* Function to return the number of shifts to get a 1 in bit 0
  */
+
 static __u32 Shifts(__u32 x)
 {
        int nShifts;
-       
+
        nShifts =  0;
-       
-       if(!x) return 0;
-       
-       while( !(x&1)){
-               x>>=1;
+
+       if (!x)
+               return 0;
+
+       while (!(x&1)) {
+               x >>= 1;
                nShifts++;
        }
-               
+
        return nShifts;
 }
 
 
 
-/* 
+/*
  * Temporary buffer manipulations.
  */
 
-static int yaffs_InitialiseTempBuffers(yaffs_Device *dev)      
+static int yaffs_InitialiseTempBuffers(yaffs_Device *dev)
 {
        int i;
        __u8 *buf = (__u8 *)1;
-               
-       memset(dev->tempBuffer,0,sizeof(dev->tempBuffer));
-               
+
+       memset(dev->tempBuffer, 0, sizeof(dev->tempBuffer));
+
        for (i = 0; buf && i < YAFFS_N_TEMP_BUFFERS; i++) {
                dev->tempBuffer[i].line = 0;    /* not in use */
                dev->tempBuffer[i].buffer = buf =
                    YMALLOC_DMA(dev->totalBytesPerChunk);
        }
-               
+
        return buf ? YAFFS_OK : YAFFS_FAIL;
-       
 }
 
-__u8 *yaffs_GetTempBuffer(yaffs_Device * dev, int lineNo)
+__u8 *yaffs_GetTempBuffer(yaffs_Device *dev, int lineNo)
 {
        int i, j;
 
        dev->tempInUse++;
-       if(dev->tempInUse > dev->maxTemp)
+       if (dev->tempInUse > dev->maxTemp)
                dev->maxTemp = dev->tempInUse;
 
        for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
@@ -249,13 +251,13 @@ __u8 *yaffs_GetTempBuffer(yaffs_Device * dev, int lineNo)
 
 }
 
-void yaffs_ReleaseTempBuffer(yaffs_Device * dev, __u8 * buffer,
+void yaffs_ReleaseTempBuffer(yaffs_Device *dev, __u8 *buffer,
                                    int lineNo)
 {
        int i;
-       
+
        dev->tempInUse--;
-       
+
        for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
                if (dev->tempBuffer[i].buffer == buffer) {
                        dev->tempBuffer[i].line = 0;
@@ -277,27 +279,26 @@ void yaffs_ReleaseTempBuffer(yaffs_Device * dev, __u8 * buffer,
 /*
  * Determine if we have a managed buffer.
  */
-int yaffs_IsManagedTempBuffer(yaffs_Device * dev, const __u8 * buffer)
+int yaffs_IsManagedTempBuffer(yaffs_Device *dev, const __u8 *buffer)
 {
        int i;
+
        for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
                if (dev->tempBuffer[i].buffer == buffer)
                        return 1;
-
        }
 
-    for (i = 0; i < dev->nShortOpCaches; i++) {
-        if( dev->srCache[i].data == buffer )
-            return 1;
-
-    }
+       for (i = 0; i < dev->nShortOpCaches; i++) {
+               if (dev->srCache[i].data == buffer)
+                       return 1;
+       }
 
-    if (buffer == dev->checkpointBuffer)
-      return 1;
+       if (buffer == dev->checkpointBuffer)
+               return 1;
 
-    T(YAFFS_TRACE_ALWAYS,
-         (TSTR("yaffs: unmaged buffer detected.\n" TENDSTR)));
-    return 0;
+       T(YAFFS_TRACE_ALWAYS,
+               (TSTR("yaffs: unmaged buffer detected.\n" TENDSTR)));
+       return 0;
 }
 
 
@@ -306,62 +307,63 @@ int yaffs_IsManagedTempBuffer(yaffs_Device * dev, const __u8 * buffer)
  * Chunk bitmap manipulations
  */
 
-static Y_INLINE __u8 *yaffs_BlockBits(yaffs_Device * dev, int blk)
+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));
+                       (TSTR("**>> yaffs: BlockBits block %d is not valid" TENDSTR),
+                       blk));
                YBUG();
        }
        return dev->chunkBits +
-           (dev->chunkBitmapStride * (blk - dev->internalStartBlock));
+               (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->nChunksPerBlock) {
-          T(YAFFS_TRACE_ERROR,
-           (TSTR("**>> yaffs: Chunk Id (%d:%d) invalid"TENDSTR),blk,chunk));
-           YBUG();
+       if (blk < dev->internalStartBlock || blk > dev->internalEndBlock ||
+                       chunk < 0 || chunk >= dev->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)
+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)
+static Y_INLINE void yaffs_ClearChunkBit(yaffs_Device *dev, int blk, int chunk)
 {
        __u8 *blkBits = yaffs_BlockBits(dev, blk);
 
-       yaffs_VerifyChunkBitId(dev,blk,chunk);
+       yaffs_VerifyChunkBitId(dev, blk, chunk);
 
        blkBits[chunk / 8] &= ~(1 << (chunk & 7));
 }
 
-static Y_INLINE void yaffs_SetChunkBit(yaffs_Device * dev, int blk, int chunk)
+static Y_INLINE void yaffs_SetChunkBit(yaffs_Device *dev, int blk, int chunk)
 {
        __u8 *blkBits = yaffs_BlockBits(dev, blk);
-       
-       yaffs_VerifyChunkBitId(dev,blk,chunk);
+
+       yaffs_VerifyChunkBitId(dev, blk, chunk);
 
        blkBits[chunk / 8] |= (1 << (chunk & 7));
 }
 
-static Y_INLINE int yaffs_CheckChunkBit(yaffs_Device * dev, int blk, int chunk)
+static Y_INLINE int yaffs_CheckChunkBit(yaffs_Device *dev, int blk, int chunk)
 {
        __u8 *blkBits = yaffs_BlockBits(dev, blk);
-       yaffs_VerifyChunkBitId(dev,blk,chunk);
+       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)
+static Y_INLINE int yaffs_StillSomeChunkBits(yaffs_Device *dev, int blk)
 {
        __u8 *blkBits = yaffs_BlockBits(dev, blk);
        int i;
@@ -373,28 +375,28 @@ static Y_INLINE int yaffs_StillSomeChunkBits(yaffs_Device * dev, int blk)
        return 0;
 }
 
-static int yaffs_CountChunkBits(yaffs_Device * dev, int blk)
+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)
+               while (x) {
+                       if (x & 1)
                                n++;
-                       x >>=1;
+                       x >>= 1;
                }
-                       
+
                blkBits++;
        }
        return n;
 }
 
-/* 
+/*
  * Verification code
  */
+
 static int yaffs_SkipVerification(yaffs_Device *dev)
 {
        return !(yaffs_traceMask & (YAFFS_TRACE_VERIFY | YAFFS_TRACE_VERIFY_FULL));
@@ -410,7 +412,7 @@ static int yaffs_SkipNANDVerification(yaffs_Device *dev)
        return !(yaffs_traceMask & (YAFFS_TRACE_VERIFY_NAND));
 }
 
-static const char * blockStateName[] = {
+static const char *blockStateName[] = {
 "Unknown",
 "Needs scanning",
 "Scanning",
@@ -423,65 +425,65 @@ static const char * blockStateName[] = {
 "Dead"
 };
 
-static void yaffs_VerifyBlock(yaffs_Device *dev,yaffs_BlockInfo *bi,int n)
+static void yaffs_VerifyBlock(yaffs_Device *dev, yaffs_BlockInfo *bi, int n)
 {
        int actuallyUsed;
        int inUse;
-       
-       if(yaffs_SkipVerification(dev))
+
+       if (yaffs_SkipVerification(dev))
                return;
-               
+
        /* Report illegal runtime states */
-       if(bi->blockState >= YAFFS_NUMBER_OF_BLOCK_STATES)
-               T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has undefined state %d"TENDSTR),n,bi->blockState));
-               
-       switch(bi->blockState){
-        case YAFFS_BLOCK_STATE_UNKNOWN:
-        case YAFFS_BLOCK_STATE_SCANNING:
-        case YAFFS_BLOCK_STATE_NEEDS_SCANNING:
-               T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has bad run-state %s"TENDSTR),
-               n,blockStateName[bi->blockState]));
+       if (bi->blockState >= YAFFS_NUMBER_OF_BLOCK_STATES)
+               T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has undefined state %d"TENDSTR), n, bi->blockState));
+
+       switch (bi->blockState) {
+       case YAFFS_BLOCK_STATE_UNKNOWN:
+       case YAFFS_BLOCK_STATE_SCANNING:
+       case YAFFS_BLOCK_STATE_NEEDS_SCANNING:
+               T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has bad run-state %s"TENDSTR),
+               n, blockStateName[bi->blockState]));
        }
-       
+
        /* Check pages in use and soft deletions are legal */
-       
+
        actuallyUsed = bi->pagesInUse - bi->softDeletions;
-       
-       if(bi->pagesInUse < 0 || bi->pagesInUse > dev->nChunksPerBlock ||
+
+       if (bi->pagesInUse < 0 || bi->pagesInUse > dev->nChunksPerBlock ||
           bi->softDeletions < 0 || bi->softDeletions > dev->nChunksPerBlock ||
           actuallyUsed < 0 || actuallyUsed > dev->nChunksPerBlock)
-               T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has illegal values pagesInUsed %d softDeletions %d"TENDSTR),
-               n,bi->pagesInUse,bi->softDeletions));
-       
-               
+               T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has illegal values pagesInUsed %d softDeletions %d"TENDSTR),
+               n, bi->pagesInUse, bi->softDeletions));
+
+
        /* Check chunk bitmap legal */
-       inUse = yaffs_CountChunkBits(dev,n);
-       if(inUse != bi->pagesInUse)
-               T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has inconsistent values pagesInUse %d counted chunk bits %d"TENDSTR),
-                       n,bi->pagesInUse,inUse));
-       
+       inUse = yaffs_CountChunkBits(dev, n);
+       if (inUse != bi->pagesInUse)
+               T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has inconsistent values pagesInUse %d counted chunk bits %d"TENDSTR),
+                       n, bi->pagesInUse, inUse));
+
        /* Check that the sequence number is valid.
-        * Ten million is legal, but is very unlikely 
+        * Ten million is legal, but is very unlikely
         */
-       if(dev->isYaffs2 && 
+       if (dev->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));
-               
+          (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));
 }
 
-static void yaffs_VerifyCollectedBlock(yaffs_Device *dev,yaffs_BlockInfo *bi,int n)
+static void yaffs_VerifyCollectedBlock(yaffs_Device *dev, yaffs_BlockInfo *bi,
+               int n)
 {
-       yaffs_VerifyBlock(dev,bi,n);
-       
+       yaffs_VerifyBlock(dev, bi, n);
+
        /* After collection the block should be in the erased state */
        /* This will need to change if we do partial gc */
-       
-       if(bi->blockState != YAFFS_BLOCK_STATE_COLLECTING &&
-          bi->blockState != YAFFS_BLOCK_STATE_EMPTY){
-               T(YAFFS_TRACE_ERROR,(TSTR("Block %d is in state %d after gc, should be erased"TENDSTR),
-                       n,bi->blockState));
+
+       if (bi->blockState != YAFFS_BLOCK_STATE_COLLECTING &&
+                       bi->blockState != YAFFS_BLOCK_STATE_EMPTY) {
+               T(YAFFS_TRACE_ERROR, (TSTR("Block %d is in state %d after gc, should be erased"TENDSTR),
+                       n, bi->blockState));
        }
 }
 
@@ -490,53 +492,50 @@ static void yaffs_VerifyBlocks(yaffs_Device *dev)
        int i;
        int nBlocksPerState[YAFFS_NUMBER_OF_BLOCK_STATES];
        int nIllegalBlockStates = 0;
-       
 
-       if(yaffs_SkipVerification(dev))
+       if (yaffs_SkipVerification(dev))
                return;
 
-       memset(nBlocksPerState,0,sizeof(nBlocksPerState));
+       memset(nBlocksPerState, 0, sizeof(nBlocksPerState));
 
-               
-       for(i = dev->internalStartBlock; i <= dev->internalEndBlock; i++){
-               yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
-               yaffs_VerifyBlock(dev,bi,i);
+       for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
+               yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, i);
+               yaffs_VerifyBlock(dev, bi, i);
 
-               if(bi->blockState < YAFFS_NUMBER_OF_BLOCK_STATES)
+               if (bi->blockState < YAFFS_NUMBER_OF_BLOCK_STATES)
                        nBlocksPerState[bi->blockState]++;
                else
                        nIllegalBlockStates++;
-                                       
        }
-       
-       T(YAFFS_TRACE_VERIFY,(TSTR(""TENDSTR)));
-       T(YAFFS_TRACE_VERIFY,(TSTR("Block summary"TENDSTR)));
-       
-       T(YAFFS_TRACE_VERIFY,(TSTR("%d blocks have illegal states"TENDSTR),nIllegalBlockStates));
-       if(nBlocksPerState[YAFFS_BLOCK_STATE_ALLOCATING] > 1)
-               T(YAFFS_TRACE_VERIFY,(TSTR("Too many allocating blocks"TENDSTR)));
 
-       for(i = 0; i < YAFFS_NUMBER_OF_BLOCK_STATES; i++)
+       T(YAFFS_TRACE_VERIFY, (TSTR(""TENDSTR)));
+       T(YAFFS_TRACE_VERIFY, (TSTR("Block summary"TENDSTR)));
+
+       T(YAFFS_TRACE_VERIFY, (TSTR("%d blocks have illegal states"TENDSTR), nIllegalBlockStates));
+       if (nBlocksPerState[YAFFS_BLOCK_STATE_ALLOCATING] > 1)
+               T(YAFFS_TRACE_VERIFY, (TSTR("Too many allocating blocks"TENDSTR)));
+
+       for (i = 0; i < YAFFS_NUMBER_OF_BLOCK_STATES; i++)
                T(YAFFS_TRACE_VERIFY,
                  (TSTR("%s %d blocks"TENDSTR),
-                 blockStateName[i],nBlocksPerState[i]));
-       
-       if(dev->blocksInCheckpoint != nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT])
+                 blockStateName[i], nBlocksPerState[i]));
+
+       if (dev->blocksInCheckpoint != nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT])
                T(YAFFS_TRACE_VERIFY,
                 (TSTR("Checkpoint block count wrong dev %d count %d"TENDSTR),
                 dev->blocksInCheckpoint, nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT]));
-                
-       if(dev->nErasedBlocks != nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY])
+
+       if (dev->nErasedBlocks != nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY])
                T(YAFFS_TRACE_VERIFY,
                 (TSTR("Erased block count wrong dev %d count %d"TENDSTR),
                 dev->nErasedBlocks, nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY]));
-                
-       if(nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING] > 1)
+
+       if (nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING] > 1)
                T(YAFFS_TRACE_VERIFY,
                 (TSTR("Too many collecting blocks %d (max is 1)"TENDSTR),
                 nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING]));
 
-       T(YAFFS_TRACE_VERIFY,(TSTR(""TENDSTR)));
+       T(YAFFS_TRACE_VERIFY, (TSTR(""TENDSTR)));
 
 }
 
@@ -546,64 +545,62 @@ static void yaffs_VerifyBlocks(yaffs_Device *dev)
  */
 static void yaffs_VerifyObjectHeader(yaffs_Object *obj, yaffs_ObjectHeader *oh, yaffs_ExtendedTags *tags, int parentCheck)
 {
-       if(obj && yaffs_SkipVerification(obj->myDev))
+       if (obj && yaffs_SkipVerification(obj->myDev))
                return;
-               
-       if(!(tags && obj && oh)){
-               T(YAFFS_TRACE_VERIFY,
-                               (TSTR("Verifying object header tags %x obj %x oh %x"TENDSTR),
-                               (__u32)tags,(__u32)obj,(__u32)oh));
+
+       if (!(tags && obj && oh)) {
+               T(YAFFS_TRACE_VERIFY,
+                               (TSTR("Verifying object header tags %x obj %x oh %x"TENDSTR),
+                               (__u32)tags, (__u32)obj, (__u32)oh));
                return;
        }
-       
-       if(oh->type <= YAFFS_OBJECT_TYPE_UNKNOWN ||
-          oh->type > YAFFS_OBJECT_TYPE_MAX)
-               T(YAFFS_TRACE_VERIFY,
-                (TSTR("Obj %d header type is illegal value 0x%x"TENDSTR),
-                tags->objectId, oh->type));
 
-       if(tags->objectId != obj->objectId)
-               T(YAFFS_TRACE_VERIFY,
-                (TSTR("Obj %d header mismatch objectId %d"TENDSTR),
-                tags->objectId, obj->objectId));
+       if (oh->type <= YAFFS_OBJECT_TYPE_UNKNOWN ||
+                       oh->type > YAFFS_OBJECT_TYPE_MAX)
+               T(YAFFS_TRACE_VERIFY,
+                       (TSTR("Obj %d header type is illegal value 0x%x"TENDSTR),
+                       tags->objectId, oh->type));
+
+       if (tags->objectId != obj->objectId)
+               T(YAFFS_TRACE_VERIFY,
+                       (TSTR("Obj %d header mismatch objectId %d"TENDSTR),
+                       tags->objectId, obj->objectId));
 
 
        /*
         * Check that the object's parent ids match if parentCheck requested.
-        * 
+        *
         * Tests do not apply to the root object.
         */
-       
-       if(parentCheck && tags->objectId > 1 && !obj->parent)
-               T(YAFFS_TRACE_VERIFY,
-                (TSTR("Obj %d header mismatch parentId %d obj->parent is NULL"TENDSTR),
-                tags->objectId, oh->parentObjectId));
-               
-       
-       if(parentCheck && obj->parent &&
-          oh->parentObjectId != obj->parent->objectId && 
-          (oh->parentObjectId != YAFFS_OBJECTID_UNLINKED ||
-           obj->parent->objectId != YAFFS_OBJECTID_DELETED))
-               T(YAFFS_TRACE_VERIFY,
-                (TSTR("Obj %d header mismatch parentId %d parentObjectId %d"TENDSTR),
-                tags->objectId, oh->parentObjectId, obj->parent->objectId));
-               
-       
-       if(tags->objectId > 1 && oh->name[0] == 0) /* Null name */
+
+       if (parentCheck && tags->objectId > 1 && !obj->parent)
+               T(YAFFS_TRACE_VERIFY,
+                       (TSTR("Obj %d header mismatch parentId %d obj->parent is NULL"TENDSTR),
+                       tags->objectId, oh->parentObjectId));
+
+       if (parentCheck && obj->parent &&
+                       oh->parentObjectId != obj->parent->objectId &&
+                       (oh->parentObjectId != YAFFS_OBJECTID_UNLINKED ||
+                       obj->parent->objectId != YAFFS_OBJECTID_DELETED))
+               T(YAFFS_TRACE_VERIFY,
+                       (TSTR("Obj %d header mismatch parentId %d parentObjectId %d"TENDSTR),
+                       tags->objectId, oh->parentObjectId, obj->parent->objectId));
+
+       if (tags->objectId > 1 && oh->name[0] == 0) /* Null name */
                T(YAFFS_TRACE_VERIFY,
-               (TSTR("Obj %d header name is NULL"TENDSTR),
-                obj->objectId));
+                       (TSTR("Obj %d header name is NULL"TENDSTR),
+                       obj->objectId));
 
-       if(tags->objectId > 1 && ((__u8)(oh->name[0])) == 0xff) /* Trashed name */
+       if (tags->objectId > 1 && ((__u8)(oh->name[0])) == 0xff) /* Trashed name */
                T(YAFFS_TRACE_VERIFY,
-               (TSTR("Obj %d header name is 0xFF"TENDSTR),
-                obj->objectId));
+                       (TSTR("Obj %d header name is 0xFF"TENDSTR),
+                       obj->objectId));
 }
 
 
 
-static int yaffs_VerifyTnodeWorker(yaffs_Object * obj, yaffs_Tnode * tn,
-                                       __u32 level, int chunkOffset)
+static int yaffs_VerifyTnodeWorker(yaffs_Object *obj, yaffs_Tnode *tn,
+                                       __u32 level, int chunkOffset)
 {
        int i;
        yaffs_Device *dev = obj->myDev;
@@ -612,7 +609,7 @@ static int yaffs_VerifyTnodeWorker(yaffs_Object * obj, yaffs_Tnode * tn,
        if (tn) {
                if (level > 0) {
 
-                       for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++){
+                       for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++) {
                                if (tn->internal[i]) {
                                        ok = yaffs_VerifyTnodeWorker(obj,
                                                        tn->internal[i],
@@ -623,17 +620,17 @@ static int yaffs_VerifyTnodeWorker(yaffs_Object * obj, yaffs_Tnode * tn,
                } else if (level == 0) {
                        yaffs_ExtendedTags tags;
                        __u32 objectId = obj->objectId;
-                       
+
                        chunkOffset <<=  YAFFS_TNODES_LEVEL0_BITS;
-                       
-                       for(i = 0; i < YAFFS_NTNODES_LEVEL0; i++){
-                               __u32 theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
-                               
-                               if(theChunk > 0){
+
+                       for (i = 0; i < YAFFS_NTNODES_LEVEL0; i++) {
+                               __u32 theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
+
+                               if (theChunk > 0) {
                                        /* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),tags.objectId,tags.chunkId,theChunk)); */
-                                       yaffs_ReadChunkWithTagsFromNAND(dev,theChunk,NULL, &tags);
-                                       if(tags.objectId != objectId || tags.chunkId != chunkOffset){
-                                               T(~0,(TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
+                                       yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL, &tags);
+                                       if (tags.objectId != objectId || tags.chunkId != chunkOffset) {
+                                               T(~0, (TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
                                                        objectId, chunkOffset, theChunk,
                                                        tags.objectId, tags.chunkId));
                                        }
@@ -659,107 +656,105 @@ static void yaffs_VerifyFile(yaffs_Object *obj)
        yaffs_ExtendedTags tags;
        yaffs_Tnode *tn;
        __u32 objectId;
-       
-       if(!obj)
+
+       if (!obj)
                return;
 
-       if(yaffs_SkipVerification(obj->myDev))
+       if (yaffs_SkipVerification(obj->myDev))
                return;
-       
+
        dev = obj->myDev;
        objectId = obj->objectId;
-       
+
        /* Check file size is consistent with tnode depth */
        lastChunk =  obj->variant.fileVariant.fileSize / dev->nDataBytesPerChunk + 1;
        x = lastChunk >> YAFFS_TNODES_LEVEL0_BITS;
        requiredTallness = 0;
-       while (x> 0) {
+       while (x > 0) {
                x >>= YAFFS_TNODES_INTERNAL_BITS;
                requiredTallness++;
        }
-       
+
        actualTallness = obj->variant.fileVariant.topLevel;
-       
-       if(requiredTallness > actualTallness )
+
+       if (requiredTallness > actualTallness)
                T(YAFFS_TRACE_VERIFY,
                (TSTR("Obj %d had tnode tallness %d, needs to be %d"TENDSTR),
-                obj->objectId,actualTallness, requiredTallness));
-       
-       
-       /* Check that the chunks in the tnode tree are all correct. 
+                obj->objectId, actualTallness, requiredTallness));
+
+
+       /* Check that the chunks in the tnode tree are all correct.
         * We do this by scanning through the tnode tree and
         * checking the tags for every chunk match.
         */
 
-       if(yaffs_SkipNANDVerification(dev))
+       if (yaffs_SkipNANDVerification(dev))
                return;
-               
-       for(i = 1; i <= lastChunk; i++){
-               tn = yaffs_FindLevel0Tnode(dev, &obj->variant.fileVariant,i);
+
+       for (i = 1; i <= lastChunk; i++) {
+               tn = yaffs_FindLevel0Tnode(dev, &obj->variant.fileVariant, i);
 
                if (tn) {
-                       __u32 theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
-                       if(theChunk > 0){
+                       __u32 theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
+                       if (theChunk > 0) {
                                /* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),objectId,i,theChunk)); */
-                               yaffs_ReadChunkWithTagsFromNAND(dev,theChunk,NULL, &tags);
-                               if(tags.objectId != objectId || tags.chunkId != i){
-                                       T(~0,(TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
+                               yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL, &tags);
+                               if (tags.objectId != objectId || tags.chunkId != i) {
+                                       T(~0, (TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
                                                objectId, i, theChunk,
                                                tags.objectId, tags.chunkId));
                                }
                        }
                }
-
        }
-
 }
 
 
 static void yaffs_VerifyHardLink(yaffs_Object *obj)
 {
-       if(obj && yaffs_SkipVerification(obj->myDev))
+       if (obj && yaffs_SkipVerification(obj->myDev))
                return;
-               
+
        /* Verify sane equivalent object */
 }
 
 static void yaffs_VerifySymlink(yaffs_Object *obj)
 {
-       if(obj && yaffs_SkipVerification(obj->myDev))
+       if (obj && yaffs_SkipVerification(obj->myDev))
                return;
-               
+
        /* Verify symlink string */
 }
 
 static void yaffs_VerifySpecial(yaffs_Object *obj)
 {
-       if(obj && yaffs_SkipVerification(obj->myDev))
+       if (obj && yaffs_SkipVerification(obj->myDev))
                return;
 }
 
 static void yaffs_VerifyObject(yaffs_Object *obj)
 {
        yaffs_Device *dev;
-       
+
        __u32 chunkMin;
        __u32 chunkMax;
-       
+
        __u32 chunkIdOk;
        __u32 chunkInRange;
        __u32 chunkShouldNotBeDeleted;
-       __u32 chunkValid; 
-       
-       if(!obj)
+       __u32 chunkValid;
+
+       if (!obj)
                return;
-               
-       if(obj->beingCreated)
+
+       if (obj->beingCreated)
                return;
-       
+
        dev = obj->myDev;
-       
-       if(yaffs_SkipVerification(dev))
+
+       if (yaffs_SkipVerification(dev))
                return;
-               
+
        /* Check sane object header chunk */
 
        chunkMin = dev->internalStartBlock * dev->nChunksPerBlock;
@@ -767,51 +762,52 @@ static void yaffs_VerifyObject(yaffs_Object *obj)
 
        chunkInRange = (((unsigned)(obj->hdrChunk)) >= chunkMin && ((unsigned)(obj->hdrChunk)) <= chunkMax);
        chunkIdOk = chunkInRange || obj->hdrChunk == 0;
-       chunkValid  =  chunkInRange &&
+       chunkValid = chunkInRange &&
                        yaffs_CheckChunkBit(dev,
-                                           obj->hdrChunk / dev->nChunksPerBlock,
-                                           obj->hdrChunk % dev->nChunksPerBlock);
+                                       obj->hdrChunk / dev->nChunksPerBlock,
+                                       obj->hdrChunk % dev->nChunksPerBlock);
        chunkShouldNotBeDeleted = chunkInRange && !chunkValid;
 
-       if(!obj->fake &&
-           (!chunkIdOk || chunkShouldNotBeDeleted)) {
-          T(YAFFS_TRACE_VERIFY,
-          (TSTR("Obj %d has chunkId %d %s %s"TENDSTR),
-          obj->objectId,obj->hdrChunk,
-          chunkIdOk ? "" : ",out of range",
-          chunkShouldNotBeDeleted ? ",marked as deleted" : ""));
+       if (!obj->fake &&
+                       (!chunkIdOk || chunkShouldNotBeDeleted)) {
+               T(YAFFS_TRACE_VERIFY,
+                       (TSTR("Obj %d has chunkId %d %s %s"TENDSTR),
+                       obj->objectId, obj->hdrChunk,
+                       chunkIdOk ? "" : ",out of range",
+                       chunkShouldNotBeDeleted ? ",marked as deleted" : ""));
        }
-       
-       if(chunkValid &&!yaffs_SkipNANDVerification(dev)) {
+
+       if (chunkValid && !yaffs_SkipNANDVerification(dev)) {
                yaffs_ExtendedTags tags;
                yaffs_ObjectHeader *oh;
-               __u8 *buffer = yaffs_GetTempBuffer(dev,__LINE__);
-               
+               __u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
+
                oh = (yaffs_ObjectHeader *)buffer;
 
-               yaffs_ReadChunkWithTagsFromNAND(dev, obj->hdrChunk,buffer, &tags);
+               yaffs_ReadChunkWithTagsFromNAND(dev, obj->hdrChunk, buffer,
+                               &tags);
+
+               yaffs_VerifyObjectHeader(obj, oh, &tags, 1);
 
-               yaffs_VerifyObjectHeader(obj,oh,&tags,1);
-               
-               yaffs_ReleaseTempBuffer(dev,buffer,__LINE__);
+               yaffs_ReleaseTempBuffer(dev, buffer, __LINE__);
        }
-       
+
        /* Verify it has a parent */
-       if(obj && !obj->fake &&
-          (!obj->parent || obj->parent->myDev != dev)){
-          T(YAFFS_TRACE_VERIFY,
-          (TSTR("Obj %d has parent pointer %p which does not look like an object"TENDSTR),
-          obj->objectId,obj->parent));    
+       if (obj && !obj->fake &&
+                       (!obj->parent || obj->parent->myDev != dev)) {
+               T(YAFFS_TRACE_VERIFY,
+                       (TSTR("Obj %d has parent pointer %p which does not look like an object"TENDSTR),
+                       obj->objectId, obj->parent));
        }
-       
+
        /* Verify parent is a directory */
-       if(obj->parent && obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY){
-          T(YAFFS_TRACE_VERIFY,
-          (TSTR("Obj %d's parent is not a directory (type %d)"TENDSTR),
-          obj->objectId,obj->parent->variantType));       
+       if (obj->parent && obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
+               T(YAFFS_TRACE_VERIFY,
+                       (TSTR("Obj %d's parent is not a directory (type %d)"TENDSTR),
+                       obj->objectId, obj->parent->variantType));
        }
-       
-       switch(obj->variantType){
+
+       switch (obj->variantType) {
        case YAFFS_OBJECT_TYPE_FILE:
                yaffs_VerifyFile(obj);
                break;
@@ -831,57 +827,54 @@ static void yaffs_VerifyObject(yaffs_Object *obj)
        default:
                T(YAFFS_TRACE_VERIFY,
                (TSTR("Obj %d has illegaltype %d"TENDSTR),
-               obj->objectId,obj->variantType));          
+               obj->objectId, obj->variantType));
                break;
        }
-       
-       
 }
 
 static void yaffs_VerifyObjects(yaffs_Device *dev)
 {
-        yaffs_Object *obj;
-        int i;
-        struct ylist_head *lh;
+       yaffs_Object *obj;
+       int i;
+       struct ylist_head *lh;
 
-        if(yaffs_SkipVerification(dev))
-                return;
-       
-        /* Iterate through the objects in each hash entry */
-         
-         for(i = 0; i <  YAFFS_NOBJECT_BUCKETS; i++){
-                ylist_for_each(lh, &dev->objectBucket[i].list) {
-                        if (lh) {
-                                obj = ylist_entry(lh, yaffs_Object, hashLink);
-                                yaffs_VerifyObject(obj);
-                        }
-                }
-        }
+       if (yaffs_SkipVerification(dev))
+               return;
+
+       /* Iterate through the objects in each hash entry */
 
+       for (i = 0; i <  YAFFS_NOBJECT_BUCKETS; i++) {
+               ylist_for_each(lh, &dev->objectBucket[i].list) {
+                       if (lh) {
+                               obj = ylist_entry(lh, yaffs_Object, hashLink);
+                               yaffs_VerifyObject(obj);
+                       }
+               }
+       }
 }
 
 
 /*
  *  Simple hash function. Needs to have a reasonable spread
  */
+
 static Y_INLINE int yaffs_HashFunction(int n)
 {
        n = abs(n);
-       return (n % YAFFS_NOBJECT_BUCKETS);
+       return n % YAFFS_NOBJECT_BUCKETS;
 }
 
 /*
  * Access functions to useful fake objects.
  * Note that root might have a presence in NAND if permissions are set.
  */
-yaffs_Object *yaffs_Root(yaffs_Device * dev)
+
+yaffs_Object *yaffs_Root(yaffs_Device *dev)
 {
        return dev->rootDir;
 }
 
-yaffs_Object *yaffs_LostNFound(yaffs_Device * dev)
+yaffs_Object *yaffs_LostNFound(yaffs_Device *dev)
 {
        return dev->lostNFoundDir;
 }
@@ -890,8 +883,8 @@ yaffs_Object *yaffs_LostNFound(yaffs_Device * dev)
 /*
  *  Erased NAND checking functions
  */
-int yaffs_CheckFF(__u8 * buffer, int nBytes)
+
+int yaffs_CheckFF(__u8 *buffer, int nBytes)
 {
        /* Horrible, slow implementation */
        while (nBytes--) {
@@ -903,19 +896,17 @@ int yaffs_CheckFF(__u8 * buffer, int nBytes)
 }
 
 static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
-                                 int chunkInNAND)
+                               int chunkInNAND)
 {
-
        int retval = YAFFS_OK;
        __u8 *data = yaffs_GetTempBuffer(dev, __LINE__);
        yaffs_ExtendedTags tags;
        int result;
 
        result = yaffs_ReadChunkWithTagsFromNAND(dev, chunkInNAND, data, &tags);
-       
-       if(tags.eccResult > YAFFS_ECC_RESULT_NO_ERROR)
+
+       if (tags.eccResult > YAFFS_ECC_RESULT_NO_ERROR)
                retval = YAFFS_FAIL;
-               
 
        if (!yaffs_CheckFF(data, dev->nDataBytesPerChunk) || tags.chunkUsed) {
                T(YAFFS_TRACE_NANDACCESS,
@@ -930,9 +921,9 @@ static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
 }
 
 static int yaffs_WriteNewChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev,
-                                            const __u8 * data,
-                                            yaffs_ExtendedTags * tags,
-                                            int useReserve)
+                                       const __u8 *data,
+                                       yaffs_ExtendedTags *tags,
+                                       int useReserve)
 {
        int attempts = 0;
        int writeOk = 0;
@@ -1005,10 +996,10 @@ static int yaffs_WriteNewChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev,
                /* Copy the data into the robustification buffer */
                yaffs_HandleWriteChunkOk(dev, chunk, data, tags);
 
-       } while (writeOk != YAFFS_OK && 
-               (yaffs_wr_attempts <= 0 || attempts <= yaffs_wr_attempts));
-       
-       if(!writeOk)
+       } while (writeOk != YAFFS_OK &&
+               (yaffs_wr_attempts <= 0 || attempts <= yaffs_wr_attempts));
+
+       if (!writeOk)
                chunk = -1;
 
        if (attempts > 1) {
@@ -1025,20 +1016,19 @@ static int yaffs_WriteNewChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev,
 /*
  * Block retiring for handling a broken block.
  */
-static void yaffs_RetireBlock(yaffs_Device * dev, int blockInNAND)
+
+static void yaffs_RetireBlock(yaffs_Device *dev, int blockInNAND)
 {
        yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockInNAND);
 
        yaffs_InvalidateCheckpoint(dev);
-       
+
        if (yaffs_MarkBlockBad(dev, blockInNAND) != YAFFS_OK) {
                if (yaffs_EraseBlockInNAND(dev, blockInNAND) != YAFFS_OK) {
                        T(YAFFS_TRACE_ALWAYS, (TSTR(
                                "yaffs: Failed to mark bad and erase block %d"
                                TENDSTR), blockInNAND));
-               }
-               else {
+               } else {
                        yaffs_ExtendedTags tags;
                        int chunkId = blockInNAND * dev->nChunksPerBlock;
 
@@ -1048,7 +1038,7 @@ static void yaffs_RetireBlock(yaffs_Device * dev, int blockInNAND)
                        yaffs_InitialiseTags(&tags);
                        tags.sequenceNumber = YAFFS_SEQUENCE_BAD_BLOCK;
                        if (dev->writeChunkWithTagsToNAND(dev, chunkId -
-                           dev->chunkOffset, buffer, &tags) != YAFFS_OK)
+                               dev->chunkOffset, buffer, &tags) != YAFFS_OK)
                                T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: Failed to "
                                        TCONT("write bad block marker to block %d")
                                        TENDSTR), blockInNAND));
@@ -1068,60 +1058,56 @@ static void yaffs_RetireBlock(yaffs_Device * dev, int blockInNAND)
  * Functions for robustisizing TODO
  *
  */
-static void yaffs_HandleWriteChunkOk(yaffs_Device * dev, int chunkInNAND,
-                                    const __u8 * data,
-                                    const yaffs_ExtendedTags * tags)
+
+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev, int chunkInNAND,
+                               const __u8 *data,
+                               const yaffs_ExtendedTags *tags)
 {
 }
 
-static void yaffs_HandleUpdateChunk(yaffs_Device * dev, int chunkInNAND,
-                                   const yaffs_ExtendedTags * tags)
+static void yaffs_HandleUpdateChunk(yaffs_Device *dev, int chunkInNAND,
+                               const yaffs_ExtendedTags *tags)
 {
 }
 
 void yaffs_HandleChunkError(yaffs_Device *dev, yaffs_BlockInfo *bi)
 {
-       if(!bi->gcPrioritise){
+       if (!bi->gcPrioritise) {
                bi->gcPrioritise = 1;
                dev->hasPendingPrioritisedGCs = 1;
-               bi->chunkErrorStrikes ++;
-               
-               if(bi->chunkErrorStrikes > 3){
+               bi->chunkErrorStrikes++;
+
+               if (bi->chunkErrorStrikes > 3) {
                        bi->needsRetiring = 1; /* Too many stikes, so retire this */
                        T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: Block struck out" TENDSTR)));
 
                }
-               
        }
 }
 
-static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND, int erasedOk)
+static void yaffs_HandleWriteChunkError(yaffs_Device *dev, int chunkInNAND,
+               int erasedOk)
 {
-
        int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
        yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockInNAND);
 
-       yaffs_HandleChunkError(dev,bi);
-               
-       
-       if(erasedOk ) {
+       yaffs_HandleChunkError(dev, bi);
+
+       if (erasedOk) {
                /* Was an actual write failure, so mark the block for retirement  */
                bi->needsRetiring = 1;
                T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
                  (TSTR("**>> Block %d needs retiring" TENDSTR), blockInNAND));
-
-               
        }
-       
+
        /* Delete the chunk */
        yaffs_DeleteChunk(dev, chunkInNAND, 1, __LINE__);
 }
 
 
-/*---------------- Name handling functions ------------*/ 
+/*---------------- Name handling functions ------------*/
 
-static __u16 yaffs_CalcNameSum(const YCHAR * name)
+static __u16 yaffs_CalcNameSum(const YCHAR *name)
 {
        __u16 sum = 0;
        __u16 i = 1;
@@ -1142,10 +1128,10 @@ static __u16 yaffs_CalcNameSum(const YCHAR * name)
        return sum;
 }
 
-static void yaffs_SetObjectName(yaffs_Object * obj, const YCHAR * name)
+static 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)); 
+       memset(obj->shortName, 0, sizeof (YCHAR) * (YAFFS_SHORT_NAME_LENGTH+1));
        if (name && yaffs_strlen(name) <= YAFFS_SHORT_NAME_LENGTH) {
                yaffs_strcpy(obj->shortName, name);
        } else {
@@ -1161,13 +1147,13 @@ static void yaffs_SetObjectName(yaffs_Object * obj, const YCHAR * name)
  * The list is hooked together using the first pointer
  * 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 int yaffs_CreateTnodes(yaffs_Device * dev, int nTnodes)
+static int yaffs_CreateTnodes(yaffs_Device *dev, int nTnodes)
 {
        int i;
        int tnodeSize;
@@ -1179,14 +1165,13 @@ static int yaffs_CreateTnodes(yaffs_Device * dev, int nTnodes)
 
        if (nTnodes < 1)
                return YAFFS_OK;
-               
+
        /* 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))
+       if (tnodeSize < sizeof(yaffs_Tnode))
                tnodeSize = sizeof(yaffs_Tnode);
-               
 
        /* make these things */
 
@@ -1195,7 +1180,7 @@ static int yaffs_CreateTnodes(yaffs_Device * dev, int nTnodes)
 
        if (!newTnodes) {
                T(YAFFS_TRACE_ERROR,
-                 (TSTR("yaffs: Could not allocate Tnodes" TENDSTR)));
+                       (TSTR("yaffs: Could not allocate Tnodes" TENDSTR)));
                return YAFFS_FAIL;
        }
 
@@ -1215,12 +1200,12 @@ static int yaffs_CreateTnodes(yaffs_Device * dev, int nTnodes)
        dev->freeTnodes = newTnodes;
 #else
        /* New hookup for wide tnodes */
-       for(i = 0; i < nTnodes -1; i++) {
+       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;
@@ -1235,14 +1220,13 @@ static int yaffs_CreateTnodes(yaffs_Device * dev, int nTnodes)
         * 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;
@@ -1256,7 +1240,7 @@ static int yaffs_CreateTnodes(yaffs_Device * dev, int nTnodes)
 
 /* GetTnode gets us a clean tnode. Tries to make allocate more if we run out */
 
-static yaffs_Tnode *yaffs_GetTnodeRaw(yaffs_Device * dev)
+static yaffs_Tnode *yaffs_GetTnodeRaw(yaffs_Device *dev)
 {
        yaffs_Tnode *tn = NULL;
 
@@ -1283,22 +1267,22 @@ static yaffs_Tnode *yaffs_GetTnodeRaw(yaffs_Device * dev)
        return tn;
 }
 
-static yaffs_Tnode *yaffs_GetTnode(yaffs_Device * dev)
+static yaffs_Tnode *yaffs_GetTnode(yaffs_Device *dev)
 {
        yaffs_Tnode *tn = yaffs_GetTnodeRaw(dev);
        int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
 
-       if(tnodeSize < sizeof(yaffs_Tnode))
+       if (tnodeSize < sizeof(yaffs_Tnode))
                tnodeSize = sizeof(yaffs_Tnode);
-       
-       if(tn)
+
+       if (tn)
                memset(tn, 0, tnodeSize);
 
-       return tn;      
+       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)
+static void yaffs_FreeTnode(yaffs_Device *dev, yaffs_Tnode *tn)
 {
        if (tn) {
 #ifdef CONFIG_YAFFS_TNODE_LIST_DEBUG
@@ -1314,10 +1298,9 @@ static void yaffs_FreeTnode(yaffs_Device * dev, yaffs_Tnode * tn)
                dev->nFreeTnodes++;
        }
        dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
-       
 }
 
-static void yaffs_DeinitialiseTnodes(yaffs_Device * dev)
+static void yaffs_DeinitialiseTnodes(yaffs_Device *dev)
 {
        /* Free the list of allocated tnodes */
        yaffs_TnodeList *tmp;
@@ -1335,71 +1318,72 @@ static void yaffs_DeinitialiseTnodes(yaffs_Device * dev)
        dev->nFreeTnodes = 0;
 }
 
-static void yaffs_InitialiseTnodes(yaffs_Device * dev)
+static void yaffs_InitialiseTnodes(yaffs_Device *dev)
 {
        dev->allocatedTnodeList = NULL;
        dev->freeTnodes = NULL;
        dev->nFreeTnodes = 0;
        dev->nTnodesCreated = 0;
+}
+
+
+void yaffs_PutLevel0Tnode(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos,
+               unsigned val)
+{
+       __u32 *map = (__u32 *)tn;
+       __u32 bitInMap;
+       __u32 bitInWord;
+       __u32 wordInMap;
+       __u32 mask;
+
+       pos &= YAFFS_TNODES_LEVEL0_MASK;
+       val >>= dev->chunkGroupBits;
+
+       bitInMap = pos * dev->tnodeWidth;
+       wordInMap = bitInMap / 32;
+       bitInWord = bitInMap & (32 - 1);
 
+       mask = dev->tnodeMask << bitInWord;
+
+       map[wordInMap] &= ~mask;
+       map[wordInMap] |= (mask & (val << bitInWord));
+
+       if (dev->tnodeWidth > (32 - bitInWord)) {
+               bitInWord = (32 - bitInWord);
+               wordInMap++;;
+               mask = dev->tnodeMask >> (/*dev->tnodeWidth -*/ bitInWord);
+               map[wordInMap] &= ~mask;
+               map[wordInMap] |= (mask & (val >> bitInWord));
+       }
 }
 
+static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn,
+               unsigned pos)
+{
+       __u32 *map = (__u32 *)tn;
+       __u32 bitInMap;
+       __u32 bitInWord;
+       __u32 wordInMap;
+       __u32 val;
+
+       pos &= YAFFS_TNODES_LEVEL0_MASK;
+
+       bitInMap = pos * dev->tnodeWidth;
+       wordInMap = bitInMap / 32;
+       bitInWord = bitInMap & (32 - 1);
 
-void yaffs_PutLevel0Tnode(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos, unsigned val)
-{
-  __u32 *map = (__u32 *)tn;
-  __u32 bitInMap;
-  __u32 bitInWord;
-  __u32 wordInMap;
-  __u32 mask;
-  
-  pos &= YAFFS_TNODES_LEVEL0_MASK;
-  val >>= dev->chunkGroupBits;
-  
-  bitInMap = pos * dev->tnodeWidth;
-  wordInMap = bitInMap /32;
-  bitInWord = bitInMap & (32 -1);
-  
-  mask = dev->tnodeMask << bitInWord;
-  
-  map[wordInMap] &= ~mask;
-  map[wordInMap] |= (mask & (val << bitInWord));
-  
-  if(dev->tnodeWidth > (32-bitInWord)) {
-    bitInWord = (32 - bitInWord);
-    wordInMap++;;
-    mask = dev->tnodeMask >> (/*dev->tnodeWidth -*/ bitInWord);
-    map[wordInMap] &= ~mask;
-    map[wordInMap] |= (mask & (val >> bitInWord));
-  }
-}
-
-static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos)
-{
-  __u32 *map = (__u32 *)tn;
-  __u32 bitInMap;
-  __u32 bitInWord;
-  __u32 wordInMap;
-  __u32 val;
-  
-  pos &= YAFFS_TNODES_LEVEL0_MASK;
-  
-  bitInMap = pos * dev->tnodeWidth;
-  wordInMap = bitInMap /32;
-  bitInWord = bitInMap & (32 -1);
-  
-  val = map[wordInMap] >> bitInWord;
-  
-  if(dev->tnodeWidth > (32-bitInWord)) {
-    bitInWord = (32 - bitInWord);
-    wordInMap++;;
-    val |= (map[wordInMap] << bitInWord);
-  }
-  
-  val &= dev->tnodeMask;
-  val <<= dev->chunkGroupBits;
-  
-  return val;
+       val = map[wordInMap] >> bitInWord;
+
+       if      (dev->tnodeWidth > (32 - bitInWord)) {
+               bitInWord = (32 - bitInWord);
+               wordInMap++;;
+               val |= (map[wordInMap] << bitInWord);
+       }
+
+       val &= dev->tnodeMask;
+       val <<= dev->chunkGroupBits;
+
+       return val;
 }
 
 /* ------------------- End of individual tnode manipulation -----------------*/
@@ -1410,11 +1394,10 @@ static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn, unsigne
  */
 
 /* FindLevel0Tnode finds the level 0 tnode, if one exists. */
-static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device * dev,
-                                         yaffs_FileStructure * fStruct,
-                                         __u32 chunkId)
+static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev,
+                                       yaffs_FileStructure *fStruct,
+                                       __u32 chunkId)
 {
-
        yaffs_Tnode *tn = fStruct->top;
        __u32 i;
        int requiredTallness;
@@ -1445,15 +1428,12 @@ static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device * dev,
 
        /* Traverse down to level 0 */
        while (level > 0 && tn) {
-               tn = tn->
-                   internal[(chunkId >>
-                              ( YAFFS_TNODES_LEVEL0_BITS + 
-                                (level - 1) *
-                                YAFFS_TNODES_INTERNAL_BITS)
-                             ) &
-                            YAFFS_TNODES_INTERNAL_MASK];
+               tn = tn->internal[(chunkId >>
+                       (YAFFS_TNODES_LEVEL0_BITS +
+                               (level - 1) *
+                               YAFFS_TNODES_INTERNAL_BITS)) &
+                       YAFFS_TNODES_INTERNAL_MASK];
                level--;
-
        }
 
        return tn;
@@ -1469,13 +1449,12 @@ static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device * dev,
  *  If the tn argument is NULL, then a fresh tnode will be added otherwise the specified tn will
  *  be plugged into the ttree.
  */
-static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device * dev,
-                                              yaffs_FileStructure * fStruct,
-                                              __u32 chunkId,
-                                              yaffs_Tnode *passedTn)
-{
 
+static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device *dev,
+                                       yaffs_FileStructure *fStruct,
+                                       __u32 chunkId,
+                                       yaffs_Tnode *passedTn)
+{
        int requiredTallness;
        int i;
        int l;
@@ -1504,9 +1483,9 @@ static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device * dev,
 
 
        if (requiredTallness > fStruct->topLevel) {
-               /* Not tall enough,gotta make the tree taller */
+               /* Not tall enough, gotta make the tree taller */
                for (i = fStruct->topLevel; i < requiredTallness; i++) {
-               
+
                        tn = yaffs_GetTnode(dev);
 
                        if (tn) {
@@ -1525,63 +1504,61 @@ static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device * dev,
 
        l = fStruct->topLevel;
        tn = fStruct->top;
-       
-       if(l > 0) {
+
+       if (l > 0) {
                while (l > 0 && tn) {
                        x = (chunkId >>
-                            ( YAFFS_TNODES_LEVEL0_BITS +
+                            (YAFFS_TNODES_LEVEL0_BITS +
                              (l - 1) * YAFFS_TNODES_INTERNAL_BITS)) &
                            YAFFS_TNODES_INTERNAL_MASK;
 
 
-                       if((l>1) && !tn->internal[x]){
+                       if ((l > 1) && !tn->internal[x]) {
                                /* Add missing non-level-zero tnode */
                                tn->internal[x] = yaffs_GetTnode(dev);
 
-                       } else if(l == 1) {
+                       } else if (l == 1) {
                                /* Looking from level 1 at level 0 */
-                               if (passedTn) {
+                               if (passedTn) {
                                        /* If we already have one, then release it.*/
-                                       if(tn->internal[x])
-                                               yaffs_FreeTnode(dev,tn->internal[x]);
+                                       if (tn->internal[x])
+                                               yaffs_FreeTnode(dev, tn->internal[x]);
                                        tn->internal[x] = passedTn;
-                       
-                               } else if(!tn->internal[x]) {
+
+                               } else if (!tn->internal[x]) {
                                        /* Don't have one, none passed in */
                                        tn->internal[x] = yaffs_GetTnode(dev);
                                }
                        }
-               
+
                        tn = tn->internal[x];
                        l--;
                }
        } else {
                /* top is level 0 */
-               if(passedTn) {
-                       memcpy(tn,passedTn,(dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
-                       yaffs_FreeTnode(dev,passedTn);
+               if (passedTn) {
+                       memcpy(tn, passedTn, (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
+                       yaffs_FreeTnode(dev, passedTn);
                }
        }
 
        return tn;
 }
 
-static int yaffs_FindChunkInGroup(yaffs_Device * dev, int theChunk,
-                                 yaffs_ExtendedTags * tags, int objectId,
-                                 int chunkInInode)
+static int yaffs_FindChunkInGroup(yaffs_Device *dev, int theChunk,
+                               yaffs_ExtendedTags *tags, int objectId,
+                               int chunkInInode)
 {
        int j;
 
        for (j = 0; theChunk && j < dev->chunkGroupSize; j++) {
-               if (yaffs_CheckChunkBit
-                   (dev, theChunk / dev->nChunksPerBlock,
-                    theChunk % dev->nChunksPerBlock)) {
+               if (yaffs_CheckChunkBit(dev, theChunk / dev->nChunksPerBlock,
+                               theChunk % dev->nChunksPerBlock)) {
                        yaffs_ReadChunkWithTagsFromNAND(dev, theChunk, NULL,
                                                        tags);
                        if (yaffs_TagsMatch(tags, objectId, chunkInInode)) {
                                /* found it; */
                                return theChunk;
-
                        }
                }
                theChunk++;
@@ -1592,11 +1569,11 @@ static int yaffs_FindChunkInGroup(yaffs_Device * dev, int theChunk,
 
 /* DeleteWorker scans backwards through the tnode tree and deletes all the
  * chunks and tnodes in the file
- * Returns 1 if the tree was deleted. 
+ * Returns 1 if the tree was deleted.
  * Returns 0 if it stopped early due to hitting the limit and the delete is incomplete.
  */
 
-static int yaffs_DeleteWorker(yaffs_Object * in, yaffs_Tnode * tn, __u32 level,
+static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level,
                              int chunkOffset, int *limit)
 {
        int i;
@@ -1610,7 +1587,6 @@ static int yaffs_DeleteWorker(yaffs_Object * in, yaffs_Tnode * tn, __u32 level,
 
        if (tn) {
                if (level > 0) {
-
                        for (i = YAFFS_NTNODES_INTERNAL - 1; allDone && i >= 0;
                             i--) {
                                if (tn->internal[i]) {
@@ -1618,17 +1594,17 @@ static int yaffs_DeleteWorker(yaffs_Object * in, yaffs_Tnode * tn, __u32 level,
                                                allDone = 0;
                                        } else {
                                                allDone =
-                                                   yaffs_DeleteWorker(in,
-                                                                      tn->
-                                                                      internal
-                                                                      [i],
-                                                                      level -
-                                                                      1,
-                                                                      (chunkOffset
+                                                       yaffs_DeleteWorker(in,
+                                                               tn->
+                                                               internal
+                                                               [i],
+                                                               level -
+                                                               1,
+                                                               (chunkOffset
                                                                        <<
                                                                        YAFFS_TNODES_INTERNAL_BITS)
-                                                                      + i,
-                                                                      limit);
+                                                               + i,
+                                                               limit);
                                        }
                                        if (allDone) {
                                                yaffs_FreeTnode(dev,
@@ -1637,27 +1613,25 @@ static int yaffs_DeleteWorker(yaffs_Object * in, yaffs_Tnode * tn, __u32 level,
                                                tn->internal[i] = NULL;
                                        }
                                }
-
                        }
                        return (allDone) ? 1 : 0;
                } else if (level == 0) {
                        int hitLimit = 0;
 
                        for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0 && !hitLimit;
-                            i--) {
-                               theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
+                                       i--) {
+                               theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
                                if (theChunk) {
 
-                                       chunkInInode =
-                                           (chunkOffset <<
-                                            YAFFS_TNODES_LEVEL0_BITS) + i;
+                                       chunkInInode = (chunkOffset <<
+                                               YAFFS_TNODES_LEVEL0_BITS) + i;
 
                                        foundChunk =
-                                           yaffs_FindChunkInGroup(dev,
-                                                                  theChunk,
-                                                                  &tags,
-                                                                  in->objectId,
-                                                                  chunkInInode);
+                                               yaffs_FindChunkInGroup(dev,
+                                                               theChunk,
+                                                               &tags,
+                                                               in->objectId,
+                                                               chunkInInode);
 
                                        if (foundChunk > 0) {
                                                yaffs_DeleteChunk(dev,
@@ -1673,7 +1647,7 @@ static int yaffs_DeleteWorker(yaffs_Object * in, yaffs_Tnode * tn, __u32 level,
 
                                        }
 
-                                       yaffs_PutLevel0Tnode(dev,tn,i,0);
+                                       yaffs_PutLevel0Tnode(dev, tn, i, 0);
                                }
 
                        }
@@ -1687,9 +1661,8 @@ static int yaffs_DeleteWorker(yaffs_Object * in, yaffs_Tnode * tn, __u32 level,
 
 }
 
-static void yaffs_SoftDeleteChunk(yaffs_Device * dev, int chunk)
+static void yaffs_SoftDeleteChunk(yaffs_Device *dev, int chunk)
 {
-
        yaffs_BlockInfo *theBlock;
 
        T(YAFFS_TRACE_DELETION, (TSTR("soft delete chunk %d" TENDSTR), chunk));
@@ -1706,8 +1679,8 @@ static void yaffs_SoftDeleteChunk(yaffs_Device * dev, int chunk)
  * of the tnode.
  * Thus, essentially this is the same as DeleteWorker except that the chunks are soft deleted.
  */
-static int yaffs_SoftDeleteWorker(yaffs_Object * in, yaffs_Tnode * tn,
+
+static int yaffs_SoftDeleteWorker(yaffs_Object *in, yaffs_Tnode *tn,
                                  __u32 level, int chunkOffset)
 {
        int i;
@@ -1744,14 +1717,14 @@ static int yaffs_SoftDeleteWorker(yaffs_Object * in, yaffs_Tnode * tn,
                } else if (level == 0) {
 
                        for (i = YAFFS_NTNODES_LEVEL0 - 1; i >= 0; i--) {
-                               theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
+                               theChunk = yaffs_GetChunkGroupBase(dev, tn, i);
                                if (theChunk) {
                                        /* Note this does not find the real chunk, only the chunk group.
-                                        * We make an assumption that a chunk group is not larger than 
+                                        * We make an assumption that a chunk group is not larger than
                                         * a block.
                                         */
                                        yaffs_SoftDeleteChunk(dev, theChunk);
-                                       yaffs_PutLevel0Tnode(dev,tn,i,0);
+                                       yaffs_PutLevel0Tnode(dev, tn, i, 0);
                                }
 
                        }
@@ -1765,7 +1738,7 @@ static int yaffs_SoftDeleteWorker(yaffs_Object * in, yaffs_Tnode * tn,
 
 }
 
-static void yaffs_SoftDeleteFile(yaffs_Object * obj)
+static void yaffs_SoftDeleteFile(yaffs_Object *obj)
 {
        if (obj->deleted &&
            obj->variantType == YAFFS_OBJECT_TYPE_FILE && !obj->softDeleted) {
@@ -1799,8 +1772,8 @@ static void yaffs_SoftDeleteFile(yaffs_Object * obj)
  * by a special case.
  */
 
-static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device * dev, yaffs_Tnode * tn,
-                                     __u32 level, int del0)
+static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device *dev, yaffs_Tnode *tn,
+                               __u32 level, int del0)
 {
        int i;
        int hasData;
@@ -1834,8 +1807,8 @@ static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device * dev, yaffs_Tnode * tn,
 
 }
 
-static int yaffs_PruneFileStructure(yaffs_Device * dev,
-                                   yaffs_FileStructure * fStruct)
+static int yaffs_PruneFileStructure(yaffs_Device *dev,
+                               yaffs_FileStructure *fStruct)
 {
        int i;
        int hasData;
@@ -1849,7 +1822,7 @@ static int yaffs_PruneFileStructure(yaffs_Device * dev,
                /* Now we have a tree with all the non-zero branches NULL but the height
                 * is the same as it was.
                 * Let's see if we can trim internal tnodes to shorten the tree.
-                * We can do this if only the 0th element in the tnode is in use 
+                * We can do this if only the 0th element in the tnode is in use
                 * (ie all the non-zero are NULL)
                 */
 
@@ -1881,7 +1854,7 @@ static int yaffs_PruneFileStructure(yaffs_Device * dev,
 /* yaffs_CreateFreeObjects creates a bunch more objects and
  * adds them to the object free list.
  */
-static int yaffs_CreateFreeObjects(yaffs_Device * dev, int nObjects)
+static int yaffs_CreateFreeObjects(yaffs_Device *dev, int nObjects)
 {
        int i;
        yaffs_Object *newObjects;
@@ -1895,22 +1868,22 @@ static int yaffs_CreateFreeObjects(yaffs_Device * dev, int nObjects)
        list = YMALLOC(sizeof(yaffs_ObjectList));
 
        if (!newObjects || !list) {
-               if(newObjects)
+               if (newObjects)
                        YFREE(newObjects);
-               if(list)
+               if (list)
                        YFREE(list);
                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;
+       /* 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;
@@ -1926,7 +1899,7 @@ static int yaffs_CreateFreeObjects(yaffs_Device * dev, int nObjects)
 
 
 /* AllocateEmptyObject gets us a clean Object. Tries to make allocate more if we run out */
-static yaffs_Object *yaffs_AllocateEmptyObject(yaffs_Device * dev)
+static yaffs_Object *yaffs_AllocateEmptyObject(yaffs_Device *dev)
 {
        yaffs_Object *tn = NULL;
 
@@ -1941,47 +1914,47 @@ static yaffs_Object *yaffs_AllocateEmptyObject(yaffs_Device * dev)
        if (dev->freeObjects) {
                tn = dev->freeObjects;
                dev->freeObjects =
-                   (yaffs_Object *) (dev->freeObjects->siblings.next);
+                       (yaffs_Object *) (dev->freeObjects->siblings.next);
                dev->nFreeObjects--;
        }
 #endif
-       if(tn){
+       if (tn) {
                /* Now sweeten it up... */
 
                memset(tn, 0, sizeof(yaffs_Object));
                tn->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);
-               
+
 
                /* Now make the directory sane */
-               if(dev->rootDir){
+               if (dev->rootDir) {
                        tn->parent = dev->rootDir;
-                       ylist_add(&(tn->siblings),&dev->rootDir->variant.directoryVariant.children);
+                       ylist_add(&(tn->siblings), &dev->rootDir->variant.directoryVariant.children);
                }
 
-                /* Add it to the lost and found directory.
-                 * NB Can't put root or lostNFound in lostNFound so
+               /* Add it to the lost and found directory.
+                * NB Can't put root or lostNFound in lostNFound so
                 * check if lostNFound exists first
                 */
                if (dev->lostNFoundDir) {
                        yaffs_AddObjectToDirectory(dev->lostNFoundDir, tn);
                }
-               
+
                tn->beingCreated = 0;
        }
-       
+
        dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
 
        return tn;
 }
 
-static yaffs_Object *yaffs_CreateFakeDirectory(yaffs_Device * dev, int number,
+static yaffs_Object *yaffs_CreateFakeDirectory(yaffs_Device *dev, int number,
                                               __u32 mode)
 {
 
@@ -2002,24 +1975,22 @@ static yaffs_Object *yaffs_CreateFakeDirectory(yaffs_Device * dev, int number,
 
 }
 
-static void yaffs_UnhashObject(yaffs_Object * tn)
+static void yaffs_UnhashObject(yaffs_Object *tn)
 {
        int bucket;
-        yaffs_Device *dev = tn->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);
-                dev->objectBucket[bucket].count--;
-        }
+       yaffs_Device *dev = tn->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);
+               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 *tn)
 {
-
        yaffs_Device *dev = tn->myDev;
 
 #ifdef  __KERNEL__
@@ -2028,11 +1999,11 @@ static void yaffs_FreeObject(yaffs_Object * tn)
        
        if(tn->parent)
                YBUG();
-       if(!ylist_empty(&tn->siblings))
+       if (!ylist_empty(&tn->siblings))
                YBUG();
 
 
-#ifdef  __KERNEL__
+#ifdef __KERNEL__
        if (tn->myInode) {
                /* We're still hooked up to a cached inode.
                 * Don't delete now, but mark for later deletion
@@ -2042,23 +2013,22 @@ static void yaffs_FreeObject(yaffs_Object * tn)
        }
 #endif
 
-        yaffs_UnhashObject(tn);
+       yaffs_UnhashObject(tn);
 
 #ifdef VALGRIND_TEST
        YFREE(tn);
 #else
-        /* Link into the free list. */
-        tn->siblings.next = (struct ylist_head *)(dev->freeObjects);
-        dev->freeObjects = tn;
-        dev->nFreeObjects++;
+       /* Link into the free list. */
+       tn->siblings.next = (struct ylist_head *)(dev->freeObjects);
+       dev->freeObjects = tn;
+       dev->nFreeObjects++;
 #endif
        dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
-
 }
 
 #ifdef __KERNEL__
 
-void yaffs_HandleDeferedFree(yaffs_Object * obj)
+void yaffs_HandleDeferedFree(yaffs_Object *obj)
 {
        if (obj->deferedFree) {
                yaffs_FreeObject(obj);
@@ -2067,7 +2037,7 @@ void yaffs_HandleDeferedFree(yaffs_Object * obj)
 
 #endif
 
-static void yaffs_DeinitialiseObjects(yaffs_Device * dev)
+static void yaffs_DeinitialiseObjects(yaffs_Device *dev)
 {
        /* Free the list of allocated Objects */
 
@@ -2085,24 +2055,23 @@ static void yaffs_DeinitialiseObjects(yaffs_Device * dev)
        dev->nFreeObjects = 0;
 }
 
-static void yaffs_InitialiseObjects(yaffs_Device * dev)
+static void yaffs_InitialiseObjects(yaffs_Device *dev)
 {
        int i;
 
        dev->allocatedObjectList = NULL;
        dev->freeObjects = NULL;
-        dev->nFreeObjects = 0;
-
-        for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) {
-                YINIT_LIST_HEAD(&dev->objectBucket[i].list);
-                dev->objectBucket[i].count = 0;
-        }
+       dev->nFreeObjects = 0;
 
+       for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) {
+               YINIT_LIST_HEAD(&dev->objectBucket[i].list);
+               dev->objectBucket[i].count = 0;
+       }
 }
 
-static int yaffs_FindNiceObjectBucket(yaffs_Device * dev)
+static int yaffs_FindNiceObjectBucket(yaffs_Device *dev)
 {
-       static int x = 0;
+       static int x;
        int i;
        int l = 999;
        int lowest = 999999;
@@ -2136,63 +2105,60 @@ static int yaffs_FindNiceObjectBucket(yaffs_Device * dev)
        return l;
 }
 
-static int yaffs_CreateNewObjectNumber(yaffs_Device * dev)
+static int yaffs_CreateNewObjectNumber(yaffs_Device *dev)
 {
        int bucket = yaffs_FindNiceObjectBucket(dev);
 
        /* Now find an object value that has not already been taken
         * by scanning the list.
-         */
+        */
 
-        int found = 0;
-        struct ylist_head *i;
+       int found = 0;
+       struct ylist_head *i;
 
-        __u32 n = (__u32) bucket;
+       __u32 n = (__u32) bucket;
 
        /* yaffs_CheckObjectHashSanity();  */
 
        while (!found) {
-                found = 1;
-                n += YAFFS_NOBJECT_BUCKETS;
-                if (1 || dev->objectBucket[bucket].count > 0) {
-                        ylist_for_each(i, &dev->objectBucket[bucket].list) {
-                                /* If there is already one in the list */
-                                if (i
-                                    && ylist_entry(i, yaffs_Object,
-                                                  hashLink)->objectId == n) {
-                                        found = 0;
-                                }
+               found = 1;
+               n += YAFFS_NOBJECT_BUCKETS;
+               if (1 || dev->objectBucket[bucket].count > 0) {
+                       ylist_for_each(i, &dev->objectBucket[bucket].list) {
+                               /* If there is already one in the list */
+                               if (i && ylist_entry(i, yaffs_Object,
+                                               hashLink)->objectId == n) {
+                                       found = 0;
+                               }
                        }
                }
        }
 
-
        return n;
 }
 
-static void yaffs_HashObject(yaffs_Object * in)
+static void yaffs_HashObject(yaffs_Object *in)
 {
-        int bucket = yaffs_HashFunction(in->objectId);
-        yaffs_Device *dev = in->myDev;
-
-        ylist_add(&in->hashLink, &dev->objectBucket[bucket].list);
-        dev->objectBucket[bucket].count++;
+       int bucket = yaffs_HashFunction(in->objectId);
+       yaffs_Device *dev = in->myDev;
 
+       ylist_add(&in->hashLink, &dev->objectBucket[bucket].list);
+       dev->objectBucket[bucket].count++;
 }
 
-yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device * dev, __u32 number)
+yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device *dev, __u32 number)
 {
-        int bucket = yaffs_HashFunction(number);
-        struct ylist_head *i;
-        yaffs_Object *in;
+       int bucket = yaffs_HashFunction(number);
+       struct ylist_head *i;
+       yaffs_Object *in;
 
-        ylist_for_each(i, &dev->objectBucket[bucket].list) {
-                /* Look if it is in the list */
-                if (i) {
-                        in = ylist_entry(i, yaffs_Object, hashLink);
-                        if (in->objectId == number) {
+       ylist_for_each(i, &dev->objectBucket[bucket].list) {
+               /* Look if it is in the list */
+               if (i) {
+                       in = ylist_entry(i, yaffs_Object, hashLink);
+                       if (in->objectId == number) {
 #ifdef __KERNEL__
-                                /* Don't tell the VFS about this one if it is defered free */
+                               /* Don't tell the VFS about this one if it is defered free */
                                if (in->deferedFree)
                                        return NULL;
 #endif
@@ -2205,10 +2171,9 @@ yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device * dev, __u32 number)
        return NULL;
 }
 
-yaffs_Object *yaffs_CreateNewObject(yaffs_Device * dev, int number,
+yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev, int number,
                                    yaffs_ObjectType type)
 {
-
        yaffs_Object *theObject;
        yaffs_Tnode *tn = NULL;
 
@@ -2217,18 +2182,16 @@ yaffs_Object *yaffs_CreateNewObject(yaffs_Device * dev, int number,
        }
 
        theObject = yaffs_AllocateEmptyObject(dev);
-       if(!theObject)
+       if (!theObject)
                return NULL;
-               
-       if(type == YAFFS_OBJECT_TYPE_FILE){
+
+       if (type == YAFFS_OBJECT_TYPE_FILE) {
                tn = yaffs_GetTnode(dev);
-               if(!tn){
+               if (!tn) {
                        yaffs_FreeObject(theObject);
                        return NULL;
                }
        }
-               
-       
 
        if (theObject) {
                theObject->fake = 0;
@@ -2255,13 +2218,13 @@ yaffs_Object *yaffs_CreateNewObject(yaffs_Device * dev, int number,
                        theObject->variant.fileVariant.scannedFileSize = 0;
                        theObject->variant.fileVariant.shrinkSize = 0xFFFFFFFF; /* max __u32 */
                        theObject->variant.fileVariant.topLevel = 0;
-                        theObject->variant.fileVariant.top = tn;
-                        break;
-                case YAFFS_OBJECT_TYPE_DIRECTORY:
-                        YINIT_LIST_HEAD(&theObject->variant.directoryVariant.
-                                       children);
-                        break;
-                case YAFFS_OBJECT_TYPE_SYMLINK:
+                       theObject->variant.fileVariant.top = tn;
+                       break;
+               case YAFFS_OBJECT_TYPE_DIRECTORY:
+                       YINIT_LIST_HEAD(&theObject->variant.directoryVariant.
+                                       children);
+                       break;
+               case YAFFS_OBJECT_TYPE_SYMLINK:
                case YAFFS_OBJECT_TYPE_HARDLINK:
                case YAFFS_OBJECT_TYPE_SPECIAL:
                        /* No action required */
@@ -2275,7 +2238,7 @@ yaffs_Object *yaffs_CreateNewObject(yaffs_Device * dev, int number,
        return theObject;
 }
 
-static yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device * dev,
+static yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device *dev,
                                                      int number,
                                                      yaffs_ObjectType type)
 {
@@ -2292,15 +2255,15 @@ static yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device * dev,
        return theObject;
 
 }
-                       
 
-static YCHAR *yaffs_CloneString(const YCHAR * str)
+
+static YCHAR *yaffs_CloneString(const YCHAR *str)
 {
        YCHAR *newStr = NULL;
 
        if (str && *str) {
                newStr = YMALLOC((yaffs_strlen(str) + 1) * sizeof(YCHAR));
-               if(newStr)
+               if (newStr)
                        yaffs_strcpy(newStr, str);
        }
 
@@ -2314,15 +2277,15 @@ static YCHAR *yaffs_CloneString(const YCHAR * str)
  * aliasString only has meaning for a sumlink.
  * rdev only has meaning for devices (a subset of special objects)
  */
+
 static yaffs_Object *yaffs_MknodObject(yaffs_ObjectType type,
-                                      yaffs_Object * parent,
-                                      const YCHAR * name,
+                                      yaffs_Object *parent,
+                                      const YCHAR *name,
                                       __u32 mode,
                                       __u32 uid,
                                       __u32 gid,
-                                      yaffs_Object * equivalentObject,
-                                      const YCHAR * aliasString, __u32 rdev)
+                                      yaffs_Object *equivalentObject,
+                                      const YCHAR *aliasString, __u32 rdev)
 {
        yaffs_Object *in;
        YCHAR *str = NULL;
@@ -2336,18 +2299,18 @@ static yaffs_Object *yaffs_MknodObject(yaffs_ObjectType type,
 
        in = yaffs_CreateNewObject(dev, -1, type);
 
-       if(!in)
+       if (!in)
                return YAFFS_FAIL;
-       
-       if(type == YAFFS_OBJECT_TYPE_SYMLINK){
+
+       if (type == YAFFS_OBJECT_TYPE_SYMLINK) {
                str = yaffs_CloneString(aliasString);
-               if(!str){
+               if (!str) {
                        yaffs_FreeObject(in);
                        return NULL;
                }
        }
-       
-       
+
+
 
        if (in) {
                in->hdrChunk = 0;
@@ -2383,13 +2346,13 @@ static yaffs_Object *yaffs_MknodObject(yaffs_ObjectType type,
                        break;
                case YAFFS_OBJECT_TYPE_HARDLINK:
                        in->variant.hardLinkVariant.equivalentObject =
-                            equivalentObject;
-                        in->variant.hardLinkVariant.equivalentObjectId =
-                            equivalentObject->objectId;
-                        ylist_add(&in->hardLinks, &equivalentObject->hardLinks);
-                        break;
-                case YAFFS_OBJECT_TYPE_FILE:    
-                case YAFFS_OBJECT_TYPE_DIRECTORY:
+                               equivalentObject;
+                       in->variant.hardLinkVariant.equivalentObjectId =
+                               equivalentObject->objectId;
+                       ylist_add(&in->hardLinks, &equivalentObject->hardLinks);
+                       break;
+               case YAFFS_OBJECT_TYPE_FILE:
+               case YAFFS_OBJECT_TYPE_DIRECTORY:
                case YAFFS_OBJECT_TYPE_SPECIAL:
                case YAFFS_OBJECT_TYPE_UNKNOWN:
                        /* do nothing */
@@ -2407,38 +2370,38 @@ static yaffs_Object *yaffs_MknodObject(yaffs_ObjectType type,
        return in;
 }
 
-yaffs_Object *yaffs_MknodFile(yaffs_Object * parent, const YCHAR * name,
-                             __u32 mode, __u32 uid, __u32 gid)
+yaffs_Object *yaffs_MknodFile(yaffs_Object *parent, const YCHAR *name,
+                       __u32 mode, __u32 uid, __u32 gid)
 {
        return yaffs_MknodObject(YAFFS_OBJECT_TYPE_FILE, parent, name, mode,
-                                uid, gid, NULL, NULL, 0);
+                               uid, gid, NULL, NULL, 0);
 }
 
-yaffs_Object *yaffs_MknodDirectory(yaffs_Object * parent, const YCHAR * name,
-                                  __u32 mode, __u32 uid, __u32 gid)
+yaffs_Object *yaffs_MknodDirectory(yaffs_Object *parent, const YCHAR *name,
+                               __u32 mode, __u32 uid, __u32 gid)
 {
        return yaffs_MknodObject(YAFFS_OBJECT_TYPE_DIRECTORY, parent, name,
                                 mode, uid, gid, NULL, NULL, 0);
 }
 
-yaffs_Object *yaffs_MknodSpecial(yaffs_Object * parent, const YCHAR * name,
-                                __u32 mode, __u32 uid, __u32 gid, __u32 rdev)
+yaffs_Object *yaffs_MknodSpecial(yaffs_Object *parent, const YCHAR *name,
+                               __u32 mode, __u32 uid, __u32 gid, __u32 rdev)
 {
        return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SPECIAL, parent, name, mode,
                                 uid, gid, NULL, NULL, rdev);
 }
 
-yaffs_Object *yaffs_MknodSymLink(yaffs_Object * parent, const YCHAR * name,
-                                __u32 mode, __u32 uid, __u32 gid,
-                                const YCHAR * alias)
+yaffs_Object *yaffs_MknodSymLink(yaffs_Object *parent, const YCHAR *name,
+                               __u32 mode, __u32 uid, __u32 gid,
+                               const YCHAR *alias)
 {
        return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SYMLINK, parent, name, mode,
-                                uid, gid, NULL, alias, 0);
+                               uid, gid, NULL, alias, 0);
 }
 
 /* yaffs_Link returns the object id of the equivalent object.*/
-yaffs_Object *yaffs_Link(yaffs_Object * parent, const YCHAR * name,
-                        yaffs_Object * equivalentObject)
+yaffs_Object *yaffs_Link(yaffs_Object *parent, const YCHAR *name,
+                       yaffs_Object *equivalentObject)
 {
        /* Get the real object in case we were fed a hard link as an equivalent object */
        equivalentObject = yaffs_GetEquivalentObject(equivalentObject);
@@ -2453,8 +2416,8 @@ yaffs_Object *yaffs_Link(yaffs_Object * parent, const YCHAR * name,
 
 }
 
-static int yaffs_ChangeObjectName(yaffs_Object * obj, yaffs_Object * newDir,
-                                 const YCHAR * newName, int force, int shadows)
+static int yaffs_ChangeObjectName(yaffs_Object *obj, yaffs_Object *newDir,
+                               const YCHAR *newName, int force, int shadows)
 {
        int unlinkOp;
        int deleteOp;
@@ -2472,7 +2435,7 @@ static int yaffs_ChangeObjectName(yaffs_Object * obj, yaffs_Object * newDir,
                    TENDSTR)));
                YBUG();
        }
-       
+
        /* TODO: Do we need this different handling for YAFFS2 and YAFFS1?? */
        if (obj->myDev->isYaffs2) {
                unlinkOp = (newDir == obj->myDev->unlinkedDir);
@@ -2485,9 +2448,9 @@ static int yaffs_ChangeObjectName(yaffs_Object * obj, yaffs_Object * newDir,
 
        existingTarget = yaffs_FindObjectByName(newDir, newName);
 
-       /* If the object is a file going into the unlinked directory, 
+       /* If the object is a file going into the unlinked directory,
         *   then it is OK to just stuff it in since duplicate names are allowed.
-        *   else only proceed if the new name does not exist and if we're putting 
+        *   else only proceed if the new name does not exist and if we're putting
         *   it into a directory.
         */
        if ((unlinkOp ||
@@ -2505,24 +2468,24 @@ 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) >= 0)
                        return YAFFS_OK;
        }
 
        return YAFFS_FAIL;
 }
 
-int yaffs_RenameObject(yaffs_Object * oldDir, const YCHAR * oldName,
-                      yaffs_Object * newDir, const YCHAR * newName)
+int yaffs_RenameObject(yaffs_Object *oldDir, const YCHAR *oldName,
+               yaffs_Object *newDir, const YCHAR *newName)
 {
-       yaffs_Object *obj=NULL;
-       yaffs_Object *existingTarget=NULL;
+       yaffs_Object *obj = NULL;
+       yaffs_Object *existingTarget = NULL;
        int force = 0;
-       
-       
-       if(!oldDir || oldDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
+
+
+       if (!oldDir || oldDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
                YBUG();
-       if(!newDir || newDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
+       if (!newDir || newDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
                YBUG();
 
 #ifdef CONFIG_YAFFS_CASE_INSENSITIVE
@@ -2536,8 +2499,8 @@ int yaffs_RenameObject(yaffs_Object * oldDir, const YCHAR * oldName,
 #endif
 
        else if (yaffs_strlen(newName) > YAFFS_MAX_NAME_LENGTH)
-         /* ENAMETOOLONG */
-         return YAFFS_FAIL;
+               /* ENAMETOOLONG */
+               return YAFFS_FAIL;
 
        obj = yaffs_FindObjectByName(oldDir, oldName);
 
@@ -2545,18 +2508,18 @@ int yaffs_RenameObject(yaffs_Object * oldDir, const YCHAR * oldName,
 
                /* Now do the handling for an existing target, if there is one */
 
-                existingTarget = yaffs_FindObjectByName(newDir, newName);
-                if (existingTarget &&
-                    existingTarget->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
-                    !ylist_empty(&existingTarget->variant.directoryVariant.children)) {
-                        /* There is a target that is a non-empty directory, so we fail */
-                        return YAFFS_FAIL;      /* EEXIST or ENOTEMPTY */
-                } else if (existingTarget && existingTarget != obj) {
-                       /* Nuke the target first, using shadowing, 
+               existingTarget = yaffs_FindObjectByName(newDir, newName);
+               if (existingTarget &&
+                       existingTarget->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
+                       !ylist_empty(&existingTarget->variant.directoryVariant.children)) {
+                       /* There is a target that is a non-empty directory, so we fail */
+                       return YAFFS_FAIL;      /* EEXIST or ENOTEMPTY */
+               } else if (existingTarget && existingTarget != obj) {
+                       /* Nuke the target first, using shadowing,
                         * but only if it isn't the same object
                         */
                        yaffs_ChangeObjectName(obj, newDir, newName, force,
-                                              existingTarget->objectId);
+                                               existingTarget->objectId);
                        yaffs_UnlinkObject(existingTarget);
                }
 
@@ -2567,37 +2530,34 @@ int yaffs_RenameObject(yaffs_Object * oldDir, const YCHAR * oldName,
 
 /*------------------------- Block Management and Page Allocation ----------------*/
 
-static int yaffs_InitialiseBlocks(yaffs_Device * dev)
+static int yaffs_InitialiseBlocks(yaffs_Device *dev)
 {
        int nBlocks = dev->internalEndBlock - dev->internalStartBlock + 1;
-       
+
        dev->blockInfo = NULL;
        dev->chunkBits = NULL;
-       
+
        dev->allocationBlock = -1;      /* force it to get a new one */
 
        /* If the first allocation strategy fails, thry the alternate one */
        dev->blockInfo = YMALLOC(nBlocks * sizeof(yaffs_BlockInfo));
-       if(!dev->blockInfo){
+       if (!dev->blockInfo) {
                dev->blockInfo = YMALLOC_ALT(nBlocks * sizeof(yaffs_BlockInfo));
                dev->blockInfoAlt = 1;
-       }
-       else
+       } else
                dev->blockInfoAlt = 0;
-               
-       if(dev->blockInfo){
-       
+
+       if (dev->blockInfo) {
                /* Set up dynamic blockinfo stuff. */
                dev->chunkBitmapStride = (dev->nChunksPerBlock + 7) / 8; /* round up bytes */
                dev->chunkBits = YMALLOC(dev->chunkBitmapStride * nBlocks);
-               if(!dev->chunkBits){
+               if (!dev->chunkBits) {
                        dev->chunkBits = YMALLOC_ALT(dev->chunkBitmapStride * nBlocks);
                        dev->chunkBitsAlt = 1;
-               }
-               else
+               } else
                        dev->chunkBitsAlt = 0;
        }
-       
+
        if (dev->blockInfo && dev->chunkBits) {
                memset(dev->blockInfo, 0, nBlocks * sizeof(yaffs_BlockInfo));
                memset(dev->chunkBits, 0, dev->chunkBitmapStride * nBlocks);
@@ -2605,30 +2565,29 @@ static int yaffs_InitialiseBlocks(yaffs_Device * dev)
        }
 
        return YAFFS_FAIL;
-
 }
 
-static void yaffs_DeinitialiseBlocks(yaffs_Device * dev)
+static void yaffs_DeinitialiseBlocks(yaffs_Device *dev)
 {
-       if(dev->blockInfoAlt && dev->blockInfo)
+       if (dev->blockInfoAlt && dev->blockInfo)
                YFREE_ALT(dev->blockInfo);
-       else if(dev->blockInfo)
+       else if (dev->blockInfo)
                YFREE(dev->blockInfo);
 
        dev->blockInfoAlt = 0;
 
        dev->blockInfo = NULL;
-       
-       if(dev->chunkBitsAlt && dev->chunkBits)
+
+       if (dev->chunkBitsAlt && dev->chunkBits)
                YFREE_ALT(dev->chunkBits);
-       else if(dev->chunkBits)
+       else if (dev->chunkBits)
                YFREE(dev->chunkBits);
        dev->chunkBitsAlt = 0;
        dev->chunkBits = NULL;
 }
 
-static int yaffs_BlockNotDisqualifiedFromGC(yaffs_Device * dev,
-                                           yaffs_BlockInfo * bi)
+static int yaffs_BlockNotDisqualifiedFromGC(yaffs_Device *dev,
+                                       yaffs_BlockInfo *bi)
 {
        int i;
        __u32 seq;
@@ -2647,7 +2606,7 @@ static int yaffs_BlockNotDisqualifiedFromGC(yaffs_Device * dev,
                seq = dev->sequenceNumber;
 
                for (i = dev->internalStartBlock; i <= dev->internalEndBlock;
-                    i++) {
+                               i++) {
                        b = yaffs_GetBlockInfo(dev, i);
                        if (b->blockState == YAFFS_BLOCK_STATE_FULL &&
                            (b->pagesInUse - b->softDeletions) <
@@ -2662,38 +2621,36 @@ static int yaffs_BlockNotDisqualifiedFromGC(yaffs_Device * dev,
         * discarded pages.
         */
        return (bi->sequenceNumber <= dev->oldestDirtySequence);
-
 }
 
 /* FindDiretiestBlock is used to select the dirtiest block (or close enough)
  * for garbage collection.
  */
 
-static int yaffs_FindBlockForGarbageCollection(yaffs_Device * dev,
-                                              int aggressive)
+static int yaffs_FindBlockForGarbageCollection(yaffs_Device *dev,
+                                       int aggressive)
 {
-
        int b = dev->currentDirtyChecker;
 
        int i;
        int iterations;
        int dirtiest = -1;
        int pagesInUse = 0;
-       int prioritised=0;
+       int prioritised = 0;
        yaffs_BlockInfo *bi;
        int pendingPrioritisedExist = 0;
-       
+
        /* First let's see if we need to grab a prioritised block */
-       if(dev->hasPendingPrioritisedGCs){
-               for(i = dev->internalStartBlock; i < dev->internalEndBlock && !prioritised; i++){
+       if (dev->hasPendingPrioritisedGCs) {
+               for (i = dev->internalStartBlock; i < dev->internalEndBlock && !prioritised; i++) {
 
                        bi = yaffs_GetBlockInfo(dev, i);
-                       //yaffs_VerifyBlock(dev,bi,i);
-                       
-                       if(bi->gcPrioritise) {
+                       /* yaffs_VerifyBlock(dev,bi,i); */
+
+                       if (bi->gcPrioritise) {
                                pendingPrioritisedExist = 1;
-                               if(bi->blockState == YAFFS_BLOCK_STATE_FULL &&
-                                  yaffs_BlockNotDisqualifiedFromGC(dev, bi)){
+                               if (bi->blockState == YAFFS_BLOCK_STATE_FULL &&
+                                  yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
                                        pagesInUse = (bi->pagesInUse - bi->softDeletions);
                                        dirtiest = i;
                                        prioritised = 1;
@@ -2701,8 +2658,8 @@ static int yaffs_FindBlockForGarbageCollection(yaffs_Device * dev,
                                }
                        }
                }
-               
-               if(!pendingPrioritisedExist) /* None found, so we can clear this */
+
+               if (!pendingPrioritisedExist) /* None found, so we can clear this */
                        dev->hasPendingPrioritisedGCs = 0;
        }
 
@@ -2718,9 +2675,9 @@ static int yaffs_FindBlockForGarbageCollection(yaffs_Device * dev,
                return -1;
        }
 
-       if(!prioritised)
+       if (!prioritised)
                pagesInUse =
-                       (aggressive) ? dev->nChunksPerBlock : YAFFS_PASSIVE_GC_CHUNKS + 1;
+                       (aggressive) ? dev->nChunksPerBlock : YAFFS_PASSIVE_GC_CHUNKS + 1;
 
        if (aggressive) {
                iterations =
@@ -2752,13 +2709,12 @@ static int yaffs_FindBlockForGarbageCollection(yaffs_Device * dev,
                if (bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT) {
                        dirtiest = b;
                        pagesInUse = 0;
-               }
-               else 
+               } else
 #endif
 
                if (bi->blockState == YAFFS_BLOCK_STATE_FULL &&
-                      (bi->pagesInUse - bi->softDeletions) < pagesInUse &&
-                       yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
+                       (bi->pagesInUse - bi->softDeletions) < pagesInUse &&
+                               yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
                        dirtiest = b;
                        pagesInUse = (bi->pagesInUse - bi->softDeletions);
                }
@@ -2769,19 +2725,18 @@ static int yaffs_FindBlockForGarbageCollection(yaffs_Device * dev,
        if (dirtiest > 0) {
                T(YAFFS_TRACE_GC,
                  (TSTR("GC Selected block %d with %d free, prioritised:%d" TENDSTR), dirtiest,
-                  dev->nChunksPerBlock - pagesInUse,prioritised));
+                  dev->nChunksPerBlock - pagesInUse, prioritised));
        }
 
        dev->oldestDirtySequence = 0;
 
-       if (dirtiest > 0) {
+       if (dirtiest > 0)
                dev->nonAggressiveSkip = 4;
-       }
 
        return dirtiest;
 }
 
-static void yaffs_BlockBecameDirty(yaffs_Device * dev, int blockNo)
+static void yaffs_BlockBecameDirty(yaffs_Device *dev, int blockNo)
 {
        yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockNo);
 
@@ -2790,11 +2745,11 @@ static void yaffs_BlockBecameDirty(yaffs_Device * dev, int blockNo)
        /* If the block is still healthy erase it and mark as clean.
         * If the block has had a data failure, then retire it.
         */
-        
+
        T(YAFFS_TRACE_GC | YAFFS_TRACE_ERASE,
                (TSTR("yaffs_BlockBecameDirty block %d state %d %s"TENDSTR),
                blockNo, bi->blockState, (bi->needsRetiring) ? "needs retiring" : ""));
-               
+
        bi->blockState = YAFFS_BLOCK_STATE_DIRTY;
 
        if (!bi->needsRetiring) {
@@ -2807,7 +2762,7 @@ static void yaffs_BlockBecameDirty(yaffs_Device * dev, int blockNo)
                }
        }
 
-       if (erasedOk && 
+       if (erasedOk &&
            ((yaffs_traceMask & YAFFS_TRACE_ERASE) || !yaffs_SkipVerification(dev))) {
                int i;
                for (i = 0; i < dev->nChunksPerBlock; i++) {
@@ -2843,7 +2798,7 @@ static void yaffs_BlockBecameDirty(yaffs_Device * dev, int blockNo)
        }
 }
 
-static int yaffs_FindBlockForAllocation(yaffs_Device * dev)
+static int yaffs_FindBlockForAllocation(yaffs_Device *dev)
 {
        int i;
 
@@ -2858,7 +2813,7 @@ static int yaffs_FindBlockForAllocation(yaffs_Device * dev)
 
                return -1;
        }
-       
+
        /* Find an empty block. */
 
        for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
@@ -2895,8 +2850,8 @@ static int yaffs_FindBlockForAllocation(yaffs_Device * dev)
 
 static int yaffs_CalcCheckpointBlocksRequired(yaffs_Device *dev)
 {
-       if(!dev->nCheckpointBlocksRequired &&
-          dev->isYaffs2){
+       if (!dev->nCheckpointBlocksRequired &&
+          dev->isYaffs2) {
                /* Not a valid value so recalculate */
                int nBytes = 0;
                int nBlocks;
@@ -2905,9 +2860,9 @@ static int yaffs_CalcCheckpointBlocksRequired(yaffs_Device *dev)
 
                tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
 
-               if(tnodeSize < sizeof(yaffs_Tnode))
+               if (tnodeSize < sizeof(yaffs_Tnode))
                        tnodeSize = sizeof(yaffs_Tnode);
-               
+
                nBytes += sizeof(yaffs_CheckpointValidity);
                nBytes += sizeof(yaffs_CheckpointDevice);
                nBytes += devBlocks * sizeof(yaffs_BlockInfo);
@@ -2916,40 +2871,43 @@ static int yaffs_CalcCheckpointBlocksRequired(yaffs_Device *dev)
                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->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)
+/*
+ * 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 reservedChunks;
        int reservedBlocks = dev->nReservedBlocks;
        int checkpointBlocks;
-       
-       if(dev->isYaffs2){
-               checkpointBlocks =  yaffs_CalcCheckpointBlocksRequired(dev) - 
+
+       if (dev->isYaffs2) {
+               checkpointBlocks =  yaffs_CalcCheckpointBlocksRequired(dev) -
                                    dev->blocksInCheckpoint;
-               if(checkpointBlocks < 0)
+               if (checkpointBlocks < 0)
                        checkpointBlocks = 0;
        } else {
-               checkpointBlocks =0;
+               checkpointBlocks = 0;
        }
-       
+
        reservedChunks = ((reservedBlocks + checkpointBlocks) * dev->nChunksPerBlock);
-       
+
        return (dev->nFreeChunks > reservedChunks);
 }
 
-static int yaffs_AllocateChunk(yaffs_Device * dev, int useReserve, yaffs_BlockInfo **blockUsedPtr)
+static int yaffs_AllocateChunk(yaffs_Device *dev, int useReserve,
+               yaffs_BlockInfo **blockUsedPtr)
 {
        int retVal;
        yaffs_BlockInfo *bi;
@@ -2966,7 +2924,7 @@ static int yaffs_AllocateChunk(yaffs_Device * dev, int useReserve, yaffs_BlockIn
        }
 
        if (dev->nErasedBlocks < dev->nReservedBlocks
-           && dev->allocationPage == 0) {
+                       && dev->allocationPage == 0) {
                T(YAFFS_TRACE_ALLOCATE, (TSTR("Allocating reserve" TENDSTR)));
        }
 
@@ -2975,10 +2933,10 @@ static int yaffs_AllocateChunk(yaffs_Device * dev, int useReserve, yaffs_BlockIn
                bi = yaffs_GetBlockInfo(dev, dev->allocationBlock);
 
                retVal = (dev->allocationBlock * dev->nChunksPerBlock) +
-                   dev->allocationPage;
+                       dev->allocationPage;
                bi->pagesInUse++;
                yaffs_SetChunkBit(dev, dev->allocationBlock,
-                                 dev->allocationPage);
+                               dev->allocationPage);
 
                dev->allocationPage++;
 
@@ -2990,19 +2948,19 @@ static int yaffs_AllocateChunk(yaffs_Device * dev, int useReserve, yaffs_BlockIn
                        dev->allocationBlock = -1;
                }
 
-               if(blockUsedPtr)
+               if (blockUsedPtr)
                        *blockUsedPtr = bi;
-                       
+
                return retVal;
        }
-       
+
        T(YAFFS_TRACE_ERROR,
-         (TSTR("!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!" TENDSTR)));
+                       (TSTR("!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!" TENDSTR)));
 
        return -1;
 }
 
-static int yaffs_GetErasedChunks(yaffs_Device * dev)
+static int yaffs_GetErasedChunks(yaffs_Device *dev)
 {
        int n;
 
@@ -3016,7 +2974,8 @@ static int yaffs_GetErasedChunks(yaffs_Device * dev)
 
 }
 
-static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block, int wholeBlock)
+static int yaffs_GarbageCollectBlock(yaffs_Device *dev, int block,
+               int wholeBlock)
 {
        int oldChunk;
        int newChunk;
@@ -3038,15 +2997,15 @@ static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block, int wholeBlo
        yaffs_Object *object;
 
        isCheckpointBlock = (bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT);
-       
+
        bi->blockState = YAFFS_BLOCK_STATE_COLLECTING;
 
        T(YAFFS_TRACE_TRACING,
-         (TSTR("Collecting block %d, in use %d, shrink %d, wholeBlock %d" TENDSTR), 
-         block,
-         bi->pagesInUse,
-         bi->hasShrinkHeader,
-         wholeBlock));
+                       (TSTR("Collecting block %d, in use %d, shrink %d, wholeBlock %d" TENDSTR),
+                        block,
+                        bi->pagesInUse,
+                        bi->hasShrinkHeader,
+                        wholeBlock));
 
        /*yaffs_VerifyFreeChunks(dev); */
 
@@ -3060,31 +3019,31 @@ static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block, int wholeBlo
        dev->isDoingGC = 1;
 
        if (isCheckpointBlock ||
-           !yaffs_StillSomeChunkBits(dev, block)) {
+                       !yaffs_StillSomeChunkBits(dev, block)) {
                T(YAFFS_TRACE_TRACING,
-                 (TSTR
-                  ("Collecting block %d that has no chunks in use" TENDSTR),
-                  block));
+                               (TSTR
+                                ("Collecting block %d that has no chunks in use" TENDSTR),
+                                block));
                yaffs_BlockBecameDirty(dev, block);
        } else {
 
                __u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
-               
-               yaffs_VerifyBlock(dev,bi,block);
+
+               yaffs_VerifyBlock(dev, bi, block);
 
                maxCopies = (wholeBlock) ? dev->nChunksPerBlock : 10;
                oldChunk = block * dev->nChunksPerBlock + dev->gcChunk;
-               
-               for ( /* init already done */;
+
+               for (/* init already done */;
                     retVal == YAFFS_OK &&
                     dev->gcChunk < dev->nChunksPerBlock &&
-                    (bi->blockState == YAFFS_BLOCK_STATE_COLLECTING)&&
+                    (bi->blockState == YAFFS_BLOCK_STATE_COLLECTING) &&
                     maxCopies > 0;
                     dev->gcChunk++, oldChunk++) {
                        if (yaffs_CheckChunkBit(dev, block, dev->gcChunk)) {
 
                                /* This page is in use and might need to be copied off */
-                               
+
                                maxCopies--;
 
                                markNAND = 1;
@@ -3103,20 +3062,20 @@ static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block, int wholeBlo
                                   ("Collecting chunk in block %d, %d %d %d " TENDSTR),
                                   dev->gcChunk, tags.objectId, tags.chunkId,
                                   tags.byteCount));
-                                  
-                               if(object && !yaffs_SkipVerification(dev)){
-                                       if(tags.chunkId == 0)
+
+                               if (object && !yaffs_SkipVerification(dev)) {
+                                       if (tags.chunkId == 0)
                                                matchingChunk = object->hdrChunk;
-                                       else if(object->softDeleted)
+                                       else if (object->softDeleted)
                                                matchingChunk = oldChunk; /* Defeat the test */
                                        else
-                                               matchingChunk = yaffs_FindChunkInFile(object,tags.chunkId,NULL);
-                                       
-                                       if(oldChunk != matchingChunk)
+                                               matchingChunk = yaffs_FindChunkInFile(object, tags.chunkId, NULL);
+
+                                       if (oldChunk != matchingChunk)
                                                T(YAFFS_TRACE_ERROR,
                                                  (TSTR("gc: page in gc mismatch: %d %d %d %d"TENDSTR),
-                                                 oldChunk,matchingChunk,tags.objectId, tags.chunkId));
-                                               
+                                                 oldChunk, matchingChunk, tags.objectId, tags.chunkId));
+
                                }
 
                                if (!object) {
@@ -3127,13 +3086,13 @@ static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block, int wholeBlo
                                            tags.objectId, tags.chunkId, tags.byteCount));
                                }
 
-                               if (object && 
+                               if (object &&
                                    object->deleted &&
                                    object->softDeleted &&
                                    tags.chunkId != 0) {
                                        /* Data chunk in a soft deleted file, throw it away
                                         * It's a soft deleted data chunk,
-                                        * No need to copy this, just forget about it and 
+                                        * No need to copy this, just forget about it and
                                         * fix up the object.
                                         */
 
@@ -3146,9 +3105,8 @@ static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block, int wholeBlo
                                                cleanups++;
                                        }
                                        markNAND = 0;
-                               } else if (0
-                                          /* Todo object && object->deleted && object->nDataChunks == 0 */
-                                          ) {
+                               } else if (0) {
+                                       /* Todo object && object->deleted && object->nDataChunks == 0 */
                                        /* Deleted object header with no data chunks.
                                         * Can be discarded and the file deleted.
                                         */
@@ -3180,8 +3138,8 @@ static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block, int wholeBlo
                                                oh = (yaffs_ObjectHeader *)buffer;
                                                oh->isShrink = 0;
                                                tags.extraIsShrinkHeader = 0;
-                                               
-                                               yaffs_VerifyObjectHeader(object,oh,&tags,1);
+
+                                               yaffs_VerifyObjectHeader(object, oh, &tags, 1);
                                        }
 
                                        newChunk =
@@ -3207,7 +3165,7 @@ static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block, int wholeBlo
                                        }
                                }
 
-                               if(retVal == YAFFS_OK)
+                               if (retVal == YAFFS_OK)
                                        yaffs_DeleteChunk(dev, oldChunk, markNAND, __LINE__);
 
                        }
@@ -3239,9 +3197,10 @@ static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block, int wholeBlo
 
        }
 
-       yaffs_VerifyCollectedBlock(dev,bi,block);
-         
-       if (chunksBefore >= (chunksAfter = yaffs_GetErasedChunks(dev))) {
+       yaffs_VerifyCollectedBlock(dev, bi, block);
+
+       chunksAfter = yaffs_GetErasedChunks(dev);
+       if (chunksBefore >= chunksAfter) {
                T(YAFFS_TRACE_GC,
                  (TSTR
                   ("gc did not increase free chunks before %d after %d"
@@ -3249,11 +3208,11 @@ static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block, int wholeBlo
        }
 
        /* If the gc completed then clear the current gcBlock so that we find another. */
-       if(bi->blockState != YAFFS_BLOCK_STATE_COLLECTING){
+       if (bi->blockState != YAFFS_BLOCK_STATE_COLLECTING) {
                dev->gcBlock = -1;
                dev->gcChunk = 0;
        }
-       
+
        dev->isDoingGC = 0;
 
        return retVal;
@@ -3268,29 +3227,29 @@ static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block, int wholeBlo
  * The idea is to help clear out space in a more spread-out manner.
  * Dunno if it really does anything useful.
  */
-static int yaffs_CheckGarbageCollection(yaffs_Device * dev)
+static int yaffs_CheckGarbageCollection(yaffs_Device *dev)
 {
        int block;
        int aggressive;
        int gcOk = YAFFS_OK;
        int maxTries = 0;
-       
+
        int checkpointBlockAdjust;
 
        if (dev->isDoingGC) {
                /* Bail out so we don't get recursive gc */
                return YAFFS_OK;
        }
-       
+
        /* This loop should pass the first time.
         * We'll only see looping here if the erase of the collected block fails.
         */
 
        do {
                maxTries++;
-               
+
                checkpointBlockAdjust = yaffs_CalcCheckpointBlocksRequired(dev) - dev->blocksInCheckpoint;
-               if(checkpointBlockAdjust < 0)
+               if (checkpointBlockAdjust < 0)
                        checkpointBlockAdjust = 0;
 
                if (dev->nErasedBlocks < (dev->nReservedBlocks + checkpointBlockAdjust + 2)) {
@@ -3301,11 +3260,11 @@ static int yaffs_CheckGarbageCollection(yaffs_Device * dev)
                        aggressive = 0;
                }
 
-               if(dev->gcBlock <= 0){
+               if (dev->gcBlock <= 0) {
                        dev->gcBlock = yaffs_FindBlockForGarbageCollection(dev, aggressive);
                        dev->gcChunk = 0;
                }
-               
+
                block = dev->gcBlock;
 
                if (block > 0) {
@@ -3319,7 +3278,7 @@ static int yaffs_CheckGarbageCollection(yaffs_Device * dev)
                           ("yaffs: GC erasedBlocks %d aggressive %d" TENDSTR),
                           dev->nErasedBlocks, aggressive));
 
-                       gcOk = yaffs_GarbageCollectBlock(dev,block,aggressive);
+                       gcOk = yaffs_GarbageCollectBlock(dev, block, aggressive);
                }
 
                if (dev->nErasedBlocks < (dev->nReservedBlocks) && block > 0) {
@@ -3328,7 +3287,7 @@ static int yaffs_CheckGarbageCollection(yaffs_Device * dev)
                           ("yaffs: GC !!!no reclaim!!! erasedBlocks %d after try %d block %d"
                            TENDSTR), dev->nErasedBlocks, maxTries, block));
                }
-       } while ((dev->nErasedBlocks < dev->nReservedBlocks) && 
+       } while ((dev->nErasedBlocks < dev->nReservedBlocks) &&
                 (block > 0) &&
                 (maxTries < 2));
 
@@ -3337,7 +3296,7 @@ static int yaffs_CheckGarbageCollection(yaffs_Device * dev)
 
 /*-------------------------  TAGS --------------------------------*/
 
-static int yaffs_TagsMatch(const yaffs_ExtendedTags * tags, int objectId,
+static int yaffs_TagsMatch(const yaffs_ExtendedTags *tags, int objectId,
                           int chunkInObject)
 {
        return (tags->chunkId == chunkInObject &&
@@ -3348,8 +3307,8 @@ static int yaffs_TagsMatch(const yaffs_ExtendedTags * tags, int objectId,
 
 /*-------------------- Data file manipulation -----------------*/
 
-static int yaffs_FindChunkInFile(yaffs_Object * in, int chunkInInode,
-                                yaffs_ExtendedTags * tags)
+static int yaffs_FindChunkInFile(yaffs_Object *in, int chunkInInode,
+                                yaffs_ExtendedTags *tags)
 {
        /*Get the Tnode, then get the level 0 offset chunk offset */
        yaffs_Tnode *tn;
@@ -3367,7 +3326,7 @@ static int yaffs_FindChunkInFile(yaffs_Object * in, int chunkInInode,
        tn = yaffs_FindLevel0Tnode(dev, &in->variant.fileVariant, chunkInInode);
 
        if (tn) {
-               theChunk = yaffs_GetChunkGroupBase(dev,tn,chunkInInode);
+               theChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode);
 
                retVal =
                    yaffs_FindChunkInGroup(dev, theChunk, tags, in->objectId,
@@ -3376,8 +3335,8 @@ static int yaffs_FindChunkInFile(yaffs_Object * in, int chunkInInode,
        return retVal;
 }
 
-static int yaffs_FindAndDeleteChunkInFile(yaffs_Object * in, int chunkInInode,
-                                         yaffs_ExtendedTags * tags)
+static int yaffs_FindAndDeleteChunkInFile(yaffs_Object *in, int chunkInInode,
+                                         yaffs_ExtendedTags *tags)
 {
        /* Get the Tnode, then get the level 0 offset chunk offset */
        yaffs_Tnode *tn;
@@ -3396,7 +3355,7 @@ static int yaffs_FindAndDeleteChunkInFile(yaffs_Object * in, int chunkInInode,
 
        if (tn) {
 
-               theChunk = yaffs_GetChunkGroupBase(dev,tn,chunkInInode);
+               theChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode);
 
                retVal =
                    yaffs_FindChunkInGroup(dev, theChunk, tags, in->objectId,
@@ -3404,7 +3363,7 @@ static int yaffs_FindAndDeleteChunkInFile(yaffs_Object * in, int chunkInInode,
 
                /* Delete the entry in the filestructure (if found) */
                if (retVal != -1) {
-                       yaffs_PutLevel0Tnode(dev,tn,chunkInInode,0);
+                       yaffs_PutLevel0Tnode(dev, tn, chunkInInode, 0);
                }
        } else {
                /*T(("No level 0 found for %d\n", chunkInInode)); */
@@ -3418,7 +3377,7 @@ static int yaffs_FindAndDeleteChunkInFile(yaffs_Object * in, int chunkInInode,
 
 #ifdef YAFFS_PARANOID
 
-static int yaffs_CheckFileSanity(yaffs_Object * in)
+static int yaffs_CheckFileSanity(yaffs_Object *in)
 {
        int chunk;
        int nChunks;
@@ -3447,7 +3406,7 @@ static int yaffs_CheckFileSanity(yaffs_Object * in)
 
                if (tn) {
 
-                       theChunk = yaffs_GetChunkGroupBase(dev,tn,chunk);
+                       theChunk = yaffs_GetChunkGroupBase(dev, tn, chunk);
 
                        if (yaffs_CheckChunkBits
                            (dev, theChunk / dev->nChunksPerBlock,
@@ -3476,14 +3435,14 @@ static int yaffs_CheckFileSanity(yaffs_Object * in)
 
 #endif
 
-static int yaffs_PutChunkIntoFile(yaffs_Object * in, int chunkInInode,
+static int yaffs_PutChunkIntoFile(yaffs_Object *in, int chunkInInode,
                                  int chunkInNAND, int inScan)
 {
-       /* NB inScan is zero unless scanning. 
-        * For forward scanning, inScan is > 0; 
+       /* NB inScan is zero unless scanning.
+        * For forward scanning, inScan is > 0;
         * for backward scanning inScan is < 0
         */
-        
+
        yaffs_Tnode *tn;
        yaffs_Device *dev = in->myDev;
        int existingChunk;
@@ -3507,7 +3466,7 @@ static int yaffs_PutChunkIntoFile(yaffs_Object * in, int chunkInInode,
                return YAFFS_OK;
        }
 
-       tn = yaffs_AddOrFindLevel0Tnode(dev, 
+       tn = yaffs_AddOrFindLevel0Tnode(dev,
                                        &in->variant.fileVariant,
                                        chunkInInode,
                                        NULL);
@@ -3515,11 +3474,11 @@ static int yaffs_PutChunkIntoFile(yaffs_Object * in, int chunkInInode,
                return YAFFS_FAIL;
        }
 
-       existingChunk = yaffs_GetChunkGroupBase(dev,tn,chunkInInode);
+       existingChunk = yaffs_GetChunkGroupBase(dev, tn, chunkInInode);
 
        if (inScan != 0) {
                /* If we're scanning then we need to test for duplicates
-                * NB This does not need to be efficient since it should only ever 
+                * NB This does not need to be efficient since it should only ever
                 * happen when the power fails during a write, then only one
                 * chunk should ever be affected.
                 *
@@ -3560,11 +3519,11 @@ static int yaffs_PutChunkIntoFile(yaffs_Object * in, int chunkInInode,
 
                        }
 
-                       /* NB The deleted flags should be false, otherwise the chunks will 
+                       /* NB The deleted flags should be false, otherwise the chunks will
                         * not be loaded during a scan
                         */
 
-                       if(inScan > 0) {
+                       if (inScan > 0) {
                                newSerial = newTags.serialNumber;
                                existingSerial = existingTags.serialNumber;
                        }
@@ -3573,7 +3532,7 @@ static int yaffs_PutChunkIntoFile(yaffs_Object * in, int chunkInInode,
                            (in->myDev->isYaffs2 ||
                             existingChunk <= 0 ||
                             ((existingSerial + 1) & 3) == newSerial)) {
-                               /* Forward scanning.                            
+                               /* Forward scanning.
                                 * Use new
                                 * Delete the old one and drop through to update the tnode
                                 */
@@ -3596,31 +3555,31 @@ static int yaffs_PutChunkIntoFile(yaffs_Object * in, int chunkInInode,
                in->nDataChunks++;
        }
 
-       yaffs_PutLevel0Tnode(dev,tn,chunkInInode,chunkInNAND);
+       yaffs_PutLevel0Tnode(dev, tn, chunkInInode, chunkInNAND);
 
        return YAFFS_OK;
 }
 
-static int yaffs_ReadChunkDataFromObject(yaffs_Object * in, int chunkInInode,
-                                        __u8 * buffer)
+static int yaffs_ReadChunkDataFromObject(yaffs_Object *in, int chunkInInode,
+                                       __u8 *buffer)
 {
        int chunkInNAND = yaffs_FindChunkInFile(in, chunkInInode, NULL);
 
        if (chunkInNAND >= 0) {
                return yaffs_ReadChunkWithTagsFromNAND(in->myDev, chunkInNAND,
-                                                      buffer,NULL);
+                                               buffer, NULL);
        } else {
                T(YAFFS_TRACE_NANDACCESS,
                  (TSTR("Chunk %d not found zero instead" TENDSTR),
                   chunkInNAND));
                /* get sane (zero) data if you read a hole */
-               memset(buffer, 0, in->myDev->nDataBytesPerChunk);       
+               memset(buffer, 0, in->myDev->nDataBytesPerChunk);
                return 0;
        }
 
 }
 
-void yaffs_DeleteChunk(yaffs_Device * dev, int chunkId, int markNAND, int lyn)
+void yaffs_DeleteChunk(yaffs_Device *dev, int chunkId, int markNAND, int lyn)
 {
        int block;
        int page;
@@ -3629,17 +3588,17 @@ void yaffs_DeleteChunk(yaffs_Device * dev, int chunkId, int markNAND, int lyn)
 
        if (chunkId <= 0)
                return;
-               
+
 
        dev->nDeletions++;
        block = chunkId / dev->nChunksPerBlock;
        page = chunkId % dev->nChunksPerBlock;
 
 
-       if(!yaffs_CheckChunkBit(dev,block,page))
+       if (!yaffs_CheckChunkBit(dev, block, page))
                T(YAFFS_TRACE_VERIFY,
-                       (TSTR("Deleting invalid chunk %d"TENDSTR),
-                        chunkId));
+                       (TSTR("Deleting invalid chunk %d"TENDSTR),
+                        chunkId));
 
        bi = yaffs_GetBlockInfo(dev, block);
 
@@ -3685,8 +3644,8 @@ void yaffs_DeleteChunk(yaffs_Device * dev, int chunkId, int markNAND, int lyn)
 
 }
 
-static int yaffs_WriteChunkDataToObject(yaffs_Object * in, int chunkInInode,
-                                       const __u8 * buffer, int nBytes,
+static int yaffs_WriteChunkDataToObject(yaffs_Object *in, int chunkInInode,
+                                       const __u8 *buffer, int nBytes,
                                        int useReserve)
 {
        /* Find old chunk Need to do this to get serial number
@@ -3715,14 +3674,12 @@ static int yaffs_WriteChunkDataToObject(yaffs_Object * in, int chunkInInode,
        newTags.serialNumber =
            (prevChunkId >= 0) ? prevTags.serialNumber + 1 : 1;
        newTags.byteCount = nBytes;
-       
-       if(nBytes < 1 || nBytes > dev->totalBytesPerChunk){
+
+       if (nBytes < 1 || nBytes > dev->totalBytesPerChunk) {
          T(YAFFS_TRACE_ERROR,
          (TSTR("Writing %d bytes to chunk!!!!!!!!!" TENDSTR), nBytes));
          YBUG();
-     }
-       
-       
+       }
 
        newChunkId =
            yaffs_WriteNewChunkWithTagsToNAND(dev, buffer, &newTags,
@@ -3745,7 +3702,7 @@ static int yaffs_WriteChunkDataToObject(yaffs_Object * in, int chunkInInode,
 /* UpdateObjectHeader updates the header on NAND for an object.
  * If name is not NULL, then that new name is used.
  */
-int yaffs_UpdateObjectHeader(yaffs_Object * in, const YCHAR * name, int force,
+int yaffs_UpdateObjectHeader(yaffs_Object *in, const YCHAR *name, int force,
                             int isShrink, int shadows)
 {
 
@@ -3764,14 +3721,14 @@ int yaffs_UpdateObjectHeader(yaffs_Object * in, const YCHAR * name, int force,
        __u8 *buffer = NULL;
        YCHAR oldName[YAFFS_MAX_NAME_LENGTH + 1];
 
-        yaffs_ObjectHeader *oh = NULL;
-        
-        yaffs_strcpy(oldName,_Y("silly old name"));
+       yaffs_ObjectHeader *oh = NULL;
+
+       yaffs_strcpy(oldName, _Y("silly old name"));
 
 
-       if (!in->fake || 
-           in == dev->rootDir || /* The rootDir should also be saved */
-           force) {
+       if (!in->fake ||
+               in == dev->rootDir || /* The rootDir should also be saved */
+               force) {
 
                yaffs_CheckGarbageCollection(dev);
                yaffs_CheckObjectDetailsLoaded(in);
@@ -3784,9 +3741,9 @@ int yaffs_UpdateObjectHeader(yaffs_Object * in, const YCHAR * name, int force,
                if (prevChunkId > 0) {
                        result = yaffs_ReadChunkWithTagsFromNAND(dev, prevChunkId,
                                                        buffer, &oldTags);
-                       
-                       yaffs_VerifyObjectHeader(in,oh,&oldTags,0);
-                                                                               
+
+                       yaffs_VerifyObjectHeader(in, oh, &oldTags, 0);
+
                        memcpy(oldName, oh->name, sizeof(oh->name));
                }
 
@@ -3820,7 +3777,7 @@ int yaffs_UpdateObjectHeader(yaffs_Object * in, const YCHAR * name, int force,
                if (name && *name) {
                        memset(oh->name, 0, sizeof(oh->name));
                        yaffs_strncpy(oh->name, name, YAFFS_MAX_NAME_LENGTH);
-               } else if (prevChunkId>=0) {
+               } else if (prevChunkId >= 0) {
                        memcpy(oh->name, oldName, sizeof(oh->name));
                } else {
                        memset(oh->name, 0, sizeof(oh->name));
@@ -3874,7 +3831,7 @@ int yaffs_UpdateObjectHeader(yaffs_Object * in, const YCHAR * name, int force,
                newTags.extraShadows = (oh->shadowsObject > 0) ? 1 : 0;
                newTags.extraObjectType = in->variantType;
 
-               yaffs_VerifyObjectHeader(in,oh,&newTags,1);
+               yaffs_VerifyObjectHeader(in, oh, &newTags, 1);
 
                /* Create new chunk in NAND */
                newChunkId =
@@ -3890,13 +3847,13 @@ int yaffs_UpdateObjectHeader(yaffs_Object * in, const YCHAR * name, int force,
                                                  __LINE__);
                        }
 
-                       if(!yaffs_ObjectHasCachedWriteData(in))
+                       if (!yaffs_ObjectHasCachedWriteData(in))
                                in->dirty = 0;
 
                        /* If this was a shrink, then mark the block that the chunk lives on */
                        if (isShrink) {
                                bi = yaffs_GetBlockInfo(in->myDev,
-                                                       newChunkId /in->myDev-> nChunksPerBlock);
+                                       newChunkId / in->myDev->nChunksPerBlock);
                                bi->hasShrinkHeader = 1;
                        }
 
@@ -3914,11 +3871,11 @@ int yaffs_UpdateObjectHeader(yaffs_Object * in, const YCHAR * name, int force,
 
 /*------------------------ Short Operations Cache ----------------------------------------
  *   In many situations where there is no high level buffering (eg WinCE) a lot of
- *   reads might be short sequential reads, and a lot of writes may be short 
+ *   reads might be short sequential reads, and a lot of writes may be short
  *   sequential writes. eg. scanning/writing a jpeg file.
- *   In these cases, a short read/write cache can provide a huge perfomance benefit 
+ *   In these cases, a short read/write cache can provide a huge perfomance benefit
  *   with dumb-as-a-rock code.
- *   In Linux, the page cache provides read buffering aand the short op cache provides write 
+ *   In Linux, the page cache provides read buffering aand the short op cache provides write
  *   buffering.
  *
  *   There are a limited number (~10) of cache chunks per device so that we don't
@@ -3931,19 +3888,19 @@ static int yaffs_ObjectHasCachedWriteData(yaffs_Object *obj)
        int i;
        yaffs_ChunkCache *cache;
        int nCaches = obj->myDev->nShortOpCaches;
-       
-       for(i = 0; i < nCaches; i++){
+
+       for (i = 0; i < nCaches; i++) {
                cache = &dev->srCache[i];
                if (cache->object == obj &&
                    cache->dirty)
                        return 1;
        }
-       
+
        return 0;
 }
 
 
-static void yaffs_FlushFilesChunkCache(yaffs_Object * obj)
+static void yaffs_FlushFilesChunkCache(yaffs_Object *obj)
 {
        yaffs_Device *dev = obj->myDev;
        int lowest = -99;       /* Stop compiler whining. */
@@ -4004,38 +3961,38 @@ void yaffs_FlushEntireDeviceCache(yaffs_Device *dev)
        yaffs_Object *obj;
        int nCaches = dev->nShortOpCaches;
        int i;
-       
+
        /* Find a dirty object in the cache and flush it...
         * until there are no further dirty objects.
         */
        do {
                obj = NULL;
-               fori = 0; i < nCaches && !obj; i++) {
+               for (i = 0; i < nCaches && !obj; i++) {
                        if (dev->srCache[i].object &&
                            dev->srCache[i].dirty)
                                obj = dev->srCache[i].object;
-                           
+
                }
-               if(obj)
+               if (obj)
                        yaffs_FlushFilesChunkCache(obj);
-                       
-       } while(obj);
-       
+
+       } while (obj);
+
 }
 
 
 /* Grab us a cache chunk for use.
- * First look for an empty one. 
+ * First look for an empty one.
  * Then look for the least recently used non-dirty one.
  * Then look for the least recently used dirty one...., flush and look again.
  */
-static yaffs_ChunkCache *yaffs_GrabChunkCacheWorker(yaffs_Device * dev)
+static yaffs_ChunkCache *yaffs_GrabChunkCacheWorker(yaffs_Device *dev)
 {
        int i;
 
        if (dev->nShortOpCaches > 0) {
                for (i = 0; i < dev->nShortOpCaches; i++) {
-                       if (!dev->srCache[i].object) 
+                       if (!dev->srCache[i].object)
                                return &dev->srCache[i];
                }
        }
@@ -4043,7 +4000,7 @@ static yaffs_ChunkCache *yaffs_GrabChunkCacheWorker(yaffs_Device * dev)
        return NULL;
 }
 
-static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device * dev)
+static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device *dev)
 {
        yaffs_ChunkCache *cache;
        yaffs_Object *theObj;
@@ -4073,8 +4030,7 @@ static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device * dev)
                        for (i = 0; i < dev->nShortOpCaches; i++) {
                                if (dev->srCache[i].object &&
                                    !dev->srCache[i].locked &&
-                                   (dev->srCache[i].lastUse < usage || !cache))
-                               {
+                                   (dev->srCache[i].lastUse < usage || !cache)) {
                                        usage = dev->srCache[i].lastUse;
                                        theObj = dev->srCache[i].object;
                                        cache = &dev->srCache[i];
@@ -4096,7 +4052,7 @@ static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device * dev)
 }
 
 /* Find a cached chunk */
-static yaffs_ChunkCache *yaffs_FindChunkCache(const yaffs_Object * obj,
+static yaffs_ChunkCache *yaffs_FindChunkCache(const yaffs_Object *obj,
                                              int chunkId)
 {
        yaffs_Device *dev = obj->myDev;
@@ -4115,7 +4071,7 @@ static yaffs_ChunkCache *yaffs_FindChunkCache(const yaffs_Object * obj,
 }
 
 /* Mark the chunk for the least recently used algorithym */
-static void yaffs_UseChunkCache(yaffs_Device * dev, yaffs_ChunkCache * cache,
+static void yaffs_UseChunkCache(yaffs_Device *dev, yaffs_ChunkCache *cache,
                                int isAWrite)
 {
 
@@ -4143,7 +4099,7 @@ static void yaffs_UseChunkCache(yaffs_Device * dev, yaffs_ChunkCache * cache,
  * Do this when a whole page gets written,
  * ie the short cache for this page is no longer valid.
  */
-static void yaffs_InvalidateChunkCache(yaffs_Object * object, int chunkId)
+static void yaffs_InvalidateChunkCache(yaffs_Object *object, int chunkId)
 {
        if (object->myDev->nShortOpCaches > 0) {
                yaffs_ChunkCache *cache = yaffs_FindChunkCache(object, chunkId);
@@ -4157,7 +4113,7 @@ static void yaffs_InvalidateChunkCache(yaffs_Object * object, int chunkId)
 /* Invalidate all the cache pages associated with this object
  * Do this whenever ther file is deleted or resized.
  */
-static void yaffs_InvalidateWholeChunkCache(yaffs_Object * in)
+static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in)
 {
        int i;
        yaffs_Device *dev = in->myDev;
@@ -4175,18 +4131,18 @@ static void yaffs_InvalidateWholeChunkCache(yaffs_Object * in)
 /*--------------------- Checkpointing --------------------*/
 
 
-static int yaffs_WriteCheckpointValidityMarker(yaffs_Device *dev,int head)
+static int yaffs_WriteCheckpointValidityMarker(yaffs_Device *dev, int head)
 {
        yaffs_CheckpointValidity cp;
-       
-       memset(&cp,0,sizeof(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))?
+
+       return (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp)) ?
                1 : 0;
 }
 
@@ -4194,10 +4150,10 @@ static int yaffs_ReadCheckpointValidityMarker(yaffs_Device *dev, int head)
 {
        yaffs_CheckpointValidity cp;
        int ok;
-       
-       ok = (yaffs_CheckpointRead(dev,&cp,sizeof(cp)) == sizeof(cp));
-       
-       if(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) &&
@@ -4205,20 +4161,20 @@ static int yaffs_ReadCheckpointValidityMarker(yaffs_Device *dev, int head)
        return ok ? 1 : 0;
 }
 
-static void yaffs_DeviceToCheckpointDevice(yaffs_CheckpointDevice *cp, 
+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;
-       
+
        cp->nDeletedFiles = dev->nDeletedFiles;
        cp->nUnlinkedFiles = dev->nUnlinkedFiles;
        cp->nBackgroundDeletions = dev->nBackgroundDeletions;
        cp->sequenceNumber = dev->sequenceNumber;
        cp->oldestDirtySequence = dev->oldestDirtySequence;
-       
+
 }
 
 static void yaffs_CheckpointDeviceToDevice(yaffs_Device *dev,
@@ -4228,7 +4184,7 @@ static void yaffs_CheckpointDeviceToDevice(yaffs_Device *dev,
        dev->allocationBlock = cp->allocationBlock;
        dev->allocationPage = cp->allocationPage;
        dev->nFreeChunks = cp->nFreeChunks;
-       
+
        dev->nDeletedFiles = cp->nDeletedFiles;
        dev->nUnlinkedFiles = cp->nUnlinkedFiles;
        dev->nBackgroundDeletions = cp->nBackgroundDeletions;
@@ -4244,23 +4200,23 @@ static int yaffs_WriteCheckpointDevice(yaffs_Device *dev)
        __u32 nBlocks = (dev->internalEndBlock - dev->internalStartBlock + 1);
 
        int ok;
-               
+
        /* Write device runtime values*/
-       yaffs_DeviceToCheckpointDevice(&cp,dev);
+       yaffs_DeviceToCheckpointDevice(&cp, dev);
        cp.structType = sizeof(cp);
-       
-       ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp));
-       
+
+       ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
+
        /* Write block info */
-       if(ok) {
+       if (ok) {
                nBytes = nBlocks * sizeof(yaffs_BlockInfo);
-               ok = (yaffs_CheckpointWrite(dev,dev->blockInfo,nBytes) == nBytes);
+               ok = (yaffs_CheckpointWrite(dev, dev->blockInfo, nBytes) == nBytes);
        }
-               
-       /* Write chunk bits */          
-       if(ok) {
+
+       /* Write chunk bits */
+       if (ok) {
                nBytes = nBlocks * dev->chunkBitmapStride;
-               ok = (yaffs_CheckpointWrite(dev,dev->chunkBits,nBytes) == nBytes);
+               ok = (yaffs_CheckpointWrite(dev, dev->chunkBits, nBytes) == nBytes);
        }
        return   ok ? 1 : 0;
 
@@ -4272,28 +4228,28 @@ static int yaffs_ReadCheckpointDevice(yaffs_Device *dev)
        __u32 nBytes;
        __u32 nBlocks = (dev->internalEndBlock - dev->internalStartBlock + 1);
 
-       int ok; 
-       
-       ok = (yaffs_CheckpointRead(dev,&cp,sizeof(cp)) == sizeof(cp));
-       if(!ok)
+       int ok;
+
+       ok = (yaffs_CheckpointRead(dev, &cp, sizeof(cp)) == sizeof(cp));
+       if (!ok)
                return 0;
-               
-       if(cp.structType != sizeof(cp))
+
+       if (cp.structType != sizeof(cp))
                return 0;
-               
-       
-       yaffs_CheckpointDeviceToDevice(dev,&cp);
-       
+
+
+       yaffs_CheckpointDeviceToDevice(dev, &cp);
+
        nBytes = nBlocks * sizeof(yaffs_BlockInfo);
-       
-       ok = (yaffs_CheckpointRead(dev,dev->blockInfo,nBytes) == nBytes);
-       
-       if(!ok)
+
+       ok = (yaffs_CheckpointRead(dev, dev->blockInfo, nBytes) == nBytes);
+
+       if (!ok)
                return 0;
        nBytes = nBlocks * dev->chunkBitmapStride;
-       
-       ok = (yaffs_CheckpointRead(dev,dev->chunkBits,nBytes) == nBytes);
-       
+
+       ok = (yaffs_CheckpointRead(dev, dev->chunkBits, nBytes) == nBytes);
+
        return ok ? 1 : 0;
 }
 
@@ -4313,42 +4269,43 @@ static void yaffs_ObjectToCheckpointObject(yaffs_CheckpointObject *cp,
        cp->unlinkAllowed = obj->unlinkAllowed;
        cp->serial = obj->serial;
        cp->nDataChunks = obj->nDataChunks;
-       
-       if(obj->variantType == YAFFS_OBJECT_TYPE_FILE)
+
+       if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
                cp->fileSizeOrEquivalentObjectId = obj->variant.fileVariant.fileSize;
-       else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
+       else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
                cp->fileSizeOrEquivalentObjectId = obj->variant.hardLinkVariant.equivalentObjectId;
 }
 
-static int yaffs_CheckpointObjectToObject( yaffs_Object *obj,yaffs_CheckpointObject *cp)
+static int yaffs_CheckpointObjectToObject(yaffs_Object *obj, yaffs_CheckpointObject *cp)
 {
 
        yaffs_Object *parent;
 
        if (obj->variantType != cp->variantType) {
-               T(YAFFS_TRACE_ERROR,(TSTR("Checkpoint read object %d type %d "
+               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;
        }
-       
+
        obj->objectId = cp->objectId;
-       
-       if(cp->parentId)
+
+       if (cp->parentId)
                parent = yaffs_FindOrCreateObjectByNumber(
                                        obj->myDev,
                                        cp->parentId,
                                        YAFFS_OBJECT_TYPE_DIRECTORY);
        else
                parent = NULL;
-               
-       if(parent) {
+
+       if (parent) {
                if (parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-                       T(YAFFS_TRACE_ALWAYS,(TSTR("Checkpoint read object %d parent %d type %d"
+                       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));
+                               cp->objectId, cp->parentId, cp->variantType,
+                               cp->hdrChunk, parent->variantType));
                        return 0;
                }
                yaffs_AddObjectToDirectory(parent, obj);
@@ -4364,35 +4321,35 @@ static int yaffs_CheckpointObjectToObject( yaffs_Object *obj,yaffs_CheckpointObj
        obj->unlinkAllowed = cp->unlinkAllowed;
        obj->serial = cp->serial;
        obj->nDataChunks = cp->nDataChunks;
-       
-       if(obj->variantType == YAFFS_OBJECT_TYPE_FILE)
+
+       if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
                obj->variant.fileVariant.fileSize = cp->fileSizeOrEquivalentObjectId;
-       else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
+       else if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
                obj->variant.hardLinkVariant.equivalentObjectId = cp->fileSizeOrEquivalentObjectId;
 
-       if(obj->hdrChunk > 0)
+       if (obj->hdrChunk > 0)
                obj->lazyLoaded = 1;
        return 1;
 }
 
 
 
-static int yaffs_CheckpointTnodeWorker(yaffs_Object * in, yaffs_Tnode * tn,
-                                       __u32 level, int chunkOffset)
+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 = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
 
-       if(tnodeSize < sizeof(yaffs_Tnode))
+       if (tnodeSize < sizeof(yaffs_Tnode))
                tnodeSize = sizeof(yaffs_Tnode);
-       
+
 
        if (tn) {
                if (level > 0) {
 
-                       for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++){
+                       for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++) {
                                if (tn->internal[i]) {
                                        ok = yaffs_CheckpointTnodeWorker(in,
                                                        tn->internal[i],
@@ -4402,9 +4359,9 @@ static int yaffs_CheckpointTnodeWorker(yaffs_Object * in, yaffs_Tnode * tn,
                        }
                } 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);
+                       ok = (yaffs_CheckpointWrite(dev, &baseOffset, sizeof(baseOffset)) == sizeof(baseOffset));
+                       if (ok)
+                               ok = (yaffs_CheckpointWrite(dev, tn, tnodeSize) == tnodeSize);
                }
        }
 
@@ -4416,17 +4373,17 @@ static int yaffs_WriteCheckpointTnodes(yaffs_Object *obj)
 {
        __u32 endMarker = ~0;
        int ok = 1;
-       
-       if(obj->variantType == YAFFS_OBJECT_TYPE_FILE){
+
+       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)) == 
+               if (ok)
+                       ok = (yaffs_CheckpointWrite(obj->myDev, &endMarker, sizeof(endMarker)) ==
                                sizeof(endMarker));
        }
-       
+
        return ok ? 1 : 0;
 }
 
@@ -4440,85 +4397,83 @@ static int yaffs_ReadCheckpointTnodes(yaffs_Object *obj)
        int nread = 0;
        int tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
 
-       if(tnodeSize < sizeof(yaffs_Tnode))
+       if (tnodeSize < sizeof(yaffs_Tnode))
                tnodeSize = sizeof(yaffs_Tnode);
 
-       ok = (yaffs_CheckpointRead(dev,&baseChunk,sizeof(baseChunk)) == sizeof(baseChunk));
-       
-       while(ok && (~baseChunk)){
+       ok = (yaffs_CheckpointRead(dev, &baseChunk, sizeof(baseChunk)) == sizeof(baseChunk));
+
+       while (ok && (~baseChunk)) {
                nread++;
                /* Read level 0 tnode */
-               
-               
+
+
                tn = yaffs_GetTnodeRaw(dev);
-               if(tn)
-                       ok = (yaffs_CheckpointRead(dev,tn,tnodeSize) == tnodeSize);
+               if (tn)
+                       ok = (yaffs_CheckpointRead(dev, tn, tnodeSize) == tnodeSize);
                else
                        ok = 0;
-                       
-               if(tn && ok){
+
+               if (tn && ok)
                        ok = yaffs_AddOrFindLevel0Tnode(dev,
-                                                       fileStructPtr,
-                                                       baseChunk,
-                                                       tn) ? 1 : 0;
-                                                       
-               }
-                       
-               if(ok)
-                       ok = (yaffs_CheckpointRead(dev,&baseChunk,sizeof(baseChunk)) == sizeof(baseChunk));
-               
+                                                       fileStructPtr,
+                                                       baseChunk,
+                                                       tn) ? 1 : 0;
+
+               if (ok)
+                       ok = (yaffs_CheckpointRead(dev, &baseChunk, sizeof(baseChunk)) == sizeof(baseChunk));
+
        }
 
-       T(YAFFS_TRACE_CHECKPOINT,(
+       T(YAFFS_TRACE_CHECKPOINT, (
                TSTR("Checkpoint read tnodes %d records, last %d. ok %d" TENDSTR),
-               nread,baseChunk,ok));
+               nread, baseChunk, ok));
 
-       return ok ? 1 : 0;      
+       return ok ? 1 : 0;
 }
+
 
 static int yaffs_WriteCheckpointObjects(yaffs_Device *dev)
 {
        yaffs_Object *obj;
-        yaffs_CheckpointObject cp;
-        int i;
-        int ok = 1;
-        struct ylist_head *lh;
+       yaffs_CheckpointObject cp;
+       int i;
+       int ok = 1;
+       struct ylist_head *lh;
 
-        
-        /* Iterate through the objects in each hash entry,
+
+       /* 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,(
+        */
+
+       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 %x" TENDSTR),
-                                               cp.objectId,cp.parentId,cp.variantType,cp.hdrChunk,(unsigned) obj));
+                                               cp.objectId, cp.parentId, cp.variantType, cp.hdrChunk, (unsigned) obj));
+
+                                       ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
 
-                                       ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp));
-                                       
-                                       if(ok && obj->variantType == YAFFS_OBJECT_TYPE_FILE){
+                                       if (ok && obj->variantType == YAFFS_OBJECT_TYPE_FILE) {
                                                ok = yaffs_WriteCheckpointTnodes(obj);
                                        }
                                }
                        }
                }
-        }
-        
-        /* Dump end of list */
-       memset(&cp,0xFF,sizeof(yaffs_CheckpointObject));
+       }
+
+       /* Dump end of list */
+       memset(&cp, 0xFF, sizeof(yaffs_CheckpointObject));
        cp.structType = sizeof(cp);
-       
-       if(ok)
-               ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp));
-               
+
+       if (ok)
+               ok = (yaffs_CheckpointWrite(dev, &cp, sizeof(cp)) == sizeof(cp));
+
        return ok ? 1 : 0;
 }
 
@@ -4529,44 +4484,41 @@ static int yaffs_ReadCheckpointObjects(yaffs_Device *dev)
        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,sizeof(cp),ok));
+
+       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, sizeof(cp), ok));
                        ok = 0;
                }
-                       
-               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)
+               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);
+               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
+                               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);
-       
+
+       if (ok)
+               yaffs_HardlinkFixup(dev, hardList);
+
        return ok ? 1 : 0;
 }
 
@@ -4574,14 +4526,14 @@ static int yaffs_WriteCheckpointSum(yaffs_Device *dev)
 {
        __u32 checkpointSum;
        int ok;
-       
-       yaffs_GetCheckpointSum(dev,&checkpointSum);
-       
-       ok = (yaffs_CheckpointWrite(dev,&checkpointSum,sizeof(checkpointSum)) == sizeof(checkpointSum));
-       
-       if(!ok)
+
+       yaffs_GetCheckpointSum(dev, &checkpointSum);
+
+       ok = (yaffs_CheckpointWrite(dev, &checkpointSum, sizeof(checkpointSum)) == sizeof(checkpointSum));
+
+       if (!ok)
                return 0;
-       
+
        return 1;
 }
 
@@ -4590,63 +4542,62 @@ static int yaffs_ReadCheckpointSum(yaffs_Device *dev)
        __u32 checkpointSum0;
        __u32 checkpointSum1;
        int ok;
-       
-       yaffs_GetCheckpointSum(dev,&checkpointSum0);
-       
-       ok = (yaffs_CheckpointRead(dev,&checkpointSum1,sizeof(checkpointSum1)) == sizeof(checkpointSum1));
-       
-       if(!ok)
+
+       yaffs_GetCheckpointSum(dev, &checkpointSum0);
+
+       ok = (yaffs_CheckpointRead(dev, &checkpointSum1, sizeof(checkpointSum1)) == sizeof(checkpointSum1));
+
+       if (!ok)
                return 0;
-               
-       if(checkpointSum0 != checkpointSum1)
+
+       if (checkpointSum0 != checkpointSum1)
                return 0;
-       
+
        return 1;
 }
 
 
 static int yaffs_WriteCheckpointData(yaffs_Device *dev)
 {
-
        int ok = 1;
-       
-       if(dev->skipCheckpointWrite || !dev->isYaffs2){
-               T(YAFFS_TRACE_CHECKPOINT,(TSTR("skipping checkpoint write" TENDSTR)));
+
+       if (dev->skipCheckpointWrite || !dev->isYaffs2) {
+               T(YAFFS_TRACE_CHECKPOINT, (TSTR("skipping checkpoint write" TENDSTR)));
                ok = 0;
        }
-               
-       if(ok)
-               ok = yaffs_CheckpointOpen(dev,1);
-       
-       if(ok){
-               T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint validity" TENDSTR)));
-               ok = yaffs_WriteCheckpointValidityMarker(dev,1);
+
+       if (ok)
+               ok = yaffs_CheckpointOpen(dev, 1);
+
+       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)));
+       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)));
+       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 (ok) {
+               T(YAFFS_TRACE_CHECKPOINT, (TSTR("write checkpoint validity" TENDSTR)));
+               ok = yaffs_WriteCheckpointValidityMarker(dev, 0);
        }
-       
-       if(ok){
+
+       if (ok) {
                ok = yaffs_WriteCheckpointSum(dev);
        }
-       
-       
-       if(!yaffs_CheckpointClose(dev))
-                ok = 0;
-                
-       if(ok)
-               dev->isCheckpointed = 1;
-        else 
-               dev->isCheckpointed = 0;
+
+
+       if (!yaffs_CheckpointClose(dev))
+               ok = 0;
+
+       if (ok)
+               dev->isCheckpointed = 1;
+       else
+               dev->isCheckpointed = 0;
 
        return dev->isCheckpointed;
 }
@@ -4654,44 +4605,44 @@ static int yaffs_WriteCheckpointData(yaffs_Device *dev)
 static int yaffs_ReadCheckpointData(yaffs_Device *dev)
 {
        int ok = 1;
-       
-       if(dev->skipCheckpointRead || !dev->isYaffs2){
-               T(YAFFS_TRACE_CHECKPOINT,(TSTR("skipping checkpoint read" TENDSTR)));
+
+       if (dev->skipCheckpointRead || !dev->isYaffs2) {
+               T(YAFFS_TRACE_CHECKPOINT, (TSTR("skipping checkpoint read" TENDSTR)));
                ok = 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)
+               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)));
+       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)));    
+       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) {
+               T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint validity" TENDSTR)));
+               ok = yaffs_ReadCheckpointValidityMarker(dev, 0);
        }
-       
-       if(ok){
+
+       if (ok) {
                ok = yaffs_ReadCheckpointSum(dev);
-               T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint checksum %d" TENDSTR),ok));
+               T(YAFFS_TRACE_CHECKPOINT, (TSTR("read checkpoint checksum %d" TENDSTR), ok));
        }
 
-       if(!yaffs_CheckpointClose(dev))
+       if (!yaffs_CheckpointClose(dev))
                ok = 0;
 
-       if(ok)
-               dev->isCheckpointed = 1;
-        else 
-               dev->isCheckpointed = 0;
+       if (ok)
+               dev->isCheckpointed = 1;
+       else
+               dev->isCheckpointed = 0;
 
        return ok ? 1 : 0;
 
@@ -4699,11 +4650,11 @@ static int yaffs_ReadCheckpointData(yaffs_Device *dev)
 
 static void yaffs_InvalidateCheckpoint(yaffs_Device *dev)
 {
-       if(dev->isCheckpointed || 
-          dev->blocksInCheckpoint > 0){
+       if (dev->isCheckpointed ||
+                       dev->blocksInCheckpoint > 0) {
                dev->isCheckpointed = 0;
                yaffs_CheckpointInvalidateStream(dev);
-               if(dev->superBlock && dev->markSuperBlockDirty)
+               if (dev->superBlock && dev->markSuperBlockDirty)
                        dev->markSuperBlockDirty(dev->superBlock);
        }
 }
@@ -4712,18 +4663,18 @@ static void yaffs_InvalidateCheckpoint(yaffs_Device *dev)
 int yaffs_CheckpointSave(yaffs_Device *dev)
 {
 
-       T(YAFFS_TRACE_CHECKPOINT,(TSTR("save entry: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
+       T(YAFFS_TRACE_CHECKPOINT, (TSTR("save entry: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
 
        yaffs_VerifyObjects(dev);
        yaffs_VerifyBlocks(dev);
        yaffs_VerifyFreeChunks(dev);
 
-       if(!dev->isCheckpointed) {
+       if (!dev->isCheckpointed) {
                yaffs_InvalidateCheckpoint(dev);
                yaffs_WriteCheckpointData(dev);
        }
-       
-       T(YAFFS_TRACE_ALWAYS,(TSTR("save exit: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
+
+       T(YAFFS_TRACE_ALWAYS, (TSTR("save exit: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
 
        return dev->isCheckpointed;
 }
@@ -4731,18 +4682,18 @@ int yaffs_CheckpointSave(yaffs_Device *dev)
 int yaffs_CheckpointRestore(yaffs_Device *dev)
 {
        int retval;
-       T(YAFFS_TRACE_CHECKPOINT,(TSTR("restore entry: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-               
+       T(YAFFS_TRACE_CHECKPOINT, (TSTR("restore entry: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
+
        retval = yaffs_ReadCheckpointData(dev);
 
-       if(dev->isCheckpointed){
+       if (dev->isCheckpointed) {
                yaffs_VerifyObjects(dev);
                yaffs_VerifyBlocks(dev);
                yaffs_VerifyFreeChunks(dev);
        }
 
-       T(YAFFS_TRACE_CHECKPOINT,(TSTR("restore exit: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-       
+       T(YAFFS_TRACE_CHECKPOINT, (TSTR("restore exit: isCheckpointed %d"TENDSTR), dev->isCheckpointed));
+
        return retval;
 }
 
@@ -4756,8 +4707,8 @@ int yaffs_CheckpointRestore(yaffs_Device *dev)
  * 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_ReadDataFromFile(yaffs_Object *in, __u8 *buffer, loff_t offset,
+                       int nBytes)
 {
 
        int chunk;
@@ -4772,13 +4723,13 @@ int yaffs_ReadDataFromFile(yaffs_Object * in, __u8 * buffer, loff_t offset,
        dev = in->myDev;
 
        while (n > 0) {
-               //chunk = offset / dev->nDataBytesPerChunk + 1;
-               //start = offset % dev->nDataBytesPerChunk;
-               yaffs_AddrToChunk(dev,offset,&chunk,&start);
+               /* 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.      
+                * the same chunk.
                 */
                if ((start + n) < dev->nDataBytesPerChunk) {
                        nToCopy = n;
@@ -4849,36 +4800,36 @@ int yaffs_ReadDataFromFile(yaffs_Object * in, __u8 * buffer, loff_t offset,
        return nDone;
 }
 
-int yaffs_WriteDataToFile(yaffs_Object * in, const __u8 * buffer, loff_t offset,
-                         int nBytes, int writeThrough)
+int yaffs_WriteDataToFile(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;
+       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) {
-               //chunk = offset / dev->nDataBytesPerChunk + 1;
-               //start = offset % dev->nDataBytesPerChunk;
-               yaffs_AddrToChunk(dev,offset,&chunk,&start);
-               
-               if(chunk * dev->nDataBytesPerChunk + start != offset ||
-                  start >= dev->nDataBytesPerChunk){
-                  T(YAFFS_TRACE_ERROR,(
+               /* chunk = offset / dev->nDataBytesPerChunk + 1; */
+               /* start = offset % dev->nDataBytesPerChunk; */
+               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));
+                          (int)offset, chunk, start));
                }
                chunk++;
 
@@ -4896,7 +4847,7 @@ int yaffs_WriteDataToFile(yaffs_Object * in, const __u8 * buffer, loff_t offset,
 
                        chunkStart = ((chunk - 1) * dev->nDataBytesPerChunk);
 
-                       if(chunkStart > in->variant.fileVariant.fileSize)
+                       if (chunkStart > in->variant.fileVariant.fileSize)
                                nBytesRead = 0; /* Past end of file */
                        else
                                nBytesRead = in->variant.fileVariant.fileSize - chunkStart;
@@ -4908,8 +4859,8 @@ int yaffs_WriteDataToFile(yaffs_Object * in, const __u8 * buffer, loff_t offset,
                        nToWriteBack =
                            (nBytesRead >
                             (start + n)) ? nBytesRead : (start + n);
-                       
-                       if(nToWriteBack < 0 || nToWriteBack > dev->nDataBytesPerChunk)
+
+                       if (nToWriteBack < 0 || nToWriteBack > dev->nDataBytesPerChunk)
                                YBUG();
 
                } else {
@@ -4918,14 +4869,14 @@ int yaffs_WriteDataToFile(yaffs_Object * in, const __u8 * buffer, loff_t offset,
                }
 
                if (nToCopy != dev->nDataBytesPerChunk || dev->inbandTags) {
-                       /* An incomplete start or end chunk (or maybe both start and end chunk), 
+                       /* 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->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(in->
                                                                     myDev)) {
@@ -4937,13 +4888,12 @@ int yaffs_WriteDataToFile(yaffs_Object * in, const __u8 * buffer, loff_t offset,
                                        yaffs_ReadChunkDataFromObject(in, chunk,
                                                                      cache->
                                                                      data);
-                               }
-                               else if(cache && 
-                                       !cache->dirty &&
-                                       !yaffs_CheckSpaceForAllocation(in->myDev)){
+                               } else if (cache &&
+                                       !cache->dirty &&
+                                       !yaffs_CheckSpaceForAllocation(in->myDev)) {
                                        /* Drop the cache if it was a read cache item and
                                         * no space check has been made for it.
-                                        */ 
+                                        */
                                         cache = NULL;
                                }
 
@@ -5000,7 +4950,7 @@ int yaffs_WriteDataToFile(yaffs_Object * in, const __u8 * buffer, loff_t offset,
 
                } else {
                        /* A full chunk. Write directly from the supplied buffer. */
-                       
+
 
 
                        chunkWritten =
@@ -5035,7 +4985,7 @@ int yaffs_WriteDataToFile(yaffs_Object * in, const __u8 * buffer, loff_t offset,
 
 /* ---------------------- File resizing stuff ------------------ */
 
-static void yaffs_PruneResizedChunks(yaffs_Object * in, int newSize)
+static void yaffs_PruneResizedChunks(yaffs_Object *in, int newSize)
 {
 
        yaffs_Device *dev = in->myDev;
@@ -5076,13 +5026,13 @@ static void yaffs_PruneResizedChunks(yaffs_Object * in, int newSize)
 
 }
 
-int yaffs_ResizeFile(yaffs_Object * in, loff_t newSize)
+int yaffs_ResizeFile(yaffs_Object *in, loff_t newSize)
 {
 
        int oldFileSize = in->variant.fileVariant.fileSize;
        __u32 newSizeOfPartialChunk;
        int newFullChunks;
-       
+
        yaffs_Device *dev = in->myDev;
 
        yaffs_AddrToChunk(dev, newSize, &newFullChunks, &newSizeOfPartialChunk);
@@ -5090,23 +5040,23 @@ int yaffs_ResizeFile(yaffs_Object * in, loff_t newSize)
        yaffs_FlushFilesChunkCache(in);
        yaffs_InvalidateWholeChunkCache(in);
 
-        yaffs_CheckGarbageCollection(dev);
+       yaffs_CheckGarbageCollection(dev);
 
-        if (in->variantType != YAFFS_OBJECT_TYPE_FILE) {
-                return YAFFS_FAIL;
-        }
+       if (in->variantType != YAFFS_OBJECT_TYPE_FILE) {
+               return YAFFS_FAIL;
+       }
 
-        if (newSize == oldFileSize) {
-                return YAFFS_OK;
-        }
+       if (newSize == oldFileSize) {
+               return YAFFS_OK;
+       }
 
-        if (newSize < oldFileSize) {
+       if (newSize < oldFileSize) {
 
                yaffs_PruneResizedChunks(in, 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 */
@@ -5130,8 +5080,7 @@ int yaffs_ResizeFile(yaffs_Object * in, loff_t newSize)
                in->variant.fileVariant.fileSize = newSize;
        }
 
-               
-       
+
        /* Write a new object header.
         * show we've shrunk the file, if need be
         * Do this only if the file is not in the deleted directories.
@@ -5146,7 +5095,7 @@ int yaffs_ResizeFile(yaffs_Object * in, loff_t newSize)
        return YAFFS_OK;
 }
 
-loff_t yaffs_GetFileSize(yaffs_Object * obj)
+loff_t yaffs_GetFileSize(yaffs_Object *obj)
 {
        obj = yaffs_GetEquivalentObject(obj);
 
@@ -5162,7 +5111,7 @@ loff_t yaffs_GetFileSize(yaffs_Object * obj)
 
 
 
-int yaffs_FlushFile(yaffs_Object * in, int updateTime)
+int yaffs_FlushFile(yaffs_Object *in, int updateTime)
 {
        int retVal;
        if (in->dirty) {
@@ -5177,9 +5126,8 @@ int yaffs_FlushFile(yaffs_Object * in, int updateTime)
 #endif
                }
 
-               retVal =
-                   (yaffs_UpdateObjectHeader(in, NULL, 0, 0, 0) >=
-                    0) ? YAFFS_OK : YAFFS_FAIL;
+               retVal = (yaffs_UpdateObjectHeader(in, NULL, 0, 0, 0) >=
+                       0) ? YAFFS_OK : YAFFS_FAIL;
        } else {
                retVal = YAFFS_OK;
        }
@@ -5188,7 +5136,7 @@ int yaffs_FlushFile(yaffs_Object * in, int updateTime)
 
 }
 
-static int yaffs_DoGenericObjectDeletion(yaffs_Object * in)
+static int yaffs_DoGenericObjectDeletion(yaffs_Object *in)
 {
 
        /* First off, invalidate the file's data in the cache, without flushing. */
@@ -5196,7 +5144,7 @@ static int yaffs_DoGenericObjectDeletion(yaffs_Object * in)
 
        if (in->myDev->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_ChangeObjectName(in, in->myDev->deletedDir, _Y("deleted"), 0, 0);
 
        }
 
@@ -5213,7 +5161,7 @@ static int yaffs_DoGenericObjectDeletion(yaffs_Object * in)
  * and the inode associated with the file.
  * It does not delete the links associated with the file.
  */
-static int yaffs_UnlinkFileIfNeeded(yaffs_Object * in)
+static int yaffs_UnlinkFileIfNeeded(yaffs_Object *in)
 {
 
        int retVal;
@@ -5252,12 +5200,12 @@ static int yaffs_UnlinkFileIfNeeded(yaffs_Object * in)
        return retVal;
 }
 
-int yaffs_DeleteFile(yaffs_Object * in)
+int yaffs_DeleteFile(yaffs_Object *in)
 {
        int retVal = YAFFS_OK;
        int deleted = in->deleted;
-       
-       yaffs_ResizeFile(in,0);
+
+       yaffs_ResizeFile(in, 0);
 
        if (in->nDataChunks > 0) {
                /* Use soft deletion if there is data in the file.
@@ -5282,34 +5230,34 @@ int yaffs_DeleteFile(yaffs_Object * in)
        }
 }
 
-static int yaffs_DeleteDirectory(yaffs_Object * in)
+static int yaffs_DeleteDirectory(yaffs_Object *in)
 {
-        /* First check that the directory is empty. */
-        if (ylist_empty(&in->variant.directoryVariant.children)) {
-                return yaffs_DoGenericObjectDeletion(in);
-        }
+       /* First check that the directory is empty. */
+       if (ylist_empty(&in->variant.directoryVariant.children)) {
+               return yaffs_DoGenericObjectDeletion(in);
+       }
 
        return YAFFS_FAIL;
 
 }
 
-static int yaffs_DeleteSymLink(yaffs_Object * in)
+static int yaffs_DeleteSymLink(yaffs_Object *in)
 {
        YFREE(in->variant.symLinkVariant.alias);
 
        return yaffs_DoGenericObjectDeletion(in);
 }
 
-static int yaffs_DeleteHardLink(yaffs_Object * 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);
+       /* 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 yaffs_DeleteObject(yaffs_Object *obj)
 {
 int retVal = -1;
        switch (obj->variantType) {
@@ -5336,7 +5284,7 @@ int retVal = -1;
        return retVal;
 }
 
-static int yaffs_UnlinkWorker(yaffs_Object * obj)
+static int yaffs_UnlinkWorker(yaffs_Object *obj)
 {
 
        int immediateDeletion = 0;
@@ -5369,15 +5317,15 @@ static int yaffs_UnlinkWorker(yaffs_Object * obj)
                 */
 
                yaffs_Object *hl;
-                int retVal;
-                YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];
+               int retVal;
+               YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];
 
-                hl = ylist_entry(obj->hardLinks.next, yaffs_Object, hardLinks);
+               hl = ylist_entry(obj->hardLinks.next, yaffs_Object, hardLinks);
 
-                ylist_del_init(&hl->hardLinks);
-                ylist_del_init(&hl->siblings);
+               ylist_del_init(&hl->hardLinks);
+               ylist_del_init(&hl->siblings);
 
-                yaffs_GetObjectName(hl, name, YAFFS_MAX_NAME_LENGTH + 1);
+               yaffs_GetObjectName(hl, name, YAFFS_MAX_NAME_LENGTH + 1);
 
                retVal = yaffs_ChangeObjectName(obj, hl->parent, name, 0, 0);
 
@@ -5412,7 +5360,7 @@ static int yaffs_UnlinkWorker(yaffs_Object * obj)
 }
 
 
-static int yaffs_UnlinkObject( yaffs_Object *obj)
+static int yaffs_UnlinkObject(yaffs_Object *obj)
 {
 
        if (obj && obj->unlinkAllowed) {
@@ -5422,7 +5370,7 @@ static int yaffs_UnlinkObject( yaffs_Object *obj)
        return YAFFS_FAIL;
 
 }
-int yaffs_Unlink(yaffs_Object * dir, const YCHAR * name)
+int yaffs_Unlink(yaffs_Object *dir, const YCHAR *name)
 {
        yaffs_Object *obj;
 
@@ -5432,8 +5380,8 @@ int yaffs_Unlink(yaffs_Object * dir, const YCHAR * name)
 
 /*----------------------- Initialisation Scanning ---------------------- */
 
-static void yaffs_HandleShadowedObject(yaffs_Device * dev, int objId,
-                                      int backwardScanning)
+static void yaffs_HandleShadowedObject(yaffs_Device *dev, int objId,
+                               int backwardScanning)
 {
        yaffs_Object *obj;
 
@@ -5475,7 +5423,7 @@ 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);
@@ -5484,37 +5432,35 @@ static void yaffs_HardlinkFixup(yaffs_Device *dev, yaffs_Object *hardList)
                                              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);
-
-                }
+               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;
-
+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;
 }
 
 
@@ -5542,7 +5488,7 @@ static void yaffs_StripDeletedObjects(yaffs_Device *dev)
                        yaffs_DeleteObject(l);
                }
        }
-       
+
        ylist_for_each_safe(i, n,
                &dev->deletedDir->variant.directoryVariant.children) {
                if (i) {
@@ -5553,7 +5499,7 @@ static void yaffs_StripDeletedObjects(yaffs_Device *dev)
 
 }
 
-static int yaffs_Scan(yaffs_Device * dev)
+static int yaffs_Scan(yaffs_Device *dev)
 {
        yaffs_ExtendedTags tags;
        int blk;
@@ -5572,16 +5518,16 @@ static int yaffs_Scan(yaffs_Device * dev)
        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));
@@ -5602,7 +5548,7 @@ static int yaffs_Scan(yaffs_Device * dev)
                bi->blockState = state;
                bi->sequenceNumber = sequenceNumber;
 
-               if(bi->sequenceNumber == YAFFS_SEQUENCE_BAD_BLOCK)
+               if (bi->sequenceNumber == YAFFS_SEQUENCE_BAD_BLOCK)
                        bi->blockState = state = YAFFS_BLOCK_STATE_DEAD;
 
                T(YAFFS_TRACE_SCAN_DEBUG,
@@ -5617,7 +5563,7 @@ static int yaffs_Scan(yaffs_Device * dev)
                          (TSTR("Block empty " TENDSTR)));
                        dev->nErasedBlocks++;
                        dev->nFreeChunks += dev->nChunksPerBlock;
-               } 
+               }
        }
 
        startIterator = dev->internalStartBlock;
@@ -5626,11 +5572,11 @@ static int yaffs_Scan(yaffs_Device * dev)
        /* For each block.... */
        for (blockIterator = startIterator; !alloc_failed && blockIterator <= endIterator;
             blockIterator++) {
-               
+
+               YYIELD();
+
                YYIELD();
 
-               YYIELD();
-               
                blk = blockIterator;
 
                bi = yaffs_GetBlockInfo(dev, blk);
@@ -5658,7 +5604,7 @@ static int yaffs_Scan(yaffs_Device * dev)
                                /*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 means that either the block is empty or
                                 * this is the one being allocated from
                                 */
 
@@ -5675,9 +5621,9 @@ static int yaffs_Scan(yaffs_Device * dev)
                                        state = YAFFS_BLOCK_STATE_ALLOCATING;
                                        dev->allocationBlock = blk;
                                        dev->allocationPage = c;
-                                       dev->allocationBlockFinder = blk;       
+                                       dev->allocationBlockFinder = blk;
                                        /* Set it to here to encourage the allocator to go forth from here. */
-                                       
+
                                }
 
                                dev->nFreeChunks += (dev->nChunksPerBlock - c);
@@ -5695,19 +5641,19 @@ static int yaffs_Scan(yaffs_Device * dev)
                                /* PutChunkIntoFile checks for a clash (two data chunks with
                                 * the same chunkId).
                                 */
-                                
-                               if(!in)
+
+                               if (!in)
                                        alloc_failed = 1;
 
-                               if(in){
-                                       if(!yaffs_PutChunkIntoFile(in, tags.chunkId, chunk,1))
+                               if (in) {
+                                       if (!yaffs_PutChunkIntoFile(in, tags.chunkId, chunk, 1))
                                                alloc_failed = 1;
                                }
-                               
+
                                endpos =
                                    (tags.chunkId - 1) * dev->nDataBytesPerChunk +
                                    tags.byteCount;
-                               if (in && 
+                               if (in &&
                                    in->variantType == YAFFS_OBJECT_TYPE_FILE
                                    && in->variant.fileVariant.scannedFileSize <
                                    endpos) {
@@ -5739,7 +5685,7 @@ static int yaffs_Scan(yaffs_Device * 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 
+                                        * 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.
                                         */
 
@@ -5753,20 +5699,20 @@ static int yaffs_Scan(yaffs_Device * dev)
                                                                      objectId,
                                                                      oh->type);
 
-                               if(!in)
+                               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;
+                                       if (fixer) {
+                                               fixer->next = shadowFixerList;
                                                shadowFixerList = fixer;
                                                fixer->objectId = tags.objectId;
                                                fixer->shadowedId = oh->shadowsObject;
                                        }
-                                       
+
                                }
 
                                if (in && in->valid) {
@@ -5850,19 +5796,18 @@ static int yaffs_Scan(yaffs_Device * dev)
                                            yaffs_FindOrCreateObjectByNumber
                                            (dev, oh->parentObjectId,
                                             YAFFS_OBJECT_TYPE_DIRECTORY);
-                                       if(!parent)
+                                       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)
-                                       {
+                                               /* 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
                                                 */
@@ -5885,11 +5830,11 @@ static int yaffs_Scan(yaffs_Device * dev)
                                         * 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.              
+                                        * list and fix up all the chains.
                                         */
 
                                        switch (in->variantType) {
-                                       case YAFFS_OBJECT_TYPE_UNKNOWN: 
+                                       case YAFFS_OBJECT_TYPE_UNKNOWN:
                                                /* Todo got a problem */
                                                break;
                                        case YAFFS_OBJECT_TYPE_FILE:
@@ -5902,29 +5847,29 @@ static int yaffs_Scan(yaffs_Device * dev)
                                                break;
                                        case YAFFS_OBJECT_TYPE_HARDLINK:
                                                in->variant.hardLinkVariant.
-                                                    equivalentObjectId =
-                                                    oh->equivalentObjectId;
-                                                in->hardLinks.next =
-                                                    (struct ylist_head *)
-                                                    hardList;
-                                                hardList = in;
-                                                break;
+                                                       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: 
+                                       case YAFFS_OBJECT_TYPE_SYMLINK:
                                                in->variant.symLinkVariant.alias =
                                                    yaffs_CloneString(oh->alias);
-                                               if(!in->variant.symLinkVariant.alias)
+                                               if (!in->variant.symLinkVariant.alias)
                                                        alloc_failed = 1;
                                                break;
                                        }
 
 /*
-                                       if (parent == dev->deletedDir) {
+                                       if (parent == dev->deletedDir) {
                                                yaffs_DestroyObject(in);
                                                bi->hasShrinkHeader = 1;
                                        }
@@ -5949,47 +5894,47 @@ static int yaffs_Scan(yaffs_Device * dev)
 
        }
 
-       
+
        /* 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 
+        * We should now have scanned all the objects, now it's time to add these
         * hardlinks.
         */
 
-       yaffs_HardlinkFixup(dev,hardList);
-       
+       yaffs_HardlinkFixup(dev, hardList);
+
        /* Fix up any shadowed objects */
        {
                struct yaffs_ShadowFixerStruct *fixer;
                yaffs_Object *obj;
-               
-               while(shadowFixerList){
+
+               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);
+                       obj = yaffs_FindObjectByNumber(dev, fixer->shadowedId);
                        if(obj)
                                yaffs_DeleteObject(obj);
        
-                       obj = yaffs_FindObjectByNumber(dev,fixer->objectId);
+                       obj = yaffs_FindObjectByNumber(dev, fixer->objectId);
                        if(obj){
-                               yaffs_UpdateObjectHeader(obj,NULL,1,0,0);
+                               yaffs_UpdateObjectHeader(obj, NULL, 1, 0, 0);
                        }
-                       
+
                        YFREE(fixer);
                }
        }
 
        yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
 
-       if(alloc_failed){
+       if (alloc_failed) {
                return YAFFS_FAIL;
        }
-       
+
        T(YAFFS_TRACE_SCAN, (TSTR("yaffs_Scan ends" TENDSTR)));
-       
+
 
        return YAFFS_OK;
 }
@@ -6003,22 +5948,22 @@ static void yaffs_CheckObjectDetailsLoaded(yaffs_Object *in)
        int result;
        int alloc_failed = 0;
 
-       if(!in)
+       if (!in)
                return;
-               
+
        dev = in->myDev;
-               
+
 #if 0
-       T(YAFFS_TRACE_SCAN,(TSTR("details for object %d %s loaded" TENDSTR),
+       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){
+       if (in->lazyLoaded && in->hdrChunk > 0) {
                in->lazyLoaded = 0;
                chunkData = yaffs_GetTempBuffer(dev, __LINE__);
 
-               result = yaffs_ReadChunkWithTagsFromNAND(dev,in->hdrChunk,chunkData,&tags);
+               result = yaffs_ReadChunkWithTagsFromNAND(dev, in->hdrChunk, chunkData, &tags);
                oh = (yaffs_ObjectHeader *) chunkData;
 
                in->yst_mode = oh->yst_mode;
@@ -6036,22 +5981,22 @@ static void yaffs_CheckObjectDetailsLoaded(yaffs_Object *in)
                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){
+
+               if (in->variantType == YAFFS_OBJECT_TYPE_SYMLINK) {
                         in->variant.symLinkVariant.alias =
                                                    yaffs_CloneString(oh->alias);
-                       if(!in->variant.symLinkVariant.alias)
+                       if (!in->variant.symLinkVariant.alias)
                                alloc_failed = 1; /* Not returned to caller */
                }
-                                                   
-               yaffs_ReleaseTempBuffer(dev,chunkData, __LINE__);
+
+               yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
        }
 }
 
-static int yaffs_ScanBackwards(yaffs_Device * dev)
+static int yaffs_ScanBackwards(yaffs_Device *dev)
 {
        yaffs_ExtendedTags tags;
        int blk;
@@ -6074,13 +6019,13 @@ static int yaffs_ScanBackwards(yaffs_Device * dev)
        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;
@@ -6100,20 +6045,20 @@ static int yaffs_ScanBackwards(yaffs_Device * dev)
        dev->sequenceNumber = YAFFS_LOWEST_SEQUENCE_NUMBER;
 
        blockIndex = YMALLOC(nBlocks * sizeof(yaffs_BlockIndex));
-       
-       if(!blockIndex) {
+
+       if (!blockIndex) {
                blockIndex = YMALLOC_ALT(nBlocks * sizeof(yaffs_BlockIndex));
                altBlockIndex = 1;
        }
-       
-       if(!blockIndex) {
+
+       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 */
@@ -6128,19 +6073,19 @@ static int yaffs_ScanBackwards(yaffs_Device * dev)
                bi->blockState = state;
                bi->sequenceNumber = sequenceNumber;
 
-               if(bi->sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA)
+               if (bi->sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA)
                        bi->blockState = state = YAFFS_BLOCK_STATE_CHECKPOINT;
-               if(bi->sequenceNumber == YAFFS_SEQUENCE_BAD_BLOCK)
+               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){
+
+               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));
@@ -6189,8 +6134,8 @@ static int yaffs_ScanBackwards(yaffs_Device * dev)
        }
 #else
        {
-               /* Dungy old bubble sort... */
-               
+               /* Dungy old bubble sort... */
+
                yaffs_BlockIndex temp;
                int i;
                int j;
@@ -6207,7 +6152,7 @@ static int yaffs_ScanBackwards(yaffs_Device * dev)
 
        YYIELD();
 
-       T(YAFFS_TRACE_SCAN, (TSTR("...done" TENDSTR)));
+       T(YAFFS_TRACE_SCAN, (TSTR("...done" TENDSTR)));
 
        /* Now scan the blocks looking at the data. */
        startIterator = 0;
@@ -6217,31 +6162,31 @@ static int yaffs_ScanBackwards(yaffs_Device * dev)
 
        /* For each block.... backwards */
        for (blockIterator = endIterator; !alloc_failed && blockIterator >= startIterator;
-            blockIterator--) {
-               /* Cooperative multitasking! This loop can run for so
+                       blockIterator--) {
+               /* Cooperative multitasking! This loop can run for so
                   long that watchdog timers expire. */
-               YYIELD();
+               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->nChunksPerBlock - 1; 
+               for (c = dev->nChunksPerBlock - 1;
                     !alloc_failed && c >= 0 &&
                     (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING ||
                      state == YAFFS_BLOCK_STATE_ALLOCATING); c--) {
-                       /* Scan backwards... 
+                       /* Scan backwards...
                         * Read the tags and decide what to do
                         */
-                       
+
                        chunk = blk * dev->nChunksPerBlock + c;
 
                        result = yaffs_ReadChunkWithTagsFromNAND(dev, chunk, NULL,
@@ -6255,14 +6200,12 @@ static int yaffs_ScanBackwards(yaffs_Device * dev)
                                 * 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 
+                                * chunk and his means that either the block is empty or
                                 * this is the one being allocated from
                                 */
 
-                               if(foundChunksInBlock)
-                               {
+                               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;
@@ -6270,9 +6213,9 @@ static int yaffs_ScanBackwards(yaffs_Device * dev)
                                } else {
                                        if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING ||
                                            state == YAFFS_BLOCK_STATE_ALLOCATING) {
-                                               if(dev->sequenceNumber == bi->sequenceNumber) {
+                                               if (dev->sequenceNumber == bi->sequenceNumber) {
                                                        /* this is the block being allocated from */
-                                               
+
                                                        T(YAFFS_TRACE_SCAN,
                                                          (TSTR
                                                           (" Allocating from %d %d"
@@ -6281,41 +6224,38 @@ static int yaffs_ScanBackwards(yaffs_Device * dev)
                                                        state = YAFFS_BLOCK_STATE_ALLOCATING;
                                                        dev->allocationBlock = blk;
                                                        dev->allocationPage = c;
-                                                       dev->allocationBlockFinder = blk;       
-                                               }
-                                               else {
+                                                       dev->allocationBlockFinder = blk;
+                                               } else {
                                                        /* This is a partially written block that is not
                                                         * the current allocation block. This block must have
                                                         * had a write failure, so set up for retirement.
                                                         */
-                                                 
+
                                                         /* bi->needsRetiring = 1; ??? TODO */
                                                         bi->gcPrioritise = 1;
-                                                                                                        
+
                                                         T(YAFFS_TRACE_ALWAYS,
                                                         (TSTR("Partially written block %d detected" TENDSTR),
                                                         blk));
                                                }
-
                                        }
-                                        
                                }
 
                                dev->nFreeChunks++;
-                               
-                       } else if (tags.eccResult == YAFFS_ECC_RESULT_UNFIXED){
+
+                       } 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) {
+                       } else if (tags.chunkId > 0) {
                                /* chunkId > 0 so it is a data chunk... */
                                unsigned int endpos;
                                __u32 chunkBase =
                                    (tags.chunkId - 1) * dev->nDataBytesPerChunk;
-                                                               
+
                                foundChunksInBlock = 1;
 
 
@@ -6326,29 +6266,29 @@ static int yaffs_ScanBackwards(yaffs_Device * dev)
                                                                      tags.
                                                                      objectId,
                                                                      YAFFS_OBJECT_TYPE_FILE);
-                               if(!in){
+                               if (!in) {
                                        /* Out of memory */
                                        alloc_failed = 1;
                                }
-                               
+
                                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)){
+                                       if (!yaffs_PutChunkIntoFile(in, tags.chunkId,
+                                                              chunk, -1)) {
                                                alloc_failed = 1;
                                        }
 
-                                       /* File size is calculated by looking at the data chunks if we have not 
+                                       /* 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 =
                                            (tags.chunkId -
                                             1) * dev->nDataBytesPerChunk +
                                            tags.byteCount;
-                                           
+
                                        if (!in->valid &&       /* have not got an object header yet */
                                            in->variant.fileVariant.
                                            scannedFileSize < endpos) {
@@ -6360,7 +6300,7 @@ static int yaffs_ScanBackwards(yaffs_Device * dev)
                                                    scannedFileSize;
                                        }
 
-                               } else if(in) {
+                               } else if (in) {
                                        /* This chunk has been invalidated by a resize, so delete */
                                        yaffs_DeleteChunk(dev, chunk, 1, __LINE__);
 
@@ -6392,11 +6332,10 @@ static int yaffs_ScanBackwards(yaffs_Device * dev)
                                    tags.extraShadows ||
                                    (!in->valid &&
                                    (tags.objectId == YAFFS_OBJECTID_ROOT ||
-                                    tags.objectId == YAFFS_OBJECTID_LOSTNFOUND))
-                                   ) {
+                                    tags.objectId == YAFFS_OBJECTID_LOSTNFOUND))) {
 
                                        /* 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 
+                                        * TODO In future we can probably defer reading the chunk and
                                         * living with invalid data until needed.
                                         */
 
@@ -6406,8 +6345,8 @@ static int yaffs_ScanBackwards(yaffs_Device * dev)
                                                                        NULL);
 
                                        oh = (yaffs_ObjectHeader *) chunkData;
-                                       
-                                       if(dev->inbandTags){
+
+                                       if (dev->inbandTags) {
                                                /* Fix up the header if they got corrupted by inband tags */
                                                oh->shadowsObject = oh->inbandShadowsObject;
                                                oh->isShrink = oh->inbandIsShrink;
@@ -6432,16 +6371,15 @@ static int yaffs_ScanBackwards(yaffs_Device * dev)
 
                                if (in->valid) {
                                        /* We have already filled this one.
-                                        * We have a duplicate that will be discarded, but 
+                                        * We have a duplicate that will be discarded, but
                                         * we first have to suck out resize info if it is a file.
                                         */
 
-                                       if ((in->variantType == YAFFS_OBJECT_TYPE_FILE) && 
-                                            ((oh && 
-                                              oh-> type == YAFFS_OBJECT_TYPE_FILE)||
+                                       if ((in->variantType == YAFFS_OBJECT_TYPE_FILE) &&
+                                            ((oh &&
+                                              oh->type == YAFFS_OBJECT_TYPE_FILE) ||
                                              (tags.extraHeaderInfoAvailable  &&
-                                              tags.extraObjectType == YAFFS_OBJECT_TYPE_FILE))
-                                           ) {
+                                              tags.extraObjectType == YAFFS_OBJECT_TYPE_FILE))) {
                                                __u32 thisSize =
                                                    (oh) ? oh->fileSize : tags.
                                                    extraFileLength;
@@ -6449,8 +6387,8 @@ static int yaffs_ScanBackwards(yaffs_Device * dev)
                                                    (oh) ? oh->
                                                    parentObjectId : tags.
                                                    extraParentObjectId;
-                                               
-                                               
+
+
                                                isShrink =
                                                    (oh) ? oh->isShrink : tags.
                                                    extraIsShrinkHeader;
@@ -6501,8 +6439,8 @@ static int yaffs_ScanBackwards(yaffs_Device * dev)
                                     YAFFS_OBJECTID_LOSTNFOUND)) {
                                        /* We only load some info, don't fiddle with directory structure */
                                        in->valid = 1;
-                                       
-                                       if(oh) {
+
+                                       if (oh) {
                                                in->variantType = oh->type;
 
                                                in->yst_mode = oh->yst_mode;
@@ -6520,7 +6458,7 @@ static int yaffs_ScanBackwards(yaffs_Device * dev)
                                                in->yst_mtime = oh->yst_mtime;
                                                in->yst_ctime = oh->yst_ctime;
                                                in->yst_rdev = oh->yst_rdev;
-               
+
 #endif
                                        } else {
                                                in->variantType = tags.extraObjectType;
@@ -6535,7 +6473,7 @@ static int yaffs_ScanBackwards(yaffs_Device * dev)
                                        in->valid = 1;
                                        in->hdrChunk = chunk;
 
-                                       if(oh) {
+                                       if (oh) {
                                                in->variantType = oh->type;
 
                                                in->yst_mode = oh->yst_mode;
@@ -6555,30 +6493,29 @@ static int yaffs_ScanBackwards(yaffs_Device * dev)
                                                in->yst_rdev = oh->yst_rdev;
 #endif
 
-                                               if (oh->shadowsObject > 0) 
+                                               if (oh->shadowsObject > 0)
                                                        yaffs_HandleShadowedObject(dev,
                                                                           oh->
                                                                           shadowsObject,
                                                                           1);
-                                       
+
 
                                                yaffs_SetObjectName(in, oh->name);
                                                parent =
                                                    yaffs_FindOrCreateObjectByNumber
-                                                       (dev, oh->parentObjectId,
-                                                        YAFFS_OBJECT_TYPE_DIRECTORY);
+                                                       (dev, oh->parentObjectId,
+                                                        YAFFS_OBJECT_TYPE_DIRECTORY);
 
                                                 fileSize = oh->fileSize;
-                                                isShrink = oh->isShrink;
+                                                isShrink = oh->isShrink;
                                                 equivalentObjectId = oh->equivalentObjectId;
 
-                                       }
-                                       else {
+                                       } else {
                                                in->variantType = tags.extraObjectType;
                                                parent =
                                                    yaffs_FindOrCreateObjectByNumber
-                                                       (dev, tags.extraParentObjectId,
-                                                        YAFFS_OBJECT_TYPE_DIRECTORY);
+                                                       (dev, tags.extraParentObjectId,
+                                                        YAFFS_OBJECT_TYPE_DIRECTORY);
                                                 fileSize = tags.extraFileLength;
                                                 isShrink = tags.extraIsShrinkHeader;
                                                 equivalentObjectId = tags.extraEquivalentObjectId;
@@ -6596,15 +6533,14 @@ static int yaffs_ScanBackwards(yaffs_Device * dev)
 
                                        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)
-                                       {
+                                               /* 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
                                                 */
@@ -6630,11 +6566,11 @@ static int yaffs_ScanBackwards(yaffs_Device * dev)
                                         * 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.              
+                                        * through this list and fix up all the chains.
                                         */
 
                                        switch (in->variantType) {
-                                       case YAFFS_OBJECT_TYPE_UNKNOWN: 
+                                       case YAFFS_OBJECT_TYPE_UNKNOWN:
                                                /* Todo got a problem */
                                                break;
                                        case YAFFS_OBJECT_TYPE_FILE:
@@ -6643,7 +6579,7 @@ static int yaffs_ScanBackwards(yaffs_Device * dev)
                                                    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 
+                                                        * This will happen if the file is resized to be larger
                                                         * than its current data extents.
                                                         */
                                                        in->variant.fileVariant.fileSize = fileSize;
@@ -6658,14 +6594,14 @@ static int yaffs_ScanBackwards(yaffs_Device * dev)
 
                                                break;
                                        case YAFFS_OBJECT_TYPE_HARDLINK:
-                                               if(!itsUnlinked) {
-                                                  in->variant.hardLinkVariant.equivalentObjectId =
-                                                    equivalentObjectId;
-                                                  in->hardLinks.next =
-                                                    (struct ylist_head *) hardList;
-                                                  hardList = in;
-                                                }
-                                                break;
+                                               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;
@@ -6673,18 +6609,17 @@ static int yaffs_ScanBackwards(yaffs_Device * dev)
                                                /* 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;
+                                               if (oh) {
+                                                       in->variant.symLinkVariant.alias =
+                                                               yaffs_CloneString(oh->alias);
+                                                       if (!in->variant.symLinkVariant.alias)
+                                                               alloc_failed = 1;
                                                }
                                                break;
                                        }
 
                                }
-                               
+
                        }
 
                } /* End of scanning for each chunk */
@@ -6705,22 +6640,22 @@ static int yaffs_ScanBackwards(yaffs_Device * dev)
 
        }
 
-       if (altBlockIndex) 
+       if (altBlockIndex)
                YFREE_ALT(blockIndex);
        else
                YFREE(blockIndex);
-       
+
        /* 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 
+        * We should now have scanned all the objects, now it's time to add these
         * hardlinks.
         */
-       yaffs_HardlinkFixup(dev,hardList);
-       
+       yaffs_HardlinkFixup(dev, hardList);
+
 
        yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
-       
-       if(alloc_failed){
+
+       if (alloc_failed) {
                return YAFFS_FAIL;
        }
 
@@ -6733,111 +6668,105 @@ static int yaffs_ScanBackwards(yaffs_Device * dev)
 
 static void yaffs_VerifyObjectInDirectory(yaffs_Object *obj)
 {
-        struct ylist_head *lh;
-        yaffs_Object *listObj;
-        
-        int count = 0;
+       struct ylist_head *lh;
+       yaffs_Object *listObj;
 
-       if(!obj){
+       int count = 0;
+
+       if (!obj) {
                T(YAFFS_TRACE_ALWAYS, (TSTR("No object to verify" TENDSTR)));
                YBUG();
                return;
        }
 
-        if(yaffs_SkipVerification(obj->myDev))
-                return;
+       if (yaffs_SkipVerification(obj->myDev))
+               return;
 
-       if(!obj->parent){
+       if (!obj->parent) {
                T(YAFFS_TRACE_ALWAYS, (TSTR("Object does not have parent" TENDSTR)));
                YBUG();
                return;
        }
-               
-       if(obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY){
+
+       if (obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
                T(YAFFS_TRACE_ALWAYS, (TSTR("Parent is not directory" TENDSTR)));
                YBUG();
        }
-       
-        /* Iterate through the objects in each hash entry */
-         
-        ylist_for_each(lh, &obj->parent->variant.directoryVariant.children) {
+
+       /* Iterate through the objects in each hash entry */
+
+       ylist_for_each(lh, &obj->parent->variant.directoryVariant.children) {
                if (lh) {
-                        listObj = ylist_entry(lh, yaffs_Object, siblings);
+                       listObj = ylist_entry(lh, yaffs_Object, siblings);
                        yaffs_VerifyObject(listObj);
-                       if(obj == listObj)
-                               count ++;
-                }
+                       if (obj == listObj)
+                               count++;
+               }
         }
-        
-        if(count != 1){
-               T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory %d times" TENDSTR),count));
+
+       if (count != 1) {
+               T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory %d times" TENDSTR), count));
                YBUG();
        }
-
 }
 
 static void yaffs_VerifyDirectory(yaffs_Object *directory)
 {
-
-        struct ylist_head *lh;
-        yaffs_Object *listObj;
+       struct ylist_head *lh;
+       yaffs_Object *listObj;
         
-       if(!directory){
+       if (!directory) {
                YBUG();
                return;
        }
 
-        if(yaffs_SkipFullVerification(directory->myDev))
-                return;
+       if (yaffs_SkipFullVerification(directory->myDev))
+               return;
 
-               
-       if(directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY){
-               T(YAFFS_TRACE_ALWAYS, (TSTR("Directory has wrong type: %d" TENDSTR),directory->variantType));
+       if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
+               T(YAFFS_TRACE_ALWAYS, (TSTR("Directory has wrong type: %d" TENDSTR), directory->variantType));
                YBUG();
        }
-       
-        /* Iterate through the objects in each hash entry */
-         
-        ylist_for_each(lh, &directory->variant.directoryVariant.children) {
+
+       /* Iterate through the objects in each hash entry */
+
+       ylist_for_each(lh, &directory->variant.directoryVariant.children) {
                if (lh) {
-                        listObj = ylist_entry(lh, yaffs_Object, siblings);
-                       if(listObj->parent != directory){
-                               T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory list has wrong parent %p" TENDSTR),listObj->parent));
+                       listObj = ylist_entry(lh, yaffs_Object, siblings);
+                       if (listObj->parent != directory) {
+                               T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory list has wrong parent %p" TENDSTR), listObj->parent));
                                YBUG();
                        }
                        yaffs_VerifyObjectInDirectory(listObj);
-                }
-        }
-        
+               }
+       }
 }
 
 
-static void yaffs_RemoveObjectFromDirectory(yaffs_Object * obj)
+static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj)
 {
        yaffs_Device *dev = obj->myDev;
        yaffs_Object *parent;
-       
-        yaffs_VerifyObjectInDirectory(obj);
+
+       yaffs_VerifyObjectInDirectory(obj);
        parent = obj->parent;
-       
+
        yaffs_VerifyDirectory(parent);
 
-        if(dev && dev->removeObjectCallback)
-                dev->removeObjectCallback(obj);
+       if (dev && dev->removeObjectCallback)
+               dev->removeObjectCallback(obj);
 
-           
-        ylist_del_init(&obj->siblings);
-        obj->parent = NULL;
 
-       yaffs_VerifyDirectory(parent);
+       ylist_del_init(&obj->siblings);
+       obj->parent = NULL;
 
+       yaffs_VerifyDirectory(parent);
 }
 
 
-static void yaffs_AddObjectToDirectory(yaffs_Object * directory,
-                                      yaffs_Object * obj)
+static void yaffs_AddObjectToDirectory(yaffs_Object *directory,
+                                       yaffs_Object *obj)
 {
-
        if (!directory) {
                T(YAFFS_TRACE_ALWAYS,
                  (TSTR
@@ -6854,43 +6783,41 @@ static void yaffs_AddObjectToDirectory(yaffs_Object * directory,
                YBUG();
        }
 
-        if (obj->siblings.prev == NULL) {
-                /* Not initialised */
-                YBUG();
+       if (obj->siblings.prev == NULL) {
+               /* Not initialised */
+               YBUG();
+       }
 
-        } 
 
        yaffs_VerifyDirectory(directory);
 
        yaffs_RemoveObjectFromDirectory(obj);
-        
-        
-        /* Now add it */
-        ylist_add(&obj->siblings, &directory->variant.directoryVariant.children);
-        obj->parent = directory;
 
-        if (directory == obj->myDev->unlinkedDir
-           || directory == obj->myDev->deletedDir) {
+
+       /* Now add it */
+       ylist_add(&obj->siblings, &directory->variant.directoryVariant.children);
+       obj->parent = directory;
+
+       if (directory == obj->myDev->unlinkedDir
+                       || directory == obj->myDev->deletedDir) {
                obj->unlinked = 1;
                obj->myDev->nUnlinkedFiles++;
                obj->renameAllowed = 0;
        }
 
        yaffs_VerifyDirectory(directory);
-        yaffs_VerifyObjectInDirectory(obj);
-
-
+       yaffs_VerifyObjectInDirectory(obj);
 }
 
-yaffs_Object *yaffs_FindObjectByName(yaffs_Object * directory,
-                                    const YCHAR * name)
+yaffs_Object *yaffs_FindObjectByName(yaffs_Object *directory,
+                                    const YCHAR *name)
 {
-        int sum;
+       int sum;
 
-        struct ylist_head *i;
-        YCHAR buffer[YAFFS_MAX_NAME_LENGTH + 1];
+       struct ylist_head *i;
+       YCHAR buffer[YAFFS_MAX_NAME_LENGTH + 1];
 
-        yaffs_Object *l;
+       yaffs_Object *l;
 
        if (!name) {
                return NULL;
@@ -6911,32 +6838,31 @@ yaffs_Object *yaffs_FindObjectByName(yaffs_Object * directory,
                YBUG();
        }
 
-        sum = yaffs_CalcNameSum(name);
+       sum = yaffs_CalcNameSum(name);
+
+       ylist_for_each(i, &directory->variant.directoryVariant.children) {
+               if (i) {
+                       l = ylist_entry(i, yaffs_Object, siblings);
+
+                       if (l->parent != directory)
+                               YBUG();
 
-        ylist_for_each(i, &directory->variant.directoryVariant.children) {
-                if (i) {
-                        l = ylist_entry(i, yaffs_Object, siblings);
-                        
-                        if(l->parent != directory)
-                               YBUG();
-                        
-                        yaffs_CheckObjectDetailsLoaded(l);
+                       yaffs_CheckObjectDetailsLoaded(l);
 
                        /* Special case for lost-n-found */
                        if (l->objectId == YAFFS_OBJECTID_LOSTNFOUND) {
                                if (yaffs_strcmp(name, YAFFS_LOSTNFOUND_NAME) == 0) {
                                        return l;
                                }
-                       } else if (yaffs_SumCompare(l->sum, sum) || l->hdrChunk <= 0){
+                       } else if (yaffs_SumCompare(l->sum, sum) || l->hdrChunk <= 0) {
                                /* LostnFound chunk called Objxxx
                                 * Do a real check
                                 */
                                yaffs_GetObjectName(l, buffer,
                                                    YAFFS_MAX_NAME_LENGTH);
-                               if (yaffs_strncmp(name, buffer,YAFFS_MAX_NAME_LENGTH) == 0) {
+                               if (yaffs_strncmp(name, buffer, YAFFS_MAX_NAME_LENGTH) == 0) {
                                        return l;
                                }
-
                        }
                }
        }
@@ -6946,13 +6872,13 @@ yaffs_Object *yaffs_FindObjectByName(yaffs_Object * directory,
 
 
 #if 0
-int yaffs_ApplyToDirectoryChildren(yaffs_Object * theDir,
-                                   int (*fn) (yaffs_Object *))
+int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir,
+                                       int (*fn) (yaffs_Object *))
 {
-        struct ylist_head *i;
-        yaffs_Object *l;
+       struct ylist_head *i;
+       yaffs_Object *l;
 
-        if (!theDir) {
+       if (!theDir) {
                T(YAFFS_TRACE_ALWAYS,
                  (TSTR
                   ("tragedy: yaffs_FindObjectByName: null pointer directory"
@@ -6968,12 +6894,12 @@ int yaffs_ApplyToDirectoryChildren(yaffs_Object * theDir,
                 return YAFFS_FAIL;
         }
 
-        ylist_for_each(i, &theDir->variant.directoryVariant.children) {
-                if (i) {
-                        l = ylist_entry(i, yaffs_Object, siblings);
-                        if (l && !fn(l)) {
-                                return YAFFS_FAIL;
-                        }
+       ylist_for_each(i, &theDir->variant.directoryVariant.children) {
+               if (i) {
+                       l = ylist_entry(i, yaffs_Object, siblings);
+                       if (l && !fn(l)) {
+                               return YAFFS_FAIL;
+                       }
                }
        }
 
@@ -6986,7 +6912,7 @@ int yaffs_ApplyToDirectoryChildren(yaffs_Object * theDir,
  * actual object.
  */
 
-yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object * obj)
+yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object *obj)
 {
        if (obj && obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
                /* We want the object id of the equivalent object, not this one */
@@ -6994,13 +6920,12 @@ yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object * obj)
                yaffs_CheckObjectDetailsLoaded(obj);
        }
        return obj;
-
 }
 
-int yaffs_GetObjectName(yaffs_Object * obj, YCHAR * name, int buffSize)
+int yaffs_GetObjectName(yaffs_Object *obj, YCHAR *name, int buffSize)
 {
        memset(name, 0, buffSize * sizeof(YCHAR));
-       
+
        yaffs_CheckObjectDetailsLoaded(obj);
 
        if (obj->objectId == YAFFS_OBJECTID_LOSTNFOUND) {
@@ -7011,14 +6936,14 @@ int yaffs_GetObjectName(yaffs_Object * obj, YCHAR * name, int buffSize)
                YCHAR *x = &numString[19];
                unsigned v = obj->objectId;
                numString[19] = 0;
-               while(v>0){
+               while (v > 0) {
                        x--;
                        *x = '0' + (v % 10);
                        v /= 10;
                }
                /* make up a name */
                yaffs_strcpy(locName, YAFFS_LOSTNFOUND_PREFIX);
-               yaffs_strcat(locName,x);
+               yaffs_strcat(locName, x);
                yaffs_strncpy(name, locName, buffSize - 1);
 
        }
@@ -7048,9 +6973,8 @@ int yaffs_GetObjectName(yaffs_Object * obj, YCHAR * name, int buffSize)
        return yaffs_strlen(name);
 }
 
-int yaffs_GetObjectFileLength(yaffs_Object * obj)
+int yaffs_GetObjectFileLength(yaffs_Object *obj)
 {
-
        /* Dereference any hard linking */
        obj = yaffs_GetEquivalentObject(obj);
 
@@ -7065,29 +6989,28 @@ int yaffs_GetObjectFileLength(yaffs_Object * obj)
        }
 }
 
-int yaffs_GetObjectLinkCount(yaffs_Object * obj)
+int yaffs_GetObjectLinkCount(yaffs_Object *obj)
 {
-        int count = 0;
-        struct ylist_head *i;
-
-        if (!obj->unlinked) {
-                count++;        /* the object itself */
-        }
-        ylist_for_each(i, &obj->hardLinks) {
-                count++;        /* add the hard links; */
-        }
-        return count;
+       int count = 0;
+       struct ylist_head *i;
 
+       if (!obj->unlinked) {
+               count++;                /* the object itself */
+       }
+       ylist_for_each(i, &obj->hardLinks) {
+               count++;                /* add the hard links; */
+       }
+       return count;
 }
 
-int yaffs_GetObjectInode(yaffs_Object * obj)
+int yaffs_GetObjectInode(yaffs_Object *obj)
 {
        obj = yaffs_GetEquivalentObject(obj);
 
        return obj->objectId;
 }
 
-unsigned yaffs_GetObjectType(yaffs_Object * obj)
+unsigned yaffs_GetObjectType(yaffs_Object *obj)
 {
        obj = yaffs_GetEquivalentObject(obj);
 
@@ -7119,7 +7042,7 @@ unsigned yaffs_GetObjectType(yaffs_Object * obj)
        }
 }
 
-YCHAR *yaffs_GetSymlinkAlias(yaffs_Object * obj)
+YCHAR *yaffs_GetSymlinkAlias(yaffs_Object *obj)
 {
        obj = yaffs_GetEquivalentObject(obj);
        if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK) {
@@ -7131,7 +7054,7 @@ YCHAR *yaffs_GetSymlinkAlias(yaffs_Object * obj)
 
 #ifndef CONFIG_YAFFS_WINCE
 
-int yaffs_SetAttributes(yaffs_Object * obj, struct iattr *attr)
+int yaffs_SetAttributes(yaffs_Object *obj, struct iattr *attr)
 {
        unsigned int valid = attr->ia_valid;
 
@@ -7157,7 +7080,7 @@ int yaffs_SetAttributes(yaffs_Object * obj, struct iattr *attr)
        return YAFFS_OK;
 
 }
-int yaffs_GetAttributes(yaffs_Object * obj, struct iattr *attr)
+int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr)
 {
        unsigned int valid = 0;
 
@@ -7181,13 +7104,12 @@ int yaffs_GetAttributes(yaffs_Object * obj, struct iattr *attr)
        attr->ia_valid = valid;
 
        return YAFFS_OK;
-
 }
 
 #endif
 
 #if 0
-int yaffs_DumpObject(yaffs_Object * obj)
+int yaffs_DumpObject(yaffs_Object *obj)
 {
        YCHAR name[257];
 
@@ -7207,7 +7129,7 @@ int yaffs_DumpObject(yaffs_Object * obj)
 
 /*---------------------------- Initialisation code -------------------------------------- */
 
-static int yaffs_CheckDevFunctions(const yaffs_Device * dev)
+static int yaffs_CheckDevFunctions(const yaffs_Device *dev)
 {
 
        /* Common functions, gotta have */
@@ -7241,13 +7163,13 @@ static int yaffs_CheckDevFunctions(const yaffs_Device * dev)
 static int yaffs_CreateInitialDirectories(yaffs_Device *dev)
 {
        /* Initialise the unlinked, deleted, root and lost and found directories */
-       
+
        dev->lostNFoundDir = dev->rootDir =  NULL;
        dev->unlinkedDir = dev->deletedDir = NULL;
 
        dev->unlinkedDir =
            yaffs_CreateFakeDirectory(dev, YAFFS_OBJECTID_UNLINKED, S_IFDIR);
-       
+
        dev->deletedDir =
            yaffs_CreateFakeDirectory(dev, YAFFS_OBJECTID_DELETED, S_IFDIR);
 
@@ -7257,16 +7179,16 @@ static int yaffs_CreateInitialDirectories(yaffs_Device *dev)
        dev->lostNFoundDir =
            yaffs_CreateFakeDirectory(dev, YAFFS_OBJECTID_LOSTNFOUND,
                                      YAFFS_LOSTNFOUND_MODE | S_IFDIR);
-       
-       if(dev->lostNFoundDir && dev->rootDir && dev->unlinkedDir && dev->deletedDir){
+
+       if (dev->lostNFoundDir && dev->rootDir && dev->unlinkedDir && dev->deletedDir) {
                yaffs_AddObjectToDirectory(dev->rootDir, dev->lostNFoundDir);
                return YAFFS_OK;
        }
-       
+
        return YAFFS_FAIL;
 }
 
-int yaffs_GutsInitialise(yaffs_Device * dev)
+int yaffs_GutsInitialise(yaffs_Device *dev)
 {
        int init_failed = 0;
        unsigned x;
@@ -7286,7 +7208,7 @@ int yaffs_GutsInitialise(yaffs_Device * dev)
        dev->blockOffset = 0;
        dev->chunkOffset = 0;
        dev->nFreeChunks = 0;
-       
+
        dev->gcBlock = -1;
 
        if (dev->startBlock == 0) {
@@ -7298,15 +7220,14 @@ int yaffs_GutsInitialise(yaffs_Device * dev)
 
        /* Check geometry parameters. */
 
-       if ((!dev->inbandTags && dev->isYaffs2 && dev->totalBytesPerChunk < 1024) || 
-           (!dev->isYaffs2 && dev->totalBytesPerChunk < 512) || 
-           (dev->inbandTags && !dev->isYaffs2 ) ||
-            dev->nChunksPerBlock < 2 || 
-            dev->nReservedBlocks < 2 || 
-            dev->internalStartBlock <= 0 || 
-            dev->internalEndBlock <= 0 || 
-            dev->internalEndBlock <= (dev->internalStartBlock + dev->nReservedBlocks + 2)      // otherwise it is too small
-           ) {
+       if ((!dev->inbandTags && dev->isYaffs2 && dev->totalBytesPerChunk < 1024) ||
+           (!dev->isYaffs2 && dev->totalBytesPerChunk < 512) ||
+           (dev->inbandTags && !dev->isYaffs2) ||
+            dev->nChunksPerBlock < 2 ||
+            dev->nReservedBlocks < 2 ||
+            dev->internalStartBlock <= 0 ||
+            dev->internalEndBlock <= 0 ||
+            dev->internalEndBlock <= (dev->internalStartBlock + dev->nReservedBlocks + 2)) {   /* otherwise it is too small */
                T(YAFFS_TRACE_ALWAYS,
                  (TSTR
                   ("yaffs: NAND geometry problems: chunk size %d, type is yaffs%s, inbandTags %d "
@@ -7319,11 +7240,11 @@ int yaffs_GutsInitialise(yaffs_Device * dev)
                  (TSTR("yaffs: InitialiseNAND failed" TENDSTR)));
                return YAFFS_FAIL;
        }
-       
+
        /* Sort out space for inband tags, if required */
-       if(dev->inbandTags)
+       if (dev->inbandTags)
                dev->nDataBytesPerChunk = dev->totalBytesPerChunk - sizeof(yaffs_PackedTags2TagsPart);
-       else 
+       else
                dev->nDataBytesPerChunk = dev->totalBytesPerChunk;
 
        /* Got the right mix of functions? */
@@ -7354,9 +7275,9 @@ int yaffs_GutsInitialise(yaffs_Device * dev)
        dev->isMounted = 1;
 
        /* OK now calculate a few things for the device */
-       
+
        /*
-        *  Calculate all the chunk size manipulation numbers:   
+        *  Calculate all the chunk size manipulation numbers:
         */
        x = dev->nDataBytesPerChunk;
        /* We always use dev->chunkShift and dev->chunkDiv */
@@ -7365,42 +7286,41 @@ int yaffs_GutsInitialise(yaffs_Device * dev)
        dev->chunkDiv = x;
        /* We only use chunk mask if chunkDiv is 1 */
        dev->chunkMask = (1<<dev->chunkShift) - 1;
-               
+
        /*
         * Calculate chunkGroupBits.
         * We need to find the next power of 2 > than internalEndBlock
         */
 
        x = dev->nChunksPerBlock * (dev->internalEndBlock + 1);
-       
+
        bits = ShiftsGE(x);
-       
+
        /* Set up tnode width if wide tnodes are enabled. */
-       if(!dev->wideTnodesDisabled){
+       if (!dev->wideTnodesDisabled) {
                /* bits must be even so that we end up with 32-bit words */
-               if(bits & 1)
+               if (bits & 1)
                        bits++;
-               if(bits < 16)
+               if (bits < 16)
                        dev->tnodeWidth = 16;
                else
                        dev->tnodeWidth = bits;
-       }
-       else
+       } else
                dev->tnodeWidth = 16;
+
        dev->tnodeMask = (1<<dev->tnodeWidth)-1;
-               
+
        /* Level0 Tnodes are 16 bits or wider (if wide tnodes are enabled),
         * so if the bitwidth of the
         * chunk range we're using is greater than 16 we need
         * to figure out chunk shift and chunkGroupSize
         */
-                
+
        if (bits <= dev->tnodeWidth)
                dev->chunkGroupBits = 0;
        else
                dev->chunkGroupBits = bits - dev->tnodeWidth;
-               
+
 
        dev->chunkGroupSize = 1 << dev->chunkGroupBits;
 
@@ -7436,13 +7356,13 @@ int yaffs_GutsInitialise(yaffs_Device * dev)
        dev->hasPendingPrioritisedGCs = 1; /* Assume the worst for now, will get fixed on first GC */
 
        /* Initialise temporary buffers and caches. */
-       if(!yaffs_InitialiseTempBuffers(dev))
+       if (!yaffs_InitialiseTempBuffers(dev))
                init_failed = 1;
-       
+
        dev->srCache = NULL;
        dev->gcCleanupList = NULL;
-       
-       
+
+
        if (!init_failed &&
            dev->nShortOpCaches > 0) {
                int i;
@@ -7454,62 +7374,62 @@ int yaffs_GutsInitialise(yaffs_Device * dev)
                }
 
                dev->srCache =  YMALLOC(srCacheBytes);
-               
+
                buf = (__u8 *) dev->srCache;
-                   
-               if(dev->srCache)
-                       memset(dev->srCache,0,srCacheBytes);
-                  
+
+               if (dev->srCache)
+                       memset(dev->srCache, 0, srCacheBytes);
+
                for (i = 0; i < dev->nShortOpCaches && buf; i++) {
                        dev->srCache[i].object = NULL;
                        dev->srCache[i].lastUse = 0;
                        dev->srCache[i].dirty = 0;
                        dev->srCache[i].data = buf = YMALLOC_DMA(dev->totalBytesPerChunk);
                }
-               if(!buf)
+               if (!buf)
                        init_failed = 1;
-                       
+
                dev->srLastUse = 0;
        }
 
        dev->cacheHits = 0;
-       
-       if(!init_failed){
+
+       if (!init_failed) {
                dev->gcCleanupList = YMALLOC(dev->nChunksPerBlock * sizeof(__u32));
-               if(!dev->gcCleanupList)
+               if (!dev->gcCleanupList)
     &nb