Clean up some yaffs1 mode issues.
authorcharles <charles>
Wed, 2 Jul 2008 20:17:41 +0000 (20:17 +0000)
committercharles <charles>
Wed, 2 Jul 2008 20:17:41 +0000 (20:17 +0000)
12 files changed:
devextras.h
direct/Makefile
direct/dtest.c
direct/yaffs_fileem2k.c
direct/yaffs_fileem2k.h
direct/yaffscfg2k.c
direct/yaffsfs.c
direct/yaffsfs.h
direct/ydirectenv.h
yaffs_guts.c
yaffs_guts.h
yaffs_tagscompat.c

index 55c3121..d2abbd5 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
  *
  * Copyright (C) 2002-2007 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  * published by the Free Software Foundation.
  *
  * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
- */
-
-/*
+ */\r
+\r
+/*\r
  * This file is just holds extra declarations of macros that would normally
  * be providesd in the Linux kernel. These macros have been written from
  * scratch but are functionally equivalent to the Linux ones.
- *
- */
-
-#ifndef __EXTRAS_H__
-#define __EXTRAS_H__
-
-
-#if !(defined __KERNEL__)
-
+ *\r
+ */\r
+\r
+#ifndef __EXTRAS_H__\r
+#define __EXTRAS_H__\r
+\r
+\r
+#if !(defined __KERNEL__) \r
+\r
 /* Definition of types */
-typedef unsigned char __u8;
-typedef unsigned short __u16;
-typedef unsigned __u32;
-
+typedef unsigned char __u8;\r
+typedef unsigned short __u16;\r
+typedef unsigned __u32;\r
+\r
 #endif
-
-/*
- * This is a simple doubly linked list implementation that matches the 
- * way the Linux kernel doubly linked list implementation works.
- */
-
+\r
+/*\r
+ * This is a simple doubly linked list implementation that matches the \r
+ * way the Linux kernel doubly linked list implementation works.\r
+ */\r
+\r
 struct ylist_head {
-       struct ylist_head *next; /* next in chain */
-       struct ylist_head *prev; /* previous in chain */
-};
-
-
-/* Initialise a list head to an empty list */
+        struct ylist_head *next; /* next in chain */
+        struct ylist_head *prev; /* previous in chain */
+};\r
+\r
+\r
+/* Initialise a list head to an empty list */\r
 #define YINIT_LIST_HEAD(p) \
-do { \
- (p)->next = (p);\
+do { \\r
+ (p)->next = (p);\\r
  (p)->prev = (p); \
-} while(0)
-
-
-/* Add an element to a list */
+} while(0)\r
+\r
+\r
+/* Add an element to a list */\r
 static __inline__ void ylist_add(struct ylist_head *newEntry, 
-                                struct ylist_head *list)
-{
-       struct ylist_head *listNext = list->next;
-       
-       list->next = newEntry;
-       newEntry->prev = list;
+                                 struct ylist_head *list)
+{\r
+        struct ylist_head *listNext = list->next;
+        \r
+        list->next = newEntry;\r
+        newEntry->prev = list;\r
        newEntry->next = listNext;
        listNext->prev = newEntry;
        
 }
 
-
-/* Take an element out of its current list, with or without
- * reinitialising the links.of the entry*/
+\r
+/* Take an element out of its current list, with or without\r
+ * reinitialising the links.of the entry*/\r
 static __inline__ void ylist_del(struct ylist_head *entry)
-{
-       struct ylist_head *listNext = entry->next;
-       struct ylist_head *listPrev = entry->prev;
-       
-       listNext->prev = listPrev;
-       listPrev->next = listNext;
-       
-}
-
+{\r
+        struct ylist_head *listNext = entry->next;
+        struct ylist_head *listPrev = entry->prev;
+        \r
+        listNext->prev = listPrev;\r
+        listPrev->next = listNext;\r
+        \r
+}\r
+\r
 static __inline__ void ylist_del_init(struct ylist_head *entry)
-{
-       ylist_del(entry);
-       entry->next = entry->prev = entry;
-}
-
-
-/* Test if the list is empty */
+{\r
+        ylist_del(entry);
+        entry->next = entry->prev = entry;\r
+}\r
+\r
+\r
+/* Test if the list is empty */\r
 static __inline__ int ylist_empty(struct ylist_head *entry)
-{
-       return (entry->next == entry);
-}
-
-
+{\r
+        return (entry->next == entry);\r
+}\r
+\r
+\r
 /* ylist_entry takes a pointer to a list entry and offsets it to that
- * we can find a pointer to the object it is embedded in.
- */
+ * we can find a pointer to the object it is embedded in.\r
+ */\r
\r
\r
 #define ylist_entry(entry, type, member) \
-       ((type *)((char *)(entry)-(unsigned long)(&((type *)NULL)->member)))
-
-
+        ((type *)((char *)(entry)-(unsigned long)(&((type *)NULL)->member)))\r
+\r
+\r
 /* ylist_for_each and list_for_each_safe  iterate over lists.
  * ylist_for_each_safe uses temporary storage to make the list delete safe
- */
-
+ */\r
+\r
 #define ylist_for_each(itervar, list) \
-       for (itervar = (list)->next; itervar != (list); itervar = itervar->next )
-
+        for (itervar = (list)->next; itervar != (list); itervar = itervar->next )\r
+\r
 #define ylist_for_each_safe(itervar,saveVar, list) \
-       for (itervar = (list)->next, saveVar = (list)->next->next; itervar != (list); \
-        itervar = saveVar, saveVar = saveVar->next)
-
+        for (itervar = (list)->next, saveVar = (list)->next->next; itervar != (list); \\r
+         itervar = saveVar, saveVar = saveVar->next)\r
+\r
 
 #if !(defined __KERNEL__)
 
@@ -122,36 +122,36 @@ static __inline__ int ylist_empty(struct ylist_head *entry)
 
 
 #ifdef CONFIG_YAFFS_PROVIDE_DEFS
-/* File types */
-
+/* File types */\r
+\r
 
-#define DT_UNKNOWN     0
-#define DT_FIFO                1
-#define DT_CHR         2
+#define DT_UNKNOWN      0\r
+#define DT_FIFO         1\r
+#define DT_CHR          2\r
 #define DT_DIR         4
 #define DT_BLK         6
-#define DT_REG         8
-#define DT_LNK         10
-#define DT_SOCK                12
-#define DT_WHT         14
-
-
-#ifndef WIN32
-#include <sys/stat.h>
-#endif
-
-/*
- * Attribute flags.
- */
-#define ATTR_MODE      1
-#define ATTR_UID       2
+#define DT_REG          8\r
+#define DT_LNK          10\r
+#define DT_SOCK         12\r
+#define DT_WHT          14
+\r
+\r
+#ifndef WIN32\r
+#include <sys/stat.h>\r
+#endif\r
+\r
+/*\r
+ * Attribute flags.  These should be or-ed together to figure out what\r
+ * has been changed!\r
+ */\r
+#define ATTR_MODE       1\r
+#define ATTR_UID        2\r
 #define ATTR_GID       4
 #define ATTR_SIZE      8
 #define ATTR_ATIME     16
 #define ATTR_MTIME     32
 #define ATTR_CTIME     64
 
-
 struct iattr {
        unsigned int ia_valid;
        unsigned ia_mode;
@@ -161,21 +161,21 @@ struct iattr {
        unsigned ia_atime;
        unsigned ia_mtime;
        unsigned ia_ctime;
-       unsigned int ia_attr_flags;
-};
-
-#endif
-
-
-#define KERN_DEBUG
-
-#else
-
-#include <linux/types.h>
-#include <linux/fs.h>
-#include <linux/stat.h>
-
+        unsigned int ia_attr_flags;\r
+};\r
+\r
 #endif
 
 
-#endif
+#define KERN_DEBUG\r
+\r
+#else\r
+\r
+#include <linux/types.h>\r
+#include <linux/fs.h>\r
+#include <linux/stat.h>\r
+\r
+#endif\r
+\r
+\r
+#endif\r
index a65c0e6..a65312f 100644 (file)
@@ -14,7 +14,7 @@
 #
 # NB Warning this Makefile does not include header dependencies.
 #
-# $Id: Makefile,v 1.16 2008-05-05 07:58:58 charles Exp $
+# $Id: Makefile,v 1.17 2008-07-02 20:17:41 charles Exp $
 
 #EXTRA_COMPILE_FLAGS = -DYAFFS_IGNORE_TAGS_ECC
 
@@ -27,7 +27,7 @@ CFLAGS +=    -Wall -g $(EXTRA_COMPILE_FLAGS)
 #CFLAGS+=   -Wmissing-prototypes -Wredundant-decls -Wnested-externs -Winline
 
 
-DIRECTTESTOBJS = dtest.o yaffscfg2k.o yaffs_ecc.o yaffs_fileem2k.o yaffsfs.o yaffs_guts.o \
+DIRECTTESTOBJS = dtest.o yaffscfg2k.o yaffs_ecc.o yaffs_fileem.o yaffs_fileem2k.o yaffsfs.o yaffs_guts.o \
                 yaffs_packedtags1.o yaffs_ramdisk.o yaffs_ramem2k.o \
                 yaffs_tagscompat.o yaffs_packedtags2.o yaffs_tagsvalidity.o yaffs_nand.o \
                 yaffs_checkptrw.o  yaffs_qsort.o \
index 6f6da74..5b038c4 100644 (file)
@@ -513,7 +513,7 @@ void dumpDirFollow(const char *dname)
                        
                        yaffs_stat(str,&s);
                        
-                       printf("%s length %d mode %X ",de->d_name,(int)s.st_size,s.st_mode);
+                       printf("%s ino %d length %d mode %X ",de->d_name,(int)s.st_ino,(int)s.st_size,s.st_mode);
                        switch(s.st_mode & S_IFMT)
                        {
                                case S_IFREG: printf("data file"); break;
@@ -948,6 +948,11 @@ void rename_over_test(const char *mountpt)
        yaffs_StartUp();
        
        yaffs_mount(mountpt);
+       
+       printf("Existing files\n");
+       dumpDirFollow(mountpt);
+       
+       
        i = yaffs_open(a,O_CREAT | O_TRUNC | O_RDWR, 0); 
        yaffs_close(i);
        i = yaffs_open(b,O_CREAT | O_TRUNC | O_RDWR, 0);
@@ -2254,14 +2259,15 @@ int main(int argc, char *argv[])
        
        //return cache_read_test();
        
-       resize_stress_test_no_grow("/flash/flash",20);
+       //resize_stress_test_no_grow("/flash/flash",20);
        
        //huge_directory_test_on_path("/ram2k");
        
         //yaffs_backward_scan_test("/flash/flash");
        // yaffs_device_flush_test("/flash/flash");
 
-        
+       rename_over_test("/flash/yaffs1");
+       
         //scan_pattern_test("/flash",10000,10);
        //short_scan_test("/flash/flash",40000,200);
          //small_mount_test("/flash/flash",1000);
index cb94486..82a00a2 100644 (file)
  * This is only intended as test code to test persistence etc.
  */
 
-const char *yaffs_flashif_c_version = "$Id: yaffs_fileem2k.c,v 1.13 2008-05-05 07:58:58 charles Exp $";
+const char *yaffs_flashif2_c_version = "$Id: yaffs_fileem2k.c,v 1.14 2008-07-02 20:17:41 charles Exp $";
 
 
 #include "yportenv.h"
 
-#include "yaffs_flashif.h"
+#include "yaffs_flashif2.h"
 #include "yaffs_guts.h"
 #include "devextras.h"
 
@@ -35,6 +35,9 @@ const char *yaffs_flashif_c_version = "$Id: yaffs_fileem2k.c,v 1.13 2008-05-05 0
 
 //#define SIMULATE_FAILURES
 
+
+#define REPORT_ERROR 0
+
 typedef struct 
 {
        __u8 data[PAGE_SIZE]; // Data + spare
@@ -68,7 +71,7 @@ static __u8 localBuffer[PAGE_SIZE];
 
 static char *NToName(char *buf,int n)
 {
-       sprintf(buf,"emfile%d",n);
+       sprintf(buf,"emfile2k%d",n);
        return buf;
 }
 
@@ -131,14 +134,14 @@ static int  CheckInit(void)
 }
 
 
-int yflash_GetNumberOfBlocks(void)
+int yflash2_GetNumberOfBlocks(void)
 {
        CheckInit();
        
        return filedisk.nBlocks;
 }
 
-int yflash_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND,const __u8 *data, const yaffs_ExtendedTags *tags)
+int yflash2_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND,const __u8 *data, const yaffs_ExtendedTags *tags)
 {
        int written;
        int pos;
@@ -185,7 +188,7 @@ int yflash_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND,const __u8
                        lseek(h,pos,SEEK_SET);
                        nRead =  read(h, localBuffer,dev->nDataBytesPerChunk);
                        for(i = error = 0; i < dev->nDataBytesPerChunk && !error; i++){
-                               if(localBuffer[i] != 0xFF){
+                               if(REPORT_ERROR && localBuffer[i] != 0xFF){
                                        printf("nand simulation: chunk %d data byte %d was %0x2\n",
                                                chunkInNAND,i,localBuffer[i]);
                                        error = 1;
@@ -195,7 +198,7 @@ int yflash_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND,const __u8
                        for(i = 0; i < dev->nDataBytesPerChunk; i++)
                        localBuffer[i] &= data[i];
                  
-                       if(memcmp(localBuffer,data,dev->nDataBytesPerChunk))
+                       if(REPORT_ERROR && memcmp(localBuffer,data,dev->nDataBytesPerChunk))
                                printf("nand simulator: data does not match\n");
                        
                        lseek(h,pos,SEEK_SET);
@@ -238,7 +241,7 @@ int yflash_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND,const __u8
                                __u8 * ptab = (__u8 *)&pt;
 
                                nRead = read(h,localBuffer,sizeof(pt));
-                               for(i = error = 0; i < sizeof(pt) && !error; i++){
+                               for(i = error = 0; REPORT_ERROR && i < sizeof(pt) && !error; i++){
                                        if(localBuffer[i] != 0xFF){
                                                printf("nand simulation: chunk %d oob byte %d was %0x2\n",
                                                        chunkInNAND,i,localBuffer[i]);
@@ -249,7 +252,7 @@ int yflash_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND,const __u8
                                for(i = 0; i < sizeof(pt); i++)
                                localBuffer[i] &= ptab[i];
                         
-                               if(memcmp(localBuffer,&pt,sizeof(pt)))
+                               if(REPORT_ERROR && memcmp(localBuffer,&pt,sizeof(pt)))
                                        printf("nand sim: tags corruption\n");
                                
                                lseek(h,pos,SEEK_SET);
@@ -281,7 +284,7 @@ static int fail320 = 1;
 
 static int failRead10 = 2;
 
-int yflash_ReadChunkWithTagsFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *data, yaffs_ExtendedTags *tags)
+int yflash2_ReadChunkWithTagsFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *data, yaffs_ExtendedTags *tags)
 {
        int nread;
        int pos;
@@ -401,7 +404,7 @@ int yflash_ReadChunkWithTagsFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *da
 }
 
 
-int yflash_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo)
+int yflash2_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo)
 {
        int written;
        int h;
@@ -422,7 +425,7 @@ int yflash_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo)
        
 }
 
-int yflash_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
+int yflash2_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
 {
 
        int i;
@@ -463,7 +466,7 @@ int yflash_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
        
 }
 
-int yflash_InitialiseNAND(yaffs_Device *dev)
+int yflash2_InitialiseNAND(yaffs_Device *dev)
 {
        CheckInit();
        
@@ -473,7 +476,7 @@ int yflash_InitialiseNAND(yaffs_Device *dev)
 
 
 
-int yflash_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo, yaffs_BlockState *state, __u32 *sequenceNumber)
+int yflash2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo, yaffs_BlockState *state, __u32 *sequenceNumber)
 {
        yaffs_ExtendedTags tags;
        int chunkNo;
@@ -482,7 +485,7 @@ int yflash_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo, yaffs_Blo
        
        chunkNo = blockNo * dev->nChunksPerBlock;
        
-       yflash_ReadChunkWithTagsFromNAND(dev,chunkNo,NULL,&tags);
+       yflash2_ReadChunkWithTagsFromNAND(dev,chunkNo,NULL,&tags);
        if(tags.blockBad)
        {
                *state = YAFFS_BLOCK_STATE_DEAD;
index e694c92..d4a5f90 100644 (file)
@@ -44,7 +44,7 @@
 #endif
 
 
-int yflash_GetNumberOfBlocks(void);
+int yflash2_GetNumberOfBlocks(void);
 
 #endif
 
index 2f7442e..d67719b 100644 (file)
@@ -105,6 +105,7 @@ void yaffsfs_LocalInitialisation(void)
 
 #include "yaffs_ramdisk.h"
 #include "yaffs_flashif.h"
+#include "yaffs_flashif2.h"
 #include "yaffs_nandemul2k.h"
 
 static yaffs_Device ramDev;
@@ -121,8 +122,8 @@ static yaffsfs_DeviceConfiguration yaffsfs_config[] = {
        {(void *)0,(void *)0}
 #else
        { "/", &ramDev},
-       { "/flash/boot", &bootDev},
-       { "/flash/flash", &flashDev},
+       { "/flash/yaffs1", &bootDev},
+       { "/flash/yaffs2", &flashDev},
        { "/ram2k", &ram2kDev},
        { "/flash/bigblock", &flashDev},
        {(void *)0,(void *)0} /* Null entry to terminate list */
@@ -152,7 +153,7 @@ int yaffs_StartUp(void)
        ramDev.eraseBlockInNAND = yramdisk_EraseBlockInNAND;
        ramDev.initialiseNAND = yramdisk_InitialiseNAND;
 
-       // /boot
+       // /boot (yaffs1)
        memset(&bootDev,0,sizeof(bootDev));
        bootDev.totalBytesPerChunk = 512;
        bootDev.nChunksPerBlock = 32;
@@ -162,16 +163,14 @@ int yaffs_StartUp(void)
        //bootDev.useNANDECC = 0; // use YAFFS's ECC
        bootDev.nShortOpCaches = 10; // Use caches
        bootDev.genericDevice = (void *) 1;     // Used to identify the device in fstat.
-       bootDev.writeChunkWithTagsToNAND = yflash_WriteChunkWithTagsToNAND;
-       bootDev.readChunkWithTagsFromNAND = yflash_ReadChunkWithTagsFromNAND;
+       bootDev.writeChunkToNAND = yflash_WriteChunkToNAND;
+       bootDev.readChunkFromNAND = yflash_ReadChunkFromNAND;
        bootDev.eraseBlockInNAND = yflash_EraseBlockInNAND;
        bootDev.initialiseNAND = yflash_InitialiseNAND;
-       bootDev.markNANDBlockBad = yflash_MarkNANDBlockBad;
-       bootDev.queryNANDBlock = yflash_QueryNANDBlock;
 
 
 
-       // /flash
+       // /flash (yaffs2)
        // Set this puppy up to use
        // the file emulation space as
        // 2kpage/64chunk per block/128MB device
@@ -190,12 +189,12 @@ int yaffs_StartUp(void)
        flashDev.wideTnodesDisabled=0;
        flashDev.nShortOpCaches = 10; // Use caches
        flashDev.genericDevice = (void *) 2;    // Used to identify the device in fstat.
-       flashDev.writeChunkWithTagsToNAND = yflash_WriteChunkWithTagsToNAND;
-       flashDev.readChunkWithTagsFromNAND = yflash_ReadChunkWithTagsFromNAND;
-       flashDev.eraseBlockInNAND = yflash_EraseBlockInNAND;
-       flashDev.initialiseNAND = yflash_InitialiseNAND;
-       flashDev.markNANDBlockBad = yflash_MarkNANDBlockBad;
-       flashDev.queryNANDBlock = yflash_QueryNANDBlock;
+       flashDev.writeChunkWithTagsToNAND = yflash2_WriteChunkWithTagsToNAND;
+       flashDev.readChunkWithTagsFromNAND = yflash2_ReadChunkWithTagsFromNAND;
+       flashDev.eraseBlockInNAND = yflash2_EraseBlockInNAND;
+       flashDev.initialiseNAND = yflash2_InitialiseNAND;
+       flashDev.markNANDBlockBad = yflash2_MarkNANDBlockBad;
+       flashDev.queryNANDBlock = yflash2_QueryNANDBlock;
 
        // /ram2k
        // Set this puppy up to use
index 2b9d0bc..6206ed4 100644 (file)
@@ -10,7 +10,7 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
+
 #include "yaffsfs.h"
 #include "yaffs_guts.h"
 #include "yaffscfg.h"
@@ -24,7 +24,7 @@
 #endif
 
 
-const char *yaffsfs_c_version="$Id: yaffsfs.c,v 1.19 2008-05-05 07:58:58 charles Exp $";
+const char *yaffsfs_c_version="$Id: yaffsfs.c,v 1.20 2008-07-02 20:17:41 charles Exp $";
 
 // configurationList is the list of devices that are supported
 static yaffsfs_DeviceConfiguration *yaffsfs_configurationList;
@@ -36,7 +36,7 @@ static void yaffsfs_RemoveObjectCallback(yaffs_Object *obj);
 
 
 // Handle management.
-// 
+//
 
 
 unsigned int yaffs_wr_attempts;
@@ -74,7 +74,7 @@ yaffsfs_Handle *yaffsfs_GetHandlePointer(int h)
        {
                return NULL;
        }
-       
+
        return &yaffsfs_handle[h];
 }
 
@@ -86,7 +86,7 @@ yaffs_Object *yaffsfs_GetHandleObject(int handle)
        {
                return h->obj;
        }
-       
+
        return NULL;
 }
 
@@ -99,7 +99,7 @@ static int yaffsfs_GetHandle(void)
 {
        int i;
        yaffsfs_Handle *h;
-       
+
        for(i = 0; i < YAFFSFS_N_HANDLES; i++)
        {
                h = yaffsfs_GetHandlePointer(i);
@@ -123,7 +123,7 @@ static int yaffsfs_GetHandle(void)
 static int yaffsfs_PutHandle(int handle)
 {
        yaffsfs_Handle *h = yaffsfs_GetHandlePointer(handle);
-       
+
        if(h)
        {
                h->inUse = 0;
@@ -146,13 +146,13 @@ int yaffsfs_Match(YCHAR a, YCHAR b)
 int yaffsfs_IsPathDivider(YCHAR ch)
 {
        YCHAR *str = YAFFS_PATH_DIVIDERS;
-       
+
        while(*str){
                if(*str == ch)
                        return 1;
                str++;
        }
-       
+
        return 0;
 }
 
@@ -169,7 +169,7 @@ static yaffs_Device *yaffsfs_FindDevice(const YCHAR *path, YCHAR **restOfPath)
        yaffs_Device *retval = NULL;
        int thisMatchLength;
        int longestMatch = -1;
-       
+
        // Check all configs, choose the one that:
        // 1) Actually matches a prefix (ie /a amd /abc will not match
        // 2) Matches the longest.
@@ -178,35 +178,36 @@ static yaffs_Device *yaffsfs_FindDevice(const YCHAR *path, YCHAR **restOfPath)
                leftOver = path;
                p = cfg->prefix;
                thisMatchLength = 0;
-               
-               
+
+
                // Strip off any leading /'s
-               
+
                while(yaffsfs_IsPathDivider(*p))
                        p++;
 
                while(yaffsfs_IsPathDivider(*leftOver))
                        leftOver++;
-                       
-               while(*p && *leftOver && 
+
+               while(*p && *leftOver &&
                      yaffsfs_Match(*p,*leftOver))
                {
                        p++;
                        leftOver++;
                        thisMatchLength++;
-                       
+
                        // Skip over any multiple /'s to treat them as one or
                        // skip over a trailling / in the prefix, but not the matching string
                        while(yaffsfs_IsPathDivider(*p) &&
                              (yaffsfs_IsPathDivider(*(p+1)) || !(*(p+1))))
-                             p++;                      
+                             p++;
 
                        // Only skip over multiple /'s
                        while(yaffsfs_IsPathDivider(*leftOver) &&
                              yaffsfs_IsPathDivider(*(leftOver+1)))
-                             leftOver++;                       
+                             leftOver++;
                }
-               
+
+
                if((!*p ) &&
                   (!*leftOver || yaffsfs_IsPathDivider(*leftOver)) && // no more in this path name part
                   (thisMatchLength > longestMatch))
@@ -220,6 +221,7 @@ static yaffs_Device *yaffsfs_FindDevice(const YCHAR *path, YCHAR **restOfPath)
        }
        return retval;
 }
+
 #if 0
 static yaffs_Device *yaffsfs_FindDevice(const YCHAR *path, YCHAR **restOfPath)
 {
@@ -229,7 +231,7 @@ static yaffs_Device *yaffsfs_FindDevice(const YCHAR *path, YCHAR **restOfPath)
        yaffs_Device *retval = NULL;
        int thisMatchLength;
        int longestMatch = -1;
-       
+
        // Check all configs, choose the one that:
        // 1) Actually matches a prefix (ie /a amd /abc will not match
        // 2) Matches the longest.
@@ -238,17 +240,17 @@ static yaffs_Device *yaffsfs_FindDevice(const YCHAR *path, YCHAR **restOfPath)
                leftOver = path;
                p = cfg->prefix;
                thisMatchLength = 0;
-               
-               while(*p &&  //unmatched part of prefix 
+
+               while(*p &&  //unmatched part of prefix
                      !(yaffsfs_IsPathDivider(*p) && (p[1] == 0)) && // the rest of the prefix is not / (to catch / at end)
-                     *leftOver && 
+                     *leftOver &&
                      yaffsfs_Match(*p,*leftOver))
                {
                        p++;
                        leftOver++;
                        thisMatchLength++;
                }
-               
+
 
                if((!*p || (yaffsfs_IsPathDivider(*p) && (p[1] == 0))) &&      // end of prefix
                   (!*leftOver || yaffsfs_IsPathDivider(*leftOver)) && // no more in this path name part
@@ -269,7 +271,7 @@ static yaffs_Object *yaffsfs_FindRoot(const YCHAR *path, YCHAR **restOfPath)
 {
 
        yaffs_Device *dev;
-       
+
        dev= yaffsfs_FindDevice(path,restOfPath);
        if(dev && dev->isMounted)
        {
@@ -284,7 +286,7 @@ static yaffs_Object *yaffsfs_FollowLink(yaffs_Object *obj,int symDepth)
        while(obj && obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
        {
                YCHAR *alias = obj->variant.symLinkVariant.alias;
-                                               
+
                if(yaffsfs_IsPathDivider(*alias))
                {
                        // Starts with a /, need to scan from root up
@@ -310,12 +312,12 @@ static yaffs_Object *yaffsfs_DoFindDirectory(yaffs_Object *startDir,const YCHAR
        YCHAR *restOfPath;
        YCHAR str[YAFFS_MAX_NAME_LENGTH+1];
        int i;
-       
+
        if(symDepth > YAFFSFS_MAX_SYMLINK_DEREFERENCES)
        {
                return NULL;
        }
-       
+
        if(startDir)
        {
                dir = startDir;
@@ -325,20 +327,20 @@ static yaffs_Object *yaffsfs_DoFindDirectory(yaffs_Object *startDir,const YCHAR
        {
                dir = yaffsfs_FindRoot(path,&restOfPath);
        }
-       
+
        while(dir)
-       {       
+       {
                // parse off /.
-               // curve ball: also throw away surplus '/' 
+               // curve ball: also throw away surplus '/'
                // eg. "/ram/x////ff" gets treated the same as "/ram/x/ff"
                while(yaffsfs_IsPathDivider(*restOfPath))
                {
                        restOfPath++; // get rid of '/'
                }
-               
+
                *name = restOfPath;
                i = 0;
-               
+
                while(*restOfPath && !yaffsfs_IsPathDivider(*restOfPath))
                {
                        if (i < YAFFS_MAX_NAME_LENGTH)
@@ -349,7 +351,7 @@ static yaffs_Object *yaffsfs_DoFindDirectory(yaffs_Object *startDir,const YCHAR
                        }
                        restOfPath++;
                }
-               
+
                if(!*restOfPath)
                {
                        // got to the end of the string
@@ -368,14 +370,14 @@ static yaffs_Object *yaffsfs_DoFindDirectory(yaffs_Object *startDir,const YCHAR
                        else
                        {
                                dir = yaffs_FindObjectByName(dir,str);
-                               
+
                                while(dir && dir->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
                                {
-                               
+
                                        dir = yaffsfs_FollowLink(dir,symDepth);
-               
+
                                }
-                               
+
                                if(dir && dir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
                                {
                                        dir = NULL;
@@ -393,19 +395,19 @@ static yaffs_Object *yaffsfs_FindDirectory(yaffs_Object *relativeDirectory,const
 }
 
 // yaffsfs_FindObject turns a path for an existing object into the object
-// 
+//
 static yaffs_Object *yaffsfs_FindObject(yaffs_Object *relativeDirectory, const YCHAR *path,int symDepth)
 {
        yaffs_Object *dir;
        YCHAR *name;
-       
+
        dir = yaffsfs_FindDirectory(relativeDirectory,path,&name,symDepth);
-       
+
        if(dir && *name)
        {
                return yaffs_FindObjectByName(dir,name);
        }
-       
+
        return dir;
 }
 
@@ -415,27 +417,27 @@ int yaffs_dup(int fd)
        int newHandle = -1;
        yaffsfs_Handle *oldPtr = NULL;
        yaffsfs_Handle *newPtr = NULL;
-       
+
        yaffsfs_Lock();
-       
+
        oldPtr = yaffsfs_GetHandlePointer(fd);
        if(oldPtr && oldPtr->inUse)
                newHandle = yaffsfs_GetHandle();
        if(newHandle >= 0)
                newPtr = yaffsfs_GetHandlePointer(newHandle);
-               
+
        if(newPtr){
                *newPtr = *oldPtr;
                return newHandle;
        }
-       
+
        if(!oldPtr)
                yaffsfs_SetError(-EBADF);
        else
                yaffsfs_SetError(-ENOMEM);
-       
+
        return -1;
-               
+
 }
 
 int yaffs_open(const YCHAR *path, int oflag, int mode)
@@ -450,29 +452,29 @@ int yaffs_open(const YCHAR *path, int oflag, int mode)
        int openDenied = 0;
        int symDepth = 0;
        int errorReported = 0;
-       
+
        int i;
-       
-       
+
+
        // todo sanity check oflag (eg. can't have O_TRUNC without WRONLY or RDWR
-       
-       
+
+
        yaffsfs_Lock();
-       
+
        handle = yaffsfs_GetHandle();
-       
+
        if(handle >= 0)
        {
 
                h = yaffsfs_GetHandlePointer(handle);
-       
-       
+
+
                // try to find the exisiting object
                obj = yaffsfs_FindObject(NULL,path,0);
-               
+
                if(obj && obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
                {
-               
+
                        obj = yaffsfs_FollowLink(obj,symDepth++);
                }
 
@@ -485,10 +487,10 @@ int yaffs_open(const YCHAR *path, int oflag, int mode)
                {
                        // Check if the object is already in use
                        alreadyOpen = alreadyExclusive = 0;
-                       
+
                        for(i = 0; i <= YAFFSFS_N_HANDLES; i++)
                        {
-                               
+
                                if(i != handle &&
                                   yaffsfs_handle[i].inUse &&
                                    obj == yaffsfs_handle[i].obj)
@@ -505,7 +507,7 @@ int yaffs_open(const YCHAR *path, int oflag, int mode)
                        {
                                openDenied = 1;
                        }
-                       
+
                        // Open should fail if O_CREAT and O_EXCL are specified
                        if((oflag & O_EXCL) && (oflag & O_CREAT))
                        {
@@ -513,7 +515,7 @@ int yaffs_open(const YCHAR *path, int oflag, int mode)
                                yaffsfs_SetError(-EEXIST);
                                errorReported = 1;
                        }
-                       
+
                        // Check file permissions
                        if( (oflag & (O_RDWR | O_WRONLY)) == 0 &&     // ie O_RDONLY
                           !(obj->yst_mode & S_IREAD))
@@ -521,27 +523,27 @@ int yaffs_open(const YCHAR *path, int oflag, int mode)
                                openDenied = 1;
                        }
 
-                       if( (oflag & O_RDWR) && 
+                       if( (oflag & O_RDWR) &&
                           !(obj->yst_mode & S_IREAD))
                        {
                                openDenied = 1;
                        }
 
-                       if( (oflag & (O_RDWR | O_WRONLY)) && 
+                       if( (oflag & (O_RDWR | O_WRONLY)) &&
                           !(obj->yst_mode & S_IWRITE))
                        {
                                openDenied = 1;
                        }
-                       
+
                }
-               
+
                else if((oflag & O_CREAT))
                {
                        // Let's see if we can create this file
                        dir = yaffsfs_FindDirectory(NULL,path,&name,0);
                        if(dir)
                        {
-                               obj = yaffs_MknodFile(dir,name,mode,0,0);       
+                               obj = yaffs_MknodFile(dir,name,mode,0,0);
                        }
                        else
                        {
@@ -549,7 +551,7 @@ int yaffs_open(const YCHAR *path, int oflag, int mode)
                                errorReported = 1;
                        }
                }
-               
+
                if(obj && !openDenied)
                {
                        h->obj = obj;
@@ -558,14 +560,13 @@ int yaffs_open(const YCHAR *path, int oflag, int mode)
                        h->append =  (oflag & O_APPEND) ? 1 : 0;
                        h->exclusive = (oflag & O_EXCL) ? 1 : 0;
                        h->position = 0;
-                       
-                       obj->inUse++;
-                       if((oflag & O_TRUNC) && !h->readOnly)
-                       {
-                               //todo truncate
-                               yaffs_ResizeFile(obj,0);
-                       }
-                       
+
+                        obj->inUse++;
+                        if((oflag & O_TRUNC) && !h->readOnly)
+                        {
+                                yaffs_ResizeFile(obj,0);
+                        }
+
                }
                else
                {
@@ -605,21 +606,22 @@ int yaffs_flush(int fd)
                yaffsfs_SetError(-EBADF);
                retVal = -1;
        }
-       
+
        yaffsfs_Unlock();
 
        return retVal;
 }
 
+
 int yaffs_close(int fd)
 {
        yaffsfs_Handle *h = NULL;
        int retVal = 0;
-       
+
        yaffsfs_Lock();
 
        h = yaffsfs_GetHandlePointer(fd);
-       
+
        if(h && h->inUse)
        {
                // clean up
@@ -635,12 +637,12 @@ int yaffs_close(int fd)
        else
        {
                // bad handle
-               yaffsfs_SetError(-EBADF);               
+               yaffsfs_SetError(-EBADF);
                retVal = -1;
        }
-       
+
        yaffsfs_Unlock();
-       
+
        return retVal;
 }
 
@@ -651,15 +653,15 @@ int yaffs_read(int fd, void *buf, unsigned int nbyte)
        int pos = 0;
        int nRead = -1;
        unsigned int maxRead;
-       
+
        yaffsfs_Lock();
        h = yaffsfs_GetHandlePointer(fd);
        obj = yaffsfs_GetHandleObject(fd);
-       
+
        if(!h || !obj)
        {
                // bad handle
-               yaffsfs_SetError(-EBADF);               
+               yaffsfs_SetError(-EBADF);
        }
        else if( h && obj)
        {
@@ -678,7 +680,7 @@ int yaffs_read(int fd, void *buf, unsigned int nbyte)
                        nbyte = maxRead;
                }
 
-               
+
                if(nbyte > 0)
                {
                        nRead = yaffs_ReadDataFromFile(obj,buf,pos,nbyte);
@@ -695,14 +697,14 @@ int yaffs_read(int fd, void *buf, unsigned int nbyte)
                {
                        nRead = 0;
                }
-               
+
        }
-       
+
        yaffsfs_Unlock();
-       
-       
+
+
        return (nRead >= 0) ? nRead : -1;
-               
+
 }
 
 int yaffs_pread(int fd, void *buf, unsigned int nbyte, unsigned int offset)
@@ -712,15 +714,15 @@ int yaffs_pread(int fd, void *buf, unsigned int nbyte, unsigned int offset)
        int pos = 0;
        int nRead = -1;
        unsigned int maxRead;
-       
+
        yaffsfs_Lock();
        h = yaffsfs_GetHandlePointer(fd);
        obj = yaffsfs_GetHandleObject(fd);
-       
+
        if(!h || !obj)
        {
                // bad handle
-               yaffsfs_SetError(-EBADF);               
+               yaffsfs_SetError(-EBADF);
        }
        else if( h && obj)
        {
@@ -739,7 +741,7 @@ int yaffs_pread(int fd, void *buf, unsigned int nbyte, unsigned int offset)
                        nbyte = maxRead;
                }
 
-               
+
                if(nbyte > 0)
                {
                        nRead = yaffs_ReadDataFromFile(obj,buf,pos,nbyte);
@@ -748,14 +750,14 @@ int yaffs_pread(int fd, void *buf, unsigned int nbyte, unsigned int offset)
                {
                        nRead = 0;
                }
-               
+
        }
-       
+
        yaffsfs_Unlock();
-       
-       
+
+
        return (nRead >= 0) ? nRead : -1;
-               
+
 }
 
 int yaffs_write(int fd, const void *buf, unsigned int nbyte)
@@ -765,15 +767,15 @@ int yaffs_write(int fd, const void *buf, unsigned int nbyte)
        int pos = 0;
        int nWritten = -1;
        int writeThrough = 0;
-       
+
        yaffsfs_Lock();
        h = yaffsfs_GetHandlePointer(fd);
        obj = yaffsfs_GetHandleObject(fd);
-       
+
        if(!h || !obj)
        {
                // bad handle
-               yaffsfs_SetError(-EBADF);               
+               yaffsfs_SetError(-EBADF);
        }
        else if( h && obj && h->readOnly)
        {
@@ -789,9 +791,9 @@ int yaffs_write(int fd, const void *buf, unsigned int nbyte)
                {
                        pos = h->position;
                }
-               
+
                nWritten = yaffs_WriteDataToFile(obj,buf,pos,nbyte,writeThrough);
-               
+
                if(nWritten >= 0)
                {
                        h->position = pos + nWritten;
@@ -800,12 +802,12 @@ int yaffs_write(int fd, const void *buf, unsigned int nbyte)
                {
                        //todo error
                }
-               
+
        }
-       
+
        yaffsfs_Unlock();
-       
-       
+
+
        return (nWritten >= 0) ? nWritten : -1;
 
 }
@@ -817,15 +819,15 @@ int yaffs_pwrite(int fd, const void *buf, unsigned int nbyte, unsigned int offse
        int pos = 0;
        int nWritten = -1;
        int writeThrough = 0;
-       
+
        yaffsfs_Lock();
        h = yaffsfs_GetHandlePointer(fd);
        obj = yaffsfs_GetHandleObject(fd);
-       
+
        if(!h || !obj)
        {
                // bad handle
-               yaffsfs_SetError(-EBADF);               
+               yaffsfs_SetError(-EBADF);
        }
        else if( h && obj && h->readOnly)
        {
@@ -834,27 +836,27 @@ int yaffs_pwrite(int fd, const void *buf, unsigned int nbyte, unsigned int offse
        else if( h && obj)
        {
                pos = offset;
-                               
-               nWritten = yaffs_WriteDataToFile(obj,buf,pos,nbyte,writeThrough);
-               
-               if(nWritten < nbyte)
-                       yaffsfs_SetError(-ENOSPC);
-               
-       }
-       
+
+                nWritten = yaffs_WriteDataToFile(obj,buf,pos,nbyte,writeThrough);
+
+                if(nWritten < 0 || ((unsigned int)nWritten) < nbyte)
+                        yaffsfs_SetError(-ENOSPC);
+
+        }
+
        yaffsfs_Unlock();
-       
-       
+
+
        return (nWritten >= 0) ? nWritten : -1;
 
 }
 
 
-int yaffs_truncate(const YCHAR *path,off_t newSize) 
+int yaffs_truncate(const YCHAR *path,off_t newSize)
 {
        yaffs_Object *obj = NULL;
        int result = YAFFS_FAIL;
-       
+
        yaffsfs_Lock();
 
        obj = yaffsfs_FindObject(NULL,path,0);
@@ -873,10 +875,10 @@ int yaffs_truncate(const YCHAR *path,off_t newSize)
        {
                result = yaffs_ResizeFile(obj,newSize);
        }
-       
+
        yaffsfs_Unlock();
-       
-       
+
+
        return (result) ? 0 : -1;
 }
 
@@ -885,43 +887,43 @@ int yaffs_ftruncate(int fd, off_t newSize)
        yaffsfs_Handle *h = NULL;
        yaffs_Object *obj = NULL;
        int result = 0;
-       
+
        yaffsfs_Lock();
        h = yaffsfs_GetHandlePointer(fd);
        obj = yaffsfs_GetHandleObject(fd);
-       
+
        if(!h || !obj)
        {
                // bad handle
-               yaffsfs_SetError(-EBADF);               
+               yaffsfs_SetError(-EBADF);
        }
        else
        {
                // resize the file
                result = yaffs_ResizeFile(obj,newSize);
-       }       
+       }
        yaffsfs_Unlock();
-       
-       
+
+
        return (result) ? 0 : -1;
 
 }
 
-off_t yaffs_lseek(int fd, off_t offset, int whence) 
+off_t yaffs_lseek(int fd, off_t offset, int whence)
 {
        yaffsfs_Handle *h = NULL;
        yaffs_Object *obj = NULL;
        int pos = -1;
        int fSize = -1;
-       
+
        yaffsfs_Lock();
        h = yaffsfs_GetHandlePointer(fd);
        obj = yaffsfs_GetHandleObject(fd);
-       
+
        if(!h || !obj)
        {
                // bad handle
-               yaffsfs_SetError(-EBADF);               
+               yaffsfs_SetError(-EBADF);
        }
        else if(whence == SEEK_SET)
        {
@@ -945,7 +947,7 @@ off_t yaffs_lseek(int fd, off_t offset, int whence)
                        pos = fSize + offset;
                }
        }
-       
+
        if(pos >= 0)
        {
                h->position = pos;
@@ -955,20 +957,20 @@ off_t yaffs_lseek(int fd, off_t offset, int whence)
                // todo error
        }
 
-       
+
        yaffsfs_Unlock();
-       
+
        return pos;
 }
 
 
-int yaffsfs_DoUnlink(const YCHAR *path,int isDirectory) 
+int yaffsfs_DoUnlink(const YCHAR *path,int isDirectory)
 {
        yaffs_Object *dir = NULL;
        yaffs_Object *obj = NULL;
        YCHAR *name;
        int result = YAFFS_FAIL;
-       
+
        yaffsfs_Lock();
 
        obj = yaffsfs_FindObject(NULL,path,0);
@@ -992,27 +994,27 @@ int yaffsfs_DoUnlink(const YCHAR *path,int isDirectory)
        else
        {
                result = yaffs_Unlink(dir,name);
-               
+
                if(result == YAFFS_FAIL && isDirectory)
                {
                        yaffsfs_SetError(-ENOTEMPTY);
                }
        }
-       
+
        yaffsfs_Unlock();
-       
+
        // todo error
-       
+
        return (result == YAFFS_FAIL) ? -1 : 0;
 }
 
 
-int yaffs_rmdir(const YCHAR *path) 
+int yaffs_rmdir(const YCHAR *path)
 {
        return yaffsfs_DoUnlink(path,1);
 }
 
-int yaffs_unlink(const YCHAR *path) 
+int yaffs_unlink(const YCHAR *path)
 {
        return yaffsfs_DoUnlink(path,0);
 }
@@ -1026,34 +1028,34 @@ int yaffs_rename(const YCHAR *oldPath, const YCHAR *newPath)
        YCHAR *newname;
        int result= YAFFS_FAIL;
        int renameAllowed = 1;
-       
+
        yaffsfs_Lock();
-       
+
        olddir = yaffsfs_FindDirectory(NULL,oldPath,&oldname,0);
        newdir = yaffsfs_FindDirectory(NULL,newPath,&newname,0);
        obj = yaffsfs_FindObject(NULL,oldPath,0);
-       
+
        if(!olddir || !newdir || !obj)
        {
                // bad file
-               yaffsfs_SetError(-EBADF);       
-               renameAllowed = 0;      
+               yaffsfs_SetError(-EBADF);
+               renameAllowed = 0;
        }
        else if(olddir->myDev != newdir->myDev)
        {
                // oops must be on same device
                // todo error
                yaffsfs_SetError(-EXDEV);
-               renameAllowed = 0;      
+               renameAllowed = 0;
        }
        else if(obj && obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY)
        {
-               // It is a directory, check that it is not being renamed to 
+               // It is a directory, check that it is not being renamed to
                // being its own decendent.
                // Do this by tracing from the new directory back to the root, checking for obj
-               
+
                yaffs_Object *xx = newdir;
-               
+
                while( renameAllowed && xx)
                {
                        if(xx == obj)
@@ -1064,15 +1066,15 @@ int yaffs_rename(const YCHAR *oldPath, const YCHAR *newPath)
                }
                if(!renameAllowed) yaffsfs_SetError(-EACCES);
        }
-       
+
        if(renameAllowed)
        {
                result = yaffs_RenameObject(olddir,oldname,newdir,newname);
        }
-       
+
        yaffsfs_Unlock();
-       
-       return (result == YAFFS_FAIL) ? -1 : 0; 
+
+       return (result == YAFFS_FAIL) ? -1 : 0;
 }
 
 
@@ -1090,12 +1092,12 @@ static int yaffsfs_DoStat(yaffs_Object *obj,struct yaffs_stat *buf)
        buf->st_dev = (int)obj->myDev->genericDevice;
        buf->st_ino = obj->objectId;
        buf->st_mode = obj->yst_mode & ~S_IFMT; // clear out file type bits
-       
-               if(obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY) 
+
+               if(obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY)
                {
                        buf->st_mode |= S_IFDIR;
                }
-               else if(obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK) 
+               else if(obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
                {
                        buf->st_mode |= S_IFLNK;
                }
@@ -1103,10 +1105,10 @@ static int yaffsfs_DoStat(yaffs_Object *obj,struct yaffs_stat *buf)
                {
                        buf->st_mode |= S_IFREG;
                }
-               
+
        buf->st_nlink = yaffs_GetObjectLinkCount(obj);
-       buf->st_uid = 0;    
-       buf->st_gid = 0;;     
+       buf->st_uid = 0;
+       buf->st_gid = 0;;
        buf->st_rdev = obj->yst_rdev;
        buf->st_size = yaffs_GetObjectFileLength(obj);
                buf->st_blksize = obj->myDev->nDataBytesPerChunk;
@@ -1131,17 +1133,17 @@ static int yaffsfs_DoStat(yaffs_Object *obj,struct yaffs_stat *buf)
 static int yaffsfs_DoStatOrLStat(const YCHAR *path, struct yaffs_stat *buf,int doLStat)
 {
        yaffs_Object *obj;
-       
+
        int retVal = -1;
-       
+
        yaffsfs_Lock();
        obj = yaffsfs_FindObject(NULL,path,0);
-       
+
        if(!doLStat && obj)
        {
                obj = yaffsfs_FollowLink(obj,0);
        }
-       
+
        if(obj)
        {
                retVal = yaffsfs_DoStat(obj,buf);
@@ -1151,11 +1153,11 @@ static int yaffsfs_DoStatOrLStat(const YCHAR *path, struct yaffs_stat *buf,int d
                // todo error not found
                yaffsfs_SetError(-ENOENT);
        }
-       
+
        yaffsfs_Unlock();
-       
+
        return retVal;
-       
+
 }
 
 int yaffs_stat(const YCHAR *path, struct yaffs_stat *buf)
@@ -1171,12 +1173,12 @@ int yaffs_lstat(const YCHAR *path, struct yaffs_stat *buf)
 int yaffs_fstat(int fd, struct yaffs_stat *buf)
 {
        yaffs_Object *obj;
-       
+
        int retVal = -1;
-       
+
        yaffsfs_Lock();
        obj = yaffsfs_GetHandleObject(fd);
-       
+
        if(obj)
        {
                retVal = yaffsfs_DoStat(obj,buf);
@@ -1236,13 +1238,13 @@ int yaffs_get_wince_times(int fd, unsigned *wctime, unsigned *watime, unsigned *
 int yaffs_set_wince_times(int fd, 
                                                  const unsigned *wctime, 
                                                  const unsigned *watime, 
-                                                 const unsigned *wmtime)
+                                                  const unsigned *wmtime)
 {
-       yaffs_Object *obj;
-       
-       int retVal = -1;
+        yaffs_Object *obj;
+        int result;
+        int retVal = -1;
 
-       yaffsfs_Lock();
+        yaffsfs_Lock();
        obj = yaffsfs_GetHandleObject(fd);
 
        if(obj)
@@ -1253,17 +1255,19 @@ int yaffs_set_wince_times(int fd,
                        obj->win_ctime[1] = wctime[1];
                }
                if(watime){
-                       obj->win_atime[0] = watime[0];
-                       obj->win_atime[1] = watime[1];
-               }
-               if(wctime){
-                       obj->win_mtime[0] = wmtime[0];
-                       obj->win_mtime[1] = wmtime[1];
-               }
-
-               retVal = 0;
-       }
-       else
+                        obj->win_atime[0] = watime[0];
+                        obj->win_atime[1] = watime[1];
+                }
+                if(wmtime){
+                        obj->win_mtime[0] = wmtime[0];
+                        obj->win_mtime[1] = wmtime[1];
+                }
+
+                obj->dirty = 1;
+                result = yaffs_FlushFile(obj,0);
+                retVal = 0;
+        }
+        else
        {
                // bad handle
                yaffsfs_SetError(-EBADF);
@@ -1285,14 +1289,14 @@ static int yaffsfs_DoChMod(yaffs_Object *obj,mode_t mode)
        {
                obj = yaffs_GetEquivalentObject(obj);
        }
-       
+
        if(obj)
        {
                obj->yst_mode = mode;
                obj->dirty = 1;
                result = yaffs_FlushFile(obj,0);
        }
-       
+
        return result == YAFFS_OK ? 0 : -1;
 }
 
@@ -1300,16 +1304,16 @@ static int yaffsfs_DoChMod(yaffs_Object *obj,mode_t mode)
 int yaffs_access(const YCHAR *path, int amode)
 {
        yaffs_Object *obj;
-       
+
        int retval = 0;
-       
+
        yaffsfs_Lock();
        obj = yaffsfs_FindObject(NULL,path,0);
-       
+
        if(obj)
        {
                int access_ok = 1;
-               
+
                if((amode & R_OK) && !(obj->yst_mode & S_IREAD))
                        access_ok = 0;
                if((amode & W_OK) && !(obj->yst_mode & S_IWRITE))
@@ -1328,23 +1332,23 @@ int yaffs_access(const YCHAR *path, int amode)
                yaffsfs_SetError(-ENOENT);
                retval = -1;
        }
-       
+
        yaffsfs_Unlock();
-       
+
        return retval;
-       
+
 }
 
 
 int yaffs_chmod(const YCHAR *path, mode_t mode)
 {
        yaffs_Object *obj;
-       
+
        int retVal = -1;
-       
+
        yaffsfs_Lock();
        obj = yaffsfs_FindObject(NULL,path,0);
-       
+
        if(obj)
        {
                retVal = yaffsfs_DoChMod(obj,mode);
@@ -1354,23 +1358,23 @@ int yaffs_chmod(const YCHAR *path, mode_t mode)
                // todo error not found
                yaffsfs_SetError(-ENOENT);
        }
-       
+
        yaffsfs_Unlock();
-       
+
        return retVal;
-       
+
 }
 
 
 int yaffs_fchmod(int fd, mode_t mode)
 {
        yaffs_Object *obj;
-       
+
        int retVal = -1;
-       
+
        yaffsfs_Lock();
        obj = yaffsfs_GetHandleObject(fd);
-       
+
        if(obj)
        {
                retVal = yaffsfs_DoChMod(obj,mode);
@@ -1378,11 +1382,11 @@ int yaffs_fchmod(int fd, mode_t mode)
        else
        {
                // bad handle
-               yaffsfs_SetError(-EBADF);               
+               yaffsfs_SetError(-EBADF);
        }
-       
+
        yaffsfs_Unlock();
-       
+
        return retVal;
 }
 
@@ -1393,7 +1397,7 @@ int yaffs_mkdir(const YCHAR *path, mode_t mode)
        yaffs_Object *dir = NULL;
        YCHAR *name;
        int retVal= -1;
-       
+
        yaffsfs_Lock();
        parent = yaffsfs_FindDirectory(NULL,path,&name,0);
        if(parent)
@@ -1411,12 +1415,12 @@ int yaffs_mkdir(const YCHAR *path, mode_t mode)
                        yaffsfs_SetError(-EEXIST); // the name already exists
                }
                else
-                       yaffsfs_SetError(-ENOSPC); // just assume no space 
+                       yaffsfs_SetError(-ENOSPC); // just assume no space
                retVal = -1;
        }
-       
+
        yaffsfs_Unlock();
-       
+
        return retVal;
 }
 
@@ -1426,9 +1430,9 @@ int yaffs_mount(const YCHAR *path)
        int result=YAFFS_FAIL;
        yaffs_Device *dev=NULL;
        YCHAR *dummy;
-       
+
        T(YAFFS_TRACE_ALWAYS,(TSTR("yaffs: Mounting %s" TENDSTR),path));
-       
+
        yaffsfs_Lock();
        dev = yaffsfs_FindDevice(path,&dummy);
        if(dev)
@@ -1442,7 +1446,7 @@ int yaffs_mount(const YCHAR *path)
                                yaffsfs_SetError(-ENOMEM);
                        }
                        retVal = result ? 0 : -1;
-                       
+
                }
                else
                {
@@ -1457,50 +1461,50 @@ int yaffs_mount(const YCHAR *path)
        }
        yaffsfs_Unlock();
        return retVal;
-       
+
 }
 
 int yaffs_sync(const YCHAR *path)
 {
-       int retVal=-1;
-       yaffs_Device *dev=NULL;
-       YCHAR *dummy;
-       
-       yaffsfs_Lock();
-       dev = yaffsfs_FindDevice(path,&dummy);
-       if(dev)
-       {
-               if(dev->isMounted)
-               {
-                       
-                       yaffs_FlushEntireDeviceCache(dev);
-                       yaffs_CheckpointSave(dev);
-                       
-                       
-               }
-               else
-               {
-                       //todo error - not mounted.
-                       yaffsfs_SetError(-EINVAL);
-                       
-               }
-       }
-       else
-       {
-               // todo error - no device
-               yaffsfs_SetError(-ENODEV);
-       }       
-       yaffsfs_Unlock();
-       return retVal;  
+        int retVal=-1;
+        yaffs_Device *dev=NULL;
+        YCHAR *dummy;
+        
+        yaffsfs_Lock();
+        dev = yaffsfs_FindDevice(path,&dummy);
+        if(dev)
+        {
+                if(dev->isMounted)
+                {
+                        
+                        yaffs_FlushEntireDeviceCache(dev);
+                        yaffs_CheckpointSave(dev);
+                        
+                        
+                }
+                else
+                {
+                        //todo error - not mounted.
+                        yaffsfs_SetError(-EINVAL);
+                        
+                }
+        }
+        else
+        {
+                // todo error - no device
+                yaffsfs_SetError(-ENODEV);
+        }       
+        yaffsfs_Unlock();
+        return retVal;  
 }
 
 
 int yaffs_unmount(const YCHAR *path)
 {
-       int retVal=-1;
+        int retVal=-1;
        yaffs_Device *dev=NULL;
        YCHAR *dummy;
-       
+
        yaffsfs_Lock();
        dev = yaffsfs_FindDevice(path,&dummy);
        if(dev)
@@ -1509,10 +1513,10 @@ int yaffs_unmount(const YCHAR *path)
                {
                        int i;
                        int inUse;
-                       
+
                        yaffs_FlushEntireDeviceCache(dev);
                        yaffs_CheckpointSave(dev);
-                       
+
                        for(i = inUse = 0; i < YAFFSFS_N_HANDLES && !inUse; i++)
                        {
                                if(yaffsfs_handle[i].inUse && yaffsfs_handle[i].obj->myDev == dev)
@@ -1520,11 +1524,11 @@ int yaffs_unmount(const YCHAR *path)
                                        inUse = 1; // the device is in use, can't unmount
                                }
                        }
-                       
+
                        if(!inUse)
                        {
                                yaffs_Deinitialise(dev);
-                                       
+
                                retVal = 0;
                        }
                        else
@@ -1532,23 +1536,23 @@ int yaffs_unmount(const YCHAR *path)
                                // todo error can't unmount as files are open
                                yaffsfs_SetError(-EBUSY);
                        }
-                       
+
                }
                else
                {
                        //todo error - not mounted.
                        yaffsfs_SetError(-EINVAL);
-                       
+
                }
        }
        else
        {
                // todo error - no device
                yaffsfs_SetError(-ENODEV);
-       }       
+       }
        yaffsfs_Unlock();
        return retVal;
-       
+
 }
 
 loff_t yaffs_freespace(const YCHAR *path)
@@ -1556,7 +1560,7 @@ loff_t yaffs_freespace(const YCHAR *path)
        loff_t retVal=-1;
        yaffs_Device *dev=NULL;
        YCHAR *dummy;
-       
+
        yaffsfs_Lock();
        dev = yaffsfs_FindDevice(path,&dummy);
        if(dev  && dev->isMounted)
@@ -1593,32 +1597,32 @@ loff_t yaffs_totalspace(const YCHAR *path)
        {
                yaffsfs_SetError(-EINVAL);
        }
-       
+
        yaffsfs_Unlock();
-       return retVal;  
+       return retVal;
 }
 
 
 
 void yaffs_initialise(yaffsfs_DeviceConfiguration *cfgList)
 {
-       
+
        yaffsfs_DeviceConfiguration *cfg;
-       
+
        yaffsfs_configurationList = cfgList;
-       
+
        yaffsfs_InitHandles();
-       
+
        cfg = yaffsfs_configurationList;
-       
+
        while(cfg && cfg->prefix && cfg->dev)
        {
                cfg->dev->isMounted = 0;
                cfg->dev->removeObjectCallback = yaffsfs_RemoveObjectCallback;
                cfg++;
        }
-       
-       
+
+
 }
 
 
@@ -1636,10 +1640,10 @@ typedef struct
        __u32 magic;
        yaffs_dirent de;                /* directory entry being used by this dsc */
        YCHAR name[NAME_MAX+1];         /* name of directory being searched */
-       yaffs_Object *dirObj;           /* ptr to directory being searched */
-       yaffs_Object *nextReturn;       /* obj to be returned by next readddir */
-       int offset;
-       struct ylist_head others;       
+        yaffs_Object *dirObj;           /* ptr to directory being searched */
+        yaffs_Object *nextReturn;       /* obj to be returned by next readddir */
+        int offset;
+        struct ylist_head others;       
 } yaffsfs_DirectorySearchContext;
 
 
@@ -1652,16 +1656,16 @@ static void yaffsfs_SetDirRewound(yaffsfs_DirectorySearchContext *dsc)
        if(dsc &&
           dsc->dirObj &&
           dsc->dirObj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY){
-          
-          dsc->offset = 0;
-          
-          if( ylist_empty(&dsc->dirObj->variant.directoryVariant.children)){
-               dsc->nextReturn = NULL;
-          } else {
-               dsc->nextReturn = ylist_entry(dsc->dirObj->variant.directoryVariant.children.next,
-                                               yaffs_Object,siblings);
-          }
-       } else {
+
+           dsc->offset = 0;
+
+           if( ylist_empty(&dsc->dirObj->variant.directoryVariant.children)){
+                dsc->nextReturn = NULL;
+           } else {
+                dsc->nextReturn = ylist_entry(dsc->dirObj->variant.directoryVariant.children.next,
+                                                yaffs_Object,siblings);
+           }
+        } else {
                /* Hey someone isn't playing nice! */
        }
 }
@@ -1670,46 +1674,46 @@ static void yaffsfs_DirAdvance(yaffsfs_DirectorySearchContext *dsc)
 {
        if(dsc &&
           dsc->dirObj &&
-          dsc->dirObj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY){
-          
-          if( dsc->nextReturn == NULL ||
-              ylist_empty(&dsc->dirObj->variant.directoryVariant.children)){
-               dsc->nextReturn = NULL;
-          } else {
-                  struct ylist_head *next = dsc->nextReturn->siblings.next;
-   
-                  if( next == &dsc->dirObj->variant.directoryVariant.children)
-                       dsc->nextReturn = NULL; /* end of list */
-                  else 
-                       dsc->nextReturn = ylist_entry(next,yaffs_Object,siblings);
-          }
-       } else {
-               /* Hey someone isn't playing nice! */
+           dsc->dirObj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY){
+
+           if( dsc->nextReturn == NULL ||
+               ylist_empty(&dsc->dirObj->variant.directoryVariant.children)){
+                dsc->nextReturn = NULL;
+           } else {
+                   struct ylist_head *next = dsc->nextReturn->siblings.next;
+
+                   if( next == &dsc->dirObj->variant.directoryVariant.children)
+                        dsc->nextReturn = NULL; /* end of list */
+                   else
+                        dsc->nextReturn = ylist_entry(next,yaffs_Object,siblings);
+           }
+        } else {
+                /* Hey someone isn't playing nice! */
        }
 }
 
 static void yaffsfs_RemoveObjectCallback(yaffs_Object *obj)
 {
 
-       struct ylist_head *i;
-       yaffsfs_DirectorySearchContext *dsc;
-       
-       /* if search contexts not initilised then skip */
-       if(!search_contexts.next)
-               return;
-               
-       /* Iterate through the directory search contexts.
-        * If any are the one being removed, then advance the dsc to
-        * the next one to prevent a hanging ptr.
-        */
-        ylist_for_each(i, &search_contexts) {
-               if (i) {
-                       dsc = ylist_entry(i, yaffsfs_DirectorySearchContext,others);
-                       if(dsc->nextReturn == obj)
-                               yaffsfs_DirAdvance(dsc);
-               }
+        struct ylist_head *i;
+        yaffsfs_DirectorySearchContext *dsc;
+
+        /* if search contexts not initilised then skip */
+        if(!search_contexts.next)
+                return;
+
+        /* Iterate through the directory search contexts.
+         * If any are the one being removed, then advance the dsc to
+         * the next one to prevent a hanging ptr.
+         */
+         ylist_for_each(i, &search_contexts) {
+                if (i) {
+                        dsc = ylist_entry(i, yaffsfs_DirectorySearchContext,others);
+                        if(dsc->nextReturn == obj)
+                                yaffsfs_DirAdvance(dsc);
+                }
        }
-                               
+
 }
 
 yaffs_DIR *yaffs_opendir(const YCHAR *dirname)
@@ -1717,34 +1721,34 @@ yaffs_DIR *yaffs_opendir(const YCHAR *dirname)
        yaffs_DIR *dir = NULL;
        yaffs_Object *obj = NULL;
        yaffsfs_DirectorySearchContext *dsc = NULL;
-       
+
        yaffsfs_Lock();
-       
+
        obj = yaffsfs_FindObject(NULL,dirname,0);
-       
+
        if(obj && obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY)
        {
-               
+
                dsc = YMALLOC(sizeof(yaffsfs_DirectorySearchContext));
                dir = (yaffs_DIR *)dsc;
                if(dsc)
                {
                        memset(dsc,0,sizeof(yaffsfs_DirectorySearchContext));
-                       dsc->magic = YAFFS_MAGIC;
-                       dsc->dirObj = obj;
-                       yaffs_strncpy(dsc->name,dirname,NAME_MAX);
-                       YINIT_LIST_HEAD(&dsc->others);
-                       
-                       if(!search_contexts.next)
-                               YINIT_LIST_HEAD(&search_contexts);
-                               
-                       ylist_add(&dsc->others,&search_contexts);       
-                       yaffsfs_SetDirRewound(dsc);             }
-       
-       }
-       
+                        dsc->magic = YAFFS_MAGIC;
+                        dsc->dirObj = obj;
+                        yaffs_strncpy(dsc->name,dirname,NAME_MAX);
+                        YINIT_LIST_HEAD(&dsc->others);
+
+                        if(!search_contexts.next)
+                                YINIT_LIST_HEAD(&search_contexts);
+
+                        ylist_add(&dsc->others,&search_contexts);       
+                        yaffsfs_SetDirRewound(dsc);             }
+
+        }
+
        yaffsfs_Unlock();
-       
+
        return dir;
 }
 
@@ -1752,9 +1756,9 @@ struct yaffs_dirent *yaffs_readdir(yaffs_DIR *dirp)
 {
        yaffsfs_DirectorySearchContext *dsc = (yaffsfs_DirectorySearchContext *)dirp;
        struct yaffs_dirent *retVal = NULL;
-               
+
        yaffsfs_Lock();
-       
+
        if(dsc && dsc->magic == YAFFS_MAGIC){
                yaffsfs_SetError(0);
                if(dsc->nextReturn){
@@ -1777,20 +1781,20 @@ struct yaffs_dirent *yaffs_readdir(yaffs_DIR *dirp)
        {
                yaffsfs_SetError(-EBADF);
        }
-       
+
        yaffsfs_Unlock();
-       
+
        return retVal;
-       
+
 }
 
 
 void yaffs_rewinddir(yaffs_DIR *dirp)
 {
        yaffsfs_DirectorySearchContext *dsc = (yaffsfs_DirectorySearchContext *)dirp;
-       
+
        yaffsfs_Lock();
-       
+
        yaffsfs_SetDirRewound(dsc);
 
        yaffsfs_Unlock();
@@ -1800,13 +1804,13 @@ void yaffs_rewinddir(yaffs_DIR *dirp)
 int yaffs_closedir(yaffs_DIR *dirp)
 {
        yaffsfs_DirectorySearchContext *dsc = (yaffsfs_DirectorySearchContext *)dirp;
-               
-       yaffsfs_Lock();
-       dsc->magic = 0;
-       ylist_del(&dsc->others); /* unhook from list */
-       YFREE(dsc);
-       yaffsfs_Unlock();
-       return 0;
+
+        yaffsfs_Lock();
+        dsc->magic = 0;
+        ylist_del(&dsc->others); /* unhook from list */
+        YFREE(dsc);
+        yaffsfs_Unlock();
+        return 0;
 }
 
 // end of directory stuff
@@ -1819,7 +1823,7 @@ int yaffs_symlink(const YCHAR *oldpath, const YCHAR *newpath)
        YCHAR *name;
        int retVal= -1;
        int mode = 0; // ignore for now
-       
+
        yaffsfs_Lock();
        parent = yaffsfs_FindDirectory(NULL,newpath,&name,0);
        obj = yaffs_MknodSymLink(parent,name,mode,0,0,oldpath);
@@ -1832,11 +1836,11 @@ int yaffs_symlink(const YCHAR *oldpath, const YCHAR *newpath)
                yaffsfs_SetError(-ENOSPC); // just assume no space for now
                retVal = -1;
        }
-       
+
        yaffsfs_Unlock();
-       
+
        return retVal;
-       
+
 }
 
 int yaffs_readlink(const YCHAR *path, YCHAR *buf, int bufsiz)
@@ -1844,11 +1848,11 @@ int yaffs_readlink(const YCHAR *path, YCHAR *buf, int bufsiz)
        yaffs_Object *obj = NULL;
        int retVal;
 
-               
+
        yaffsfs_Lock();
-       
+
        obj = yaffsfs_FindObject(NULL,path,0);
-       
+
        if(!obj)
        {
                yaffsfs_SetError(-ENOENT);
@@ -1877,12 +1881,12 @@ int yaffs_link(const YCHAR *oldpath, const YCHAR *newpath)
        yaffs_Object *target = NULL;
        int retVal = 0;
 
-               
+
        yaffsfs_Lock();
-       
+
        obj = yaffsfs_FindObject(NULL,oldpath,0);
        target = yaffsfs_FindObject(NULL,newpath,0);
-       
+
        if(!obj)
        {
                yaffsfs_SetError(-ENOENT);
@@ -1893,15 +1897,15 @@ int yaffs_link(const YCHAR *oldpath, const YCHAR *newpath)
                yaffsfs_SetError(-EEXIST);
                retVal = -1;
        }
-       else    
+       else
        {
                yaffs_Object *newdir = NULL;
                yaffs_Object *link = NULL;
-               
+
                YCHAR *newname;
-               
+
                newdir = yaffsfs_FindDirectory(NULL,newpath,&newname,0);
-               
+
                if(!newdir)
                {
                        yaffsfs_SetError(-ENOTDIR);
@@ -1926,7 +1930,7 @@ int yaffs_link(const YCHAR *oldpath, const YCHAR *newpath)
                }
        }
        yaffsfs_Unlock();
-       
+
        return retVal;
 }
 
@@ -1936,13 +1940,13 @@ int yaffs_DumpDevStruct(const YCHAR *path)
 {
 #if 0
        YCHAR *rest;
-       
+
        yaffs_Object *obj = yaffsfs_FindRoot(path,&rest);
-       
+
        if(obj)
        {
                yaffs_Device *dev = obj->myDev;
-               
+
                printf("\n"
                           "nPageWrites.......... %d\n"
                           "nPageReads........... %d\n"
@@ -1958,7 +1962,7 @@ int yaffs_DumpDevStruct(const YCHAR *path)
                                dev->garbageCollections,
                                dev->passiveGarbageCollections
                );
-               
+
        }
 
 #endif
index fe4eff5..1c0d316 100644 (file)
@@ -39,7 +39,7 @@
 #ifdef CONFIG_YAFFSFS_PROVIDE_VALUES
 
 #ifndef O_RDONLY
-#define O_RDONLY       00
+#define O_RDONLY        00
 #endif
 
 #ifndef O_WRONLY
@@ -240,6 +240,13 @@ int yaffs_stat(const YCHAR *path, struct yaffs_stat *buf) ;
 int yaffs_lstat(const YCHAR *path, struct yaffs_stat *buf) ;
 int yaffs_fstat(int fd, struct yaffs_stat *buf) ;
 
+#ifdef CONFIG_YAFFS_WINCE
+
+int yaffs_set_wince_times(int fd, const unsigned *wctime, const unsigned *watime, const unsigned *wmtime);
+int yaffs_get_wince_times(int fd, unsigned *wctime, unsigned *watime, unsigned *wmtime);
+
+#endif
+
 int yaffs_chmod(const YCHAR *path, mode_t mode); 
 int yaffs_fchmod(int fd, mode_t mode); 
 
index 6a2bb18..cae8880 100644 (file)
@@ -31,6 +31,7 @@
 
 #include "assert.h"
 #define YBUG() assert(0)
+//#define YBUG() do { *((int *)0) =1;} while(0)
 
 
 #define YCHAR char
index 223f2c1..6e725ac 100644 (file)
@@ -12,7 +12,7 @@
  */
 
 const char *yaffs_guts_c_version =
-    "$Id: yaffs_guts.c,v 1.56 2008-05-08 23:23:26 charles Exp $";
+    "$Id: yaffs_guts.c,v 1.57 2008-07-02 20:17:41 charles Exp $";
 
 #include "yportenv.h"
 
@@ -147,71 +147,71 @@ 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
+/* 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;
                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;
                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));
-
+               
        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)
@@ -352,7 +352,7 @@ static Y_INLINE void yaffs_ClearChunkBit(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);
 
        blkBits[chunk / 8] |= (1 << (chunk & 7));
@@ -390,16 +390,16 @@ static int yaffs_CountChunkBits(yaffs_Device * dev, int blk)
                                n++;
                        x >>=1;
                }
-
+                       
                blkBits++;
        }
        return n;
 }
 
-/*
+/* 
  * Verification code
  */
-
 static int yaffs_SkipVerification(yaffs_Device *dev)
 {
        return !(yaffs_traceMask & (YAFFS_TRACE_VERIFY | YAFFS_TRACE_VERIFY_FULL));
@@ -435,14 +435,14 @@ static void yaffs_VerifyBlock(yaffs_Device *dev,yaffs_BlockInfo *bi,int n)
 {
        int actuallyUsed;
        int inUse;
-
+       
        if(yaffs_SkipVerification(dev))
                return;
-
+               
        /* Report illegal runtime states */
        if(bi->blockState <0 || 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:
@@ -450,42 +450,42 @@ static void yaffs_VerifyBlock(yaffs_Device *dev,yaffs_BlockInfo *bi,int n)
                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 ||
           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));
-
-
+       
+               
        /* Check chunk bitmap legal */
        inUse = yaffs_CountChunkBits(dev,n);
        if(inUse != bi->pagesInUse)
                T(YAFFS_TRACE_VERIFY,(TSTR("Block %d has inconsistent values pagesInUse %d counted chunk bits %d"TENDSTR),
                        n,bi->pagesInUse,inUse));
-
+       
        /* Check that the sequence number is valid.
-        * Ten million is legal, but is very unlikely
+        * 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));
-
+               
 }
 
 static void yaffs_VerifyCollectedBlock(yaffs_Device *dev,yaffs_BlockInfo *bi,int n)
 {
        yaffs_VerifyBlock(dev,bi,n);
-
+       
        /* After collection the block should be in the erased state */
        /* TODO: This will need to change if we do partial gc */
-
+       
        if(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));
@@ -497,14 +497,14 @@ static void yaffs_VerifyBlocks(yaffs_Device *dev)
        int i;
        int nBlocksPerState[YAFFS_NUMBER_OF_BLOCK_STATES];
        int nIllegalBlockStates = 0;
-
+       
 
        if(yaffs_SkipVerification(dev))
                return;
 
        memset(nBlocksPerState,0,sizeof(nBlocksPerState));
 
-
+               
        for(i = dev->internalStartBlock; i <= dev->internalEndBlock; i++){
                yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
                yaffs_VerifyBlock(dev,bi,i);
@@ -513,12 +513,12 @@ static void yaffs_VerifyBlocks(yaffs_Device *dev)
                        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)));
@@ -527,17 +527,17 @@ static void yaffs_VerifyBlocks(yaffs_Device *dev)
                T(YAFFS_TRACE_VERIFY,
                  (TSTR("%s %d blocks"TENDSTR),
                  blockStateName[i],nBlocksPerState[i]));
-
+       
        if(dev->blocksInCheckpoint != nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT])
                T(YAFFS_TRACE_VERIFY,
                 (TSTR("Checkpoint block count wrong dev %d count %d"TENDSTR),
                 dev->blocksInCheckpoint, nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT]));
-
+                
        if(dev->nErasedBlocks != nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY])
                T(YAFFS_TRACE_VERIFY,
                 (TSTR("Erased block count wrong dev %d count %d"TENDSTR),
                 dev->nErasedBlocks, nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY]));
-
+                
        if(nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING] > 1)
                T(YAFFS_TRACE_VERIFY,
                 (TSTR("Too many collecting blocks %d (max is 1)"TENDSTR),
@@ -555,14 +555,14 @@ static void yaffs_VerifyObjectHeader(yaffs_Object *obj, yaffs_ObjectHeader *oh,
 {
        if(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));
                return;
        }
-
+       
        if(oh->type <= YAFFS_OBJECT_TYPE_UNKNOWN ||
           oh->type > YAFFS_OBJECT_TYPE_MAX)
                T(YAFFS_TRACE_VERIFY,
@@ -577,25 +577,25 @@ static void yaffs_VerifyObjectHeader(yaffs_Object *obj, yaffs_ObjectHeader *oh,
 
        /*
         * 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 != 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),
@@ -631,12 +631,12 @@ static int yaffs_VerifyTnodeWorker(yaffs_Object * obj, yaffs_Tnode * tn,
                        int i;
                        yaffs_ExtendedTags tags;
                        __u32 objectId = obj->objectId;
-
+                       
                        chunkOffset <<=  YAFFS_TNODES_LEVEL0_BITS;
-
+                       
                        for(i = 0; i < YAFFS_NTNODES_LEVEL0; i++){
                                __u32 theChunk = yaffs_GetChunkGroupBase(dev,tn,i);
-
+                               
                                if(theChunk > 0){
                                        /* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),tags.objectId,tags.chunkId,theChunk)); */
                                        yaffs_ReadChunkWithTagsFromNAND(dev,theChunk,NULL, &tags);
@@ -667,13 +667,13 @@ static void yaffs_VerifyFile(yaffs_Object *obj)
        yaffs_ExtendedTags tags;
        yaffs_Tnode *tn;
        __u32 objectId;
-
+       
        if(obj && 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;
@@ -682,23 +682,23 @@ static void yaffs_VerifyFile(yaffs_Object *obj)
                x >>= YAFFS_TNODES_INTERNAL_BITS;
                requiredTallness++;
        }
-
+       
        actualTallness = obj->variant.fileVariant.topLevel;
-
+       
        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.
+       
+       
+       /* Check that the chunks in the tnode tree are all correct. 
         * We do this by scanning through the tnode tree and
         * checking the tags for every chunk match.
         */
 
        if(yaffs_SkipNANDVerification(dev))
                return;
-
+               
        for(i = 1; i <= lastChunk; i++){
                tn = yaffs_FindLevel0Tnode(dev, &obj->variant.fileVariant,i);
 
@@ -723,14 +723,14 @@ static void yaffs_VerifyDirectory(yaffs_Object *obj)
 {
        if(obj && yaffs_SkipVerification(obj->myDev))
                return;
-
+       
 }
 
 static void yaffs_VerifyHardLink(yaffs_Object *obj)
 {
        if(obj && yaffs_SkipVerification(obj->myDev))
                return;
-
+               
        /* Verify sane equivalent object */
 }
 
@@ -738,7 +738,7 @@ static void yaffs_VerifySymlink(yaffs_Object *obj)
 {
        if(obj && yaffs_SkipVerification(obj->myDev))
                return;
-
+               
        /* Verify symlink string */
 }
 
@@ -751,32 +751,32 @@ static void yaffs_VerifySpecial(yaffs_Object *obj)
 static void yaffs_VerifyObject(yaffs_Object *obj)
 {
        yaffs_Device *dev;
-
+       
        __u32 chunkMin;
        __u32 chunkMax;
-
+       
        __u32 chunkIdOk;
        __u32 chunkIsLive;
-
+       
        if(!obj)
                return;
-
+       
        dev = obj->myDev;
-
+       
        if(yaffs_SkipVerification(dev))
                return;
-
+               
        /* Check sane object header chunk */
-
-       chunkMin = dev->internalStartBlock * dev->nChunksPerBlock;
-       chunkMax = (dev->internalEndBlock+1) * dev->nChunksPerBlock - 1;
-
-       chunkIdOk = (obj->chunkId >= chunkMin && obj->chunkId <= chunkMax);
-       chunkIsLive = chunkIdOk &&
-                       yaffs_CheckChunkBit(dev,
-                                           obj->chunkId / dev->nChunksPerBlock,
+       
+        chunkMin = dev->internalStartBlock * dev->nChunksPerBlock;
+        chunkMax = (dev->internalEndBlock+1) * dev->nChunksPerBlock - 1;
+        
+        chunkIdOk = (((unsigned)(obj->chunkId)) >= chunkMin && ((unsigned)(obj->chunkId)) <= chunkMax);
+        chunkIsLive = chunkIdOk && 
+                        yaffs_CheckChunkBit(dev, 
+                                            obj->chunkId / dev->nChunksPerBlock,
                                            obj->chunkId % dev->nChunksPerBlock);
-       if(!obj->fake &&
+       if(!obj->fake && 
            (!chunkIdOk || !chunkIsLive)) {
           T(YAFFS_TRACE_VERIFY,
           (TSTR("Obj %d has chunkId %d %s %s"TENDSTR),
@@ -784,36 +784,36 @@ static void yaffs_VerifyObject(yaffs_Object *obj)
           chunkIdOk ? "" : ",out of range",
           chunkIsLive || !chunkIdOk ? "" : ",marked as deleted"));
        }
-
+       
        if(chunkIdOk && chunkIsLive &&!yaffs_SkipNANDVerification(dev)) {
                yaffs_ExtendedTags tags;
                yaffs_ObjectHeader *oh;
                __u8 *buffer = yaffs_GetTempBuffer(dev,__LINE__);
-
+               
                oh = (yaffs_ObjectHeader *)buffer;
-
+               
                yaffs_ReadChunkWithTagsFromNAND(dev, obj->chunkId,buffer, &tags);
-
+               
                yaffs_VerifyObjectHeader(obj,oh,&tags,1);
-
+               
                yaffs_ReleaseTempBuffer(dev,buffer,__LINE__);
        }
-
+       
        /* Verify it has a parent */
        if(obj && !obj->fake &&
           (!obj->parent || obj->parent->myDev != dev)){
           T(YAFFS_TRACE_VERIFY,
           (TSTR("Obj %d has parent pointer %p which does not look like an object"TENDSTR),
-          obj->objectId,obj->parent));
+          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));
+          obj->objectId,obj->parent->variantType));       
        }
-
+       
        switch(obj->variantType){
        case YAFFS_OBJECT_TYPE_FILE:
                yaffs_VerifyFile(obj);
@@ -834,31 +834,31 @@ 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;
-
-       if(yaffs_SkipVerification(dev))
-               return;
+        yaffs_Object *obj;
+        int i;
+        struct ylist_head *lh;
 
-       /* 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);
+                        }
+                }
         }
 
 }
@@ -867,7 +867,7 @@ static void yaffs_VerifyObjects(yaffs_Device *dev)
 /*
  *  Simple hash function. Needs to have a reasonable spread
  */
-
 static Y_INLINE int yaffs_HashFunction(int n)
 {
        n = abs(n);
@@ -877,7 +877,7 @@ static Y_INLINE int yaffs_HashFunction(int n)
 /*
  * Access functions to useful fake objects
  */
-
 yaffs_Object *yaffs_Root(yaffs_Device * dev)
 {
        return dev->rootDir;
@@ -892,7 +892,7 @@ yaffs_Object *yaffs_LostNFound(yaffs_Device * dev)
 /*
  *  Erased NAND checking functions
  */
-
 int yaffs_CheckFF(__u8 * buffer, int nBytes)
 {
        /* Horrible, slow implementation */
@@ -914,10 +914,10 @@ static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,
        int result;
 
        result = yaffs_ReadChunkWithTagsFromNAND(dev, chunkInNAND, data, &tags);
-
+       
        if(tags.eccResult > YAFFS_ECC_RESULT_NO_ERROR)
                retval = YAFFS_FAIL;
-
+               
 
        if (!yaffs_CheckFF(data, dev->nDataBytesPerChunk) || tags.chunkUsed) {
                T(YAFFS_TRACE_NANDACCESS,
@@ -1007,9 +1007,9 @@ 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 &&
+       } while (writeOk != YAFFS_OK && 
                (yaffs_wr_attempts <= 0 || attempts <= yaffs_wr_attempts));
-
+       
        if(!writeOk)
                chunk = -1;
 
@@ -1027,13 +1027,13 @@ static int yaffs_WriteNewChunkWithTagsToNAND(struct yaffs_DeviceStruct *dev,
 /*
  * Block retiring for handling a broken block.
  */
-
 static void yaffs_RetireBlock(yaffs_Device * dev, int blockInNAND)
 {
        yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockInNAND);
 
        yaffs_InvalidateCheckpoint(dev);
-
+       
        yaffs_MarkBlockBad(dev, blockInNAND);
 
        bi->blockState = YAFFS_BLOCK_STATE_DEAD;
@@ -1047,7 +1047,7 @@ 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)
@@ -1065,13 +1065,13 @@ void yaffs_HandleChunkError(yaffs_Device *dev, yaffs_BlockInfo *bi)
                bi->gcPrioritise = 1;
                dev->hasPendingPrioritisedGCs = 1;
                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)));
 
                }
-
+               
        }
 }
 
@@ -1082,23 +1082,23 @@ static void yaffs_HandleWriteChunkError(yaffs_Device * dev, int chunkInNAND, int
        yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, blockInNAND);
 
        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)
 {
@@ -1139,7 +1139,7 @@ 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
@@ -1157,14 +1157,14 @@ 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))
                tnodeSize = sizeof(yaffs_Tnode);
-
+               
 
        /* make these things */
 
@@ -1198,7 +1198,7 @@ static int yaffs_CreateTnodes(yaffs_Device * dev, int nTnodes)
                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;
@@ -1213,7 +1213,7 @@ 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,
@@ -1268,11 +1268,11 @@ static yaffs_Tnode *yaffs_GetTnode(yaffs_Device * dev)
 
        if(tnodeSize < sizeof(yaffs_Tnode))
                tnodeSize = sizeof(yaffs_Tnode);
-
+       
        if(tn)
                memset(tn, 0, tnodeSize);
 
-       return tn;
+       return tn;      
 }
 
 /* FreeTnode frees up a tnode and puts it back on the free list */
@@ -1292,7 +1292,7 @@ static void yaffs_FreeTnode(yaffs_Device * dev, yaffs_Tnode * tn)
                dev->nFreeTnodes++;
        }
        dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
-
+       
 }
 
 static void yaffs_DeinitialiseTnodes(yaffs_Device * dev)
@@ -1330,19 +1330,19 @@ void yaffs_PutLevel0Tnode(yaffs_Device *dev, yaffs_Tnode *tn, unsigned pos, unsi
   __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++;;
@@ -1359,24 +1359,24 @@ static __u32 yaffs_GetChunkGroupBase(yaffs_Device *dev, yaffs_Tnode *tn, unsigne
   __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;
 }
 
@@ -1425,7 +1425,7 @@ static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device * dev,
        while (level > 0 && tn) {
                tn = tn->
                    internal[(chunkId >>
-                              ( YAFFS_TNODES_LEVEL0_BITS +
+                              ( YAFFS_TNODES_LEVEL0_BITS + 
                                 (level - 1) *
                                 YAFFS_TNODES_INTERNAL_BITS)
                              ) &
@@ -1447,7 +1447,7 @@ 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,
@@ -1484,7 +1484,7 @@ static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device * dev,
        if (requiredTallness > fStruct->topLevel) {
                /* Not tall enough,gotta make the tree taller */
                for (i = fStruct->topLevel; i < requiredTallness; i++) {
-
+               
                        tn = yaffs_GetTnode(dev);
 
                        if (tn) {
@@ -1503,7 +1503,7 @@ static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device * dev,
 
        l = fStruct->topLevel;
        tn = fStruct->top;
-
+       
        if(l > 0) {
                while (l > 0 && tn) {
                        x = (chunkId >>
@@ -1523,13 +1523,13 @@ static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device * dev,
                                        if(tn->internal[x])
                                                yaffs_FreeTnode(dev,tn->internal[x]);
                                        tn->internal[x] = passedTn;
-
+                       
                                } else if(!tn->internal[x]) {
                                        /* Don't have one, none passed in */
                                        tn->internal[x] = yaffs_GetTnode(dev);
                                }
                        }
-
+               
                        tn = tn->internal[x];
                        l--;
                }
@@ -1570,7 +1570,7 @@ 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.
  */
 
@@ -1684,7 +1684,7 @@ 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,
                                  __u32 level, int chunkOffset)
 {
@@ -1725,7 +1725,7 @@ static int yaffs_SoftDeleteWorker(yaffs_Object * in, yaffs_Tnode * tn,
                                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);
@@ -1827,7 +1827,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,14 +1881,14 @@ static int yaffs_CreateFreeObjects(yaffs_Device * dev, int nObjects)
                  (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]);
+        }
 
-       /* 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;
+        newObjects[nObjects - 1].siblings.next = (void *)dev->freeObjects;
        dev->freeObjects = newObjects;
        dev->nFreeObjects += nObjects;
        dev->nObjectsCreated += nObjects;
@@ -1922,22 +1922,22 @@ static yaffs_Object *yaffs_AllocateEmptyObject(yaffs_Device * dev)
                /* Now sweeten it up... */
 
                memset(tn, 0, sizeof(yaffs_Object));
-               tn->myDev = dev;
-               tn->chunkId = -1;
-               tn->variantType = YAFFS_OBJECT_TYPE_UNKNOWN;
-               YINIT_LIST_HEAD(&(tn->hardLinks));
-               YINIT_LIST_HEAD(&(tn->hashLink));
-               YINIT_LIST_HEAD(&tn->siblings);
-
-               /* Add it to the lost and found directory.
-                * NB Can't put root or lostNFound in lostNFound so
+                tn->myDev = dev;
+                tn->chunkId = -1;
+                tn->variantType = YAFFS_OBJECT_TYPE_UNKNOWN;
+                YINIT_LIST_HEAD(&(tn->hardLinks));
+                YINIT_LIST_HEAD(&(tn->hashLink));
+                YINIT_LIST_HEAD(&tn->siblings);
+
+                /* 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);
                }
        }
-
+       
        dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
 
        return tn;
@@ -1967,14 +1967,14 @@ static yaffs_Object *yaffs_CreateFakeDirectory(yaffs_Device * dev, int number,
 static void yaffs_UnhashObject(yaffs_Object * tn)
 {
        int bucket;
-       yaffs_Device *dev = tn->myDev;
+        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--;
-       }
+        /* 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--;
+        }
 
 }
 
@@ -1994,12 +1994,12 @@ static void yaffs_FreeObject(yaffs_Object * tn)
        }
 #endif
 
-       yaffs_UnhashObject(tn);
+        yaffs_UnhashObject(tn);
 
-       /* 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++;
 
        dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
 
@@ -2040,12 +2040,12 @@ static void yaffs_InitialiseObjects(yaffs_Device * dev)
 
        dev->allocatedObjectList = NULL;
        dev->freeObjects = NULL;
-       dev->nFreeObjects = 0;
+        dev->nFreeObjects = 0;
 
-       for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) {
-               YINIT_LIST_HEAD(&dev->objectBucket[i].list);
-               dev->objectBucket[i].count = 0;
-       }
+        for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) {
+                YINIT_LIST_HEAD(&dev->objectBucket[i].list);
+                dev->objectBucket[i].count = 0;
+        }
 
 }
 
@@ -2091,26 +2091,26 @@ static int yaffs_CreateNewObjectNumber(yaffs_Device * 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;
+                                }
                        }
                }
        }
@@ -2121,27 +2121,27 @@ static int yaffs_CreateNewObjectNumber(yaffs_Device * dev)
 
 static void yaffs_HashObject(yaffs_Object * in)
 {
-       int bucket = yaffs_HashFunction(in->objectId);
-       yaffs_Device *dev = in->myDev;
+        int bucket = yaffs_HashFunction(in->objectId);
+        yaffs_Device *dev = in->myDev;
 
-       ylist_add(&in->hashLink, &dev->objectBucket[bucket].list);
-       dev->objectBucket[bucket].count++;
+        ylist_add(&in->hashLink, &dev->objectBucket[bucket].list);
+        dev->objectBucket[bucket].count++;
 
 }
 
 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
@@ -2168,7 +2168,7 @@ yaffs_Object *yaffs_CreateNewObject(yaffs_Device * dev, int number,
        theObject = yaffs_AllocateEmptyObject(dev);
        if(!theObject)
                return NULL;
-
+               
        if(type == YAFFS_OBJECT_TYPE_FILE){
                tn = yaffs_GetTnode(dev);
                if(!tn){
@@ -2176,8 +2176,8 @@ yaffs_Object *yaffs_CreateNewObject(yaffs_Device * dev, int number,
                        return NULL;
                }
        }
-
-
+               
+       
 
        if (theObject) {
                theObject->fake = 0;
@@ -2204,13 +2204,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 */
@@ -2241,7 +2241,7 @@ static yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device * dev,
        return theObject;
 
 }
-
+                       
 
 static YCHAR *yaffs_CloneString(const YCHAR * str)
 {
@@ -2263,7 +2263,7 @@ 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,
@@ -2284,7 +2284,7 @@ static yaffs_Object *yaffs_MknodObject(yaffs_ObjectType type,
        }
 
        in = yaffs_CreateNewObject(dev, -1, type);
-
+       
        if(type == YAFFS_OBJECT_TYPE_SYMLINK){
                str = yaffs_CloneString(aliasString);
                if(!str){
@@ -2292,8 +2292,8 @@ static yaffs_Object *yaffs_MknodObject(yaffs_ObjectType type,
                        return NULL;
                }
        }
-
-
+       
+       
 
        if (in) {
                in->chunkId = -1;
@@ -2329,13 +2329,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 */
@@ -2418,7 +2418,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);
@@ -2431,9 +2431,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 ||
@@ -2490,14 +2490,14 @@ 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,
@@ -2515,10 +2515,10 @@ int yaffs_RenameObject(yaffs_Object * oldDir, const YCHAR * oldName,
 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 */
@@ -2529,9 +2529,9 @@ static int yaffs_InitialiseBlocks(yaffs_Device * dev)
        }
        else
                dev->blockInfoAlt = 0;
-
+               
        if(dev->blockInfo){
-
+       
                /* Set up dynamic blockinfo stuff. */
                dev->chunkBitmapStride = (dev->nChunksPerBlock + 7) / 8; /* round up bytes */
                dev->chunkBits = YMALLOC(dev->chunkBitmapStride * nBlocks);
@@ -2542,7 +2542,7 @@ static int yaffs_InitialiseBlocks(yaffs_Device * dev)
                else
                        dev->chunkBitsAlt = 0;
        }
-
+       
        if (dev->blockInfo && dev->chunkBits) {
                memset(dev->blockInfo, 0, nBlocks * sizeof(yaffs_BlockInfo));
                memset(dev->chunkBits, 0, dev->chunkBitmapStride * nBlocks);
@@ -2563,7 +2563,7 @@ static void yaffs_DeinitialiseBlocks(yaffs_Device * dev)
        dev->blockInfoAlt = 0;
 
        dev->blockInfo = NULL;
-
+       
        if(dev->chunkBitsAlt && dev->chunkBits)
                YFREE_ALT(dev->chunkBits);
        else if(dev->chunkBits)
@@ -2627,14 +2627,14 @@ static int yaffs_FindBlockForGarbageCollection(yaffs_Device * dev,
        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++){
 
                        bi = yaffs_GetBlockInfo(dev, i);
                        //yaffs_VerifyBlock(dev,bi,i);
-
+                       
                        if(bi->gcPrioritise) {
                                pendingPrioritisedExist = 1;
                                if(bi->blockState == YAFFS_BLOCK_STATE_FULL &&
@@ -2646,7 +2646,7 @@ static int yaffs_FindBlockForGarbageCollection(yaffs_Device * dev,
                                }
                        }
                }
-
+               
                if(!pendingPrioritisedExist) /* None found, so we can clear this */
                        dev->hasPendingPrioritisedGCs = 0;
        }
@@ -2698,7 +2698,7 @@ static int yaffs_FindBlockForGarbageCollection(yaffs_Device * dev,
                        dirtiest = b;
                        pagesInUse = 0;
                }
-               else
+               else 
 #endif
 
                if (bi->blockState == YAFFS_BLOCK_STATE_FULL &&
@@ -2735,11 +2735,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) {
@@ -2752,7 +2752,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++) {
@@ -2803,7 +2803,7 @@ static int yaffs_FindBlockForAllocation(yaffs_Device * dev)
 
                return -1;
        }
-
+       
        /* Find an empty block. */
 
        for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
@@ -2851,7 +2851,7 @@ static int yaffs_CalcCheckpointBlocksRequired(yaffs_Device *dev)
 
                if(tnodeSize < sizeof(yaffs_Tnode))
                        tnodeSize = sizeof(yaffs_Tnode);
-
+               
                nBytes += sizeof(yaffs_CheckpointValidity);
                nBytes += sizeof(yaffs_CheckpointDevice);
                nBytes += devBlocks * sizeof(yaffs_BlockInfo);
@@ -2860,11 +2860,11 @@ 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;
        }
 
@@ -2878,13 +2878,13 @@ static int yaffs_CheckSpaceForAllocation(yaffs_Device * dev)
        int reservedChunks;
        int reservedBlocks = dev->nReservedBlocks;
        int checkpointBlocks;
-
+       
        checkpointBlocks =  yaffs_CalcCheckpointBlocksRequired(dev) - dev->blocksInCheckpoint;
        if(checkpointBlocks < 0)
                checkpointBlocks = 0;
-
+       
        reservedChunks = ((reservedBlocks + checkpointBlocks) * dev->nChunksPerBlock);
-
+       
        return (dev->nFreeChunks > reservedChunks);
 }
 
@@ -2931,10 +2931,10 @@ static int yaffs_AllocateChunk(yaffs_Device * dev, int useReserve, yaffs_BlockIn
 
                if(blockUsedPtr)
                        *blockUsedPtr = bi;
-
+                       
                return retVal;
        }
-
+       
        T(YAFFS_TRACE_ERROR,
          (TSTR("!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!" TENDSTR)));
 
@@ -2977,7 +2977,7 @@ static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block)
        yaffs_Object *object;
 
        isCheckpointBlock = (bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT);
-
+       
        bi->blockState = YAFFS_BLOCK_STATE_COLLECTING;
 
        T(YAFFS_TRACE_TRACING,
@@ -3005,7 +3005,7 @@ static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block)
        } else {
 
                __u8 *buffer = yaffs_GetTempBuffer(dev, __LINE__);
-
+               
                yaffs_VerifyBlock(dev,bi,block);
 
                for (chunkInBlock = 0, oldChunk = block * dev->nChunksPerBlock;
@@ -3032,7 +3032,7 @@ static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block)
                                   ("Collecting page %d, %d %d %d " TENDSTR),
                                   chunkInBlock, tags.objectId, tags.chunkId,
                                   tags.byteCount));
-
+                                  
                                if(object && !yaffs_SkipVerification(dev)){
                                        if(tags.chunkId == 0)
                                                matchingChunk = object->chunkId;
@@ -3040,12 +3040,12 @@ static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block)
                                                matchingChunk = oldChunk; /* Defeat the test */
                                        else
                                                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));
-
+                                               
                                }
 
                                if (!object) {
@@ -3060,7 +3060,7 @@ static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block)
                                    && tags.chunkId != 0) {
                                        /* Data chunk in a 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.
                                         */
 
@@ -3110,7 +3110,7 @@ static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block)
                                                oh->shadowsObject = oh->inbandShadowsObject = -1;
                                                tags.extraShadows = 0;
                                                tags.extraIsShrinkHeader = 0;
-
+                                               
                                                yaffs_VerifyObjectHeader(object,oh,&tags,1);
                                        }
 
@@ -3169,7 +3169,7 @@ static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block)
        }
 
        yaffs_VerifyCollectedBlock(dev,bi,block);
-
+         
        if (chunksBefore >= (chunksAfter = yaffs_GetErasedChunks(dev))) {
                T(YAFFS_TRACE_GC,
                  (TSTR
@@ -3197,21 +3197,21 @@ static int yaffs_CheckGarbageCollection(yaffs_Device * dev)
        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)
                        checkpointBlockAdjust = 0;
@@ -3396,11 +3396,11 @@ static int yaffs_CheckFileSanity(yaffs_Object * in)
 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;
@@ -3424,7 +3424,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);
@@ -3436,7 +3436,7 @@ static int yaffs_PutChunkIntoFile(yaffs_Object * in, int 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.
                 *
@@ -3477,7 +3477,7 @@ 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
                         */
 
@@ -3488,7 +3488,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
                                 */
@@ -3529,7 +3529,7 @@ static int yaffs_ReadChunkDataFromObject(yaffs_Object * in, int chunkInInode,
                  (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;
        }
 
@@ -3544,7 +3544,7 @@ void yaffs_DeleteChunk(yaffs_Device * dev, int chunkId, int markNAND, int lyn)
 
        if (chunkId <= 0)
                return;
-
+               
 
        dev->nDeletions++;
        block = chunkId / dev->nChunksPerBlock;
@@ -3671,11 +3671,11 @@ 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_ObjectHeader *oh = NULL;
+        
+        yaffs_strcpy(oldName,_Y("silly old name"));
 
-       yaffs_strcpy(oldName,"silly old name");
-
-       if (!in->fake || force) {
+        if (!in->fake || force) {
 
                yaffs_CheckGarbageCollection(dev);
                yaffs_CheckObjectDetailsLoaded(in);
@@ -3688,9 +3688,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);
-
+                                                                               
                        memcpy(oldName, oh->name, sizeof(oh->name));
                }
 
@@ -3818,11 +3818,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
@@ -3835,14 +3835,14 @@ static int yaffs_ObjectHasCachedWriteData(yaffs_Object *obj)
        int i;
        yaffs_ChunkCache *cache;
        int nCaches = obj->myDev->nShortOpCaches;
-
+       
        for(i = 0; i < nCaches; i++){
                cache = &dev->srCache[i];
                if (cache->object == obj &&
                    cache->dirty)
                        return 1;
        }
-
+       
        return 0;
 }
 
@@ -3908,7 +3908,7 @@ 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.
         */
@@ -3918,18 +3918,18 @@ void yaffs_FlushEntireDeviceCache(yaffs_Device *dev)
                        if (dev->srCache[i].object &&
                            dev->srCache[i].dirty)
                                obj = dev->srCache[i].object;
-
+                           
                }
                if(obj)
                        yaffs_FlushFilesChunkCache(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.
  */
@@ -3941,7 +3941,7 @@ static yaffs_ChunkCache *yaffs_GrabChunkCacheWorker(yaffs_Device * dev)
 
        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];
                }
 
@@ -4102,14 +4102,14 @@ static void yaffs_InvalidateWholeChunkCache(yaffs_Object * in)
 static int yaffs_WriteCheckpointValidityMarker(yaffs_Device *dev,int head)
 {
        yaffs_CheckpointValidity cp;
-
+       
        memset(&cp,0,sizeof(cp));
-
+       
        cp.structType = sizeof(cp);
        cp.magic = YAFFS_MAGIC;
        cp.version = YAFFS_CHECKPOINT_VERSION;
        cp.head = (head) ? 1 : 0;
-
+       
        return (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp))?
                1 : 0;
 }
@@ -4118,9 +4118,9 @@ 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 = (cp.structType == sizeof(cp)) &&
                     (cp.magic == YAFFS_MAGIC) &&
@@ -4129,20 +4129,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,
@@ -4152,7 +4152,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;
@@ -4168,20 +4168,20 @@ static int yaffs_WriteCheckpointDevice(yaffs_Device *dev)
        __u32 nBlocks = (dev->internalEndBlock - dev->internalStartBlock + 1);
 
        int ok;
-
+               
        /* Write device runtime values*/
        yaffs_DeviceToCheckpointDevice(&cp,dev);
        cp.structType = sizeof(cp);
-
+       
        ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp));
-
+       
        /* Write block info */
        if(ok) {
                nBytes = nBlocks * sizeof(yaffs_BlockInfo);
                ok = (yaffs_CheckpointWrite(dev,dev->blockInfo,nBytes) == nBytes);
        }
-
-       /* Write chunk bits */
+               
+       /* Write chunk bits */          
        if(ok) {
                nBytes = nBlocks * dev->chunkBitmapStride;
                ok = (yaffs_CheckpointWrite(dev,dev->chunkBits,nBytes) == nBytes);
@@ -4196,28 +4196,28 @@ static int yaffs_ReadCheckpointDevice(yaffs_Device *dev)
        __u32 nBytes;
        __u32 nBlocks = (dev->internalEndBlock - dev->internalStartBlock + 1);
 
-       int ok;
-
+       int ok; 
+       
        ok = (yaffs_CheckpointRead(dev,&cp,sizeof(cp)) == sizeof(cp));
        if(!ok)
                return 0;
-
+               
        if(cp.structType != sizeof(cp))
                return 0;
-
-
+               
+       
        yaffs_CheckpointDeviceToDevice(dev,&cp);
-
+       
        nBytes = nBlocks * sizeof(yaffs_BlockInfo);
-
+       
        ok = (yaffs_CheckpointRead(dev,dev->blockInfo,nBytes) == nBytes);
-
+       
        if(!ok)
                return 0;
        nBytes = nBlocks * dev->chunkBitmapStride;
-
+       
        ok = (yaffs_CheckpointRead(dev,dev->chunkBits,nBytes) == nBytes);
-
+       
        return ok ? 1 : 0;
 }
 
@@ -4228,7 +4228,7 @@ static void yaffs_ObjectToCheckpointObject(yaffs_CheckpointObject *cp,
        cp->objectId = obj->objectId;
        cp->parentId = (obj->parent) ? obj->parent->objectId : 0;
        cp->chunkId = obj->chunkId;
-       cp->variantType = obj->variantType;
+       cp->variantType = obj->variantType;                     
        cp->deleted = obj->deleted;
        cp->softDeleted = obj->softDeleted;
        cp->unlinked = obj->unlinked;
@@ -4237,7 +4237,7 @@ 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)
                cp->fileSizeOrEquivalentObjectId = obj->variant.fileVariant.fileSize;
        else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
@@ -4248,9 +4248,9 @@ static void yaffs_CheckpointObjectToObject( yaffs_Object *obj,yaffs_CheckpointOb
 {
 
        yaffs_Object *parent;
-
+       
        obj->objectId = cp->objectId;
-
+       
        if(cp->parentId)
                parent = yaffs_FindOrCreateObjectByNumber(
                                        obj->myDev,
@@ -4258,12 +4258,12 @@ static void yaffs_CheckpointObjectToObject( yaffs_Object *obj,yaffs_CheckpointOb
                                        YAFFS_OBJECT_TYPE_DIRECTORY);
        else
                parent = NULL;
-
+               
        if(parent)
                yaffs_AddObjectToDirectory(parent, obj);
-
+               
        obj->chunkId = cp->chunkId;
-       obj->variantType = cp->variantType;
+       obj->variantType = cp->variantType;                     
        obj->deleted = cp->deleted;
        obj->softDeleted = cp->softDeleted;
        obj->unlinked = cp->unlinked;
@@ -4272,12 +4272,12 @@ static void yaffs_CheckpointObjectToObject( yaffs_Object *obj,yaffs_CheckpointOb
        obj->unlinkAllowed = cp->unlinkAllowed;
        obj->serial = cp->serial;
        obj->nDataChunks = cp->nDataChunks;
-
+       
        if(obj->variantType == YAFFS_OBJECT_TYPE_FILE)
                obj->variant.fileVariant.fileSize = cp->fileSizeOrEquivalentObjectId;
        else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
                obj->variant.hardLinkVariant.equivalentObjectId = cp->fileSizeOrEquivalentObjectId;
-
+               
        if(obj->objectId >= YAFFS_NOBJECT_BUCKETS)
                obj->lazyLoaded = 1;
 }
@@ -4294,7 +4294,7 @@ static int yaffs_CheckpointTnodeWorker(yaffs_Object * in, yaffs_Tnode * tn,
 
        if(tnodeSize < sizeof(yaffs_Tnode))
                tnodeSize = sizeof(yaffs_Tnode);
-
+       
 
        if (tn) {
                if (level > 0) {
@@ -4324,17 +4324,17 @@ static int yaffs_WriteCheckpointTnodes(yaffs_Object *obj)
 {
        __u32 endMarker = ~0;
        int ok = 1;
-
+       
        if(obj->variantType == YAFFS_OBJECT_TYPE_FILE){
                ok = yaffs_CheckpointTnodeWorker(obj,
                                            obj->variant.fileVariant.top,
                                            obj->variant.fileVariant.topLevel,
                                            0);
                if(ok)
-                       ok = (yaffs_CheckpointWrite(obj->myDev,&endMarker,sizeof(endMarker)) ==
+                       ok = (yaffs_CheckpointWrite(obj->myDev,&endMarker,sizeof(endMarker)) == 
                                sizeof(endMarker));
        }
-
+       
        return ok ? 1 : 0;
 }
 
@@ -4352,67 +4352,67 @@ static int yaffs_ReadCheckpointTnodes(yaffs_Object *obj)
                tnodeSize = sizeof(yaffs_Tnode);
 
        ok = (yaffs_CheckpointRead(dev,&baseChunk,sizeof(baseChunk)) == sizeof(baseChunk));
-
+       
        while(ok && (~baseChunk)){
                nread++;
                /* Read level 0 tnode */
-
-
+               
+               
                /* printf("read  tnode at %d\n",baseChunk); */
                tn = yaffs_GetTnodeRaw(dev);
                if(tn)
                        ok = (yaffs_CheckpointRead(dev,tn,tnodeSize) == tnodeSize);
                else
                        ok = 0;
-
+                       
                if(tn && ok){
                        ok = yaffs_AddOrFindLevel0Tnode(dev,
                                                        fileStructPtr,
                                                        baseChunk,
                                                        tn) ? 1 : 0;
-
+                                                       
                }
-
+                       
                if(ok)
                        ok = (yaffs_CheckpointRead(dev,&baseChunk,sizeof(baseChunk)) == sizeof(baseChunk));
-
+               
        }
 
        T(YAFFS_TRACE_CHECKPOINT,(
                TSTR("Checkpoint read tnodes %d records, last %d. ok %d" TENDSTR),
                nread,baseChunk,ok));
 
-       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);
+         */
+         
+         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.chunkId,(unsigned) obj));
-
+                                               
                                        ok = (yaffs_CheckpointWrite(dev,&cp,sizeof(cp)) == sizeof(cp));
-
+                                       
                                        if(ok && obj->variantType == YAFFS_OBJECT_TYPE_FILE){
                                                ok = yaffs_WriteCheckpointTnodes(obj);
                                        }
@@ -4420,14 +4420,14 @@ static int yaffs_WriteCheckpointObjects(yaffs_Device *dev)
                        }
                }
         }
-
+        
         /* 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));
-
+               
        return ok ? 1 : 0;
 }
 
@@ -4438,7 +4438,7 @@ 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)) {
@@ -4446,10 +4446,10 @@ static int yaffs_ReadCheckpointObjects(yaffs_Device *dev)
                                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.chunkId));
-
+                       
                if(ok && cp.objectId == ~0)
                        done = 1;
                else if(ok){
@@ -4457,21 +4457,21 @@ static int yaffs_ReadCheckpointObjects(yaffs_Device *dev)
                        if(obj) {
                                yaffs_CheckpointObjectToObject(obj,&cp);
                                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;
-                               }
-
+                                        ok = yaffs_ReadCheckpointTnodes(obj);
+                                } else if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
+                                        obj->hardLinks.next =
+                                                    (struct ylist_head *)
+                                                    hardList;
+                                        hardList = obj;
+                                }
+                          
                        }
                }
        }
-
+       
        if(ok)
                yaffs_HardlinkFixup(dev,hardList);
-
+       
        return ok ? 1 : 0;
 }
 
@@ -4479,14 +4479,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)
                return 0;
-
+       
        return 1;
 }
 
@@ -4495,17 +4495,17 @@ 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)
                return 0;
-
+               
        if(checkpointSum0 != checkpointSum1)
                return 0;
-
+       
        return 1;
 }
 
@@ -4514,15 +4514,15 @@ static int yaffs_WriteCheckpointData(yaffs_Device *dev)
 {
 
        int ok = 1;
-
+       
        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);
@@ -4539,18 +4539,18 @@ static int yaffs_WriteCheckpointData(yaffs_Device *dev)
                T(YAFFS_TRACE_CHECKPOINT,(TSTR("write checkpoint validity" TENDSTR)));
                ok = yaffs_WriteCheckpointValidityMarker(dev,0);
        }
-
+       
        if(ok){
                ok = yaffs_WriteCheckpointSum(dev);
        }
-
-
+       
+       
        if(!yaffs_CheckpointClose(dev))
                 ok = 0;
-
+                
        if(ok)
                dev->isCheckpointed = 1;
-        else
+        else 
                dev->isCheckpointed = 0;
 
        return dev->isCheckpointed;
@@ -4559,17 +4559,17 @@ 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)));
                ok = 0;
        }
-
+       
        if(ok)
                ok = yaffs_CheckpointOpen(dev,0); /* open for read */
-
+       
        if(ok){
-               T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint validity" TENDSTR)));
+               T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint validity" TENDSTR)));   
                ok = yaffs_ReadCheckpointValidityMarker(dev,1);
        }
        if(ok){
@@ -4577,14 +4577,14 @@ static int yaffs_ReadCheckpointData(yaffs_Device *dev)
                ok = yaffs_ReadCheckpointDevice(dev);
        }
        if(ok){
-               T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint objects" TENDSTR)));
+               T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint objects" TENDSTR)));    
                ok = yaffs_ReadCheckpointObjects(dev);
        }
        if(ok){
                T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint validity" TENDSTR)));
                ok = yaffs_ReadCheckpointValidityMarker(dev,0);
        }
-
+       
        if(ok){
                ok = yaffs_ReadCheckpointSum(dev);
                T(YAFFS_TRACE_CHECKPOINT,(TSTR("read checkpoint checksum %d" TENDSTR),ok));
@@ -4595,7 +4595,7 @@ static int yaffs_ReadCheckpointData(yaffs_Device *dev)
 
        if(ok)
                dev->isCheckpointed = 1;
-        else
+        else 
                dev->isCheckpointed = 0;
 
        return ok ? 1 : 0;
@@ -4604,7 +4604,7 @@ static int yaffs_ReadCheckpointData(yaffs_Device *dev)
 
 static void yaffs_InvalidateCheckpoint(yaffs_Device *dev)
 {
-       if(dev->isCheckpointed ||
+       if(dev->isCheckpointed || 
           dev->blocksInCheckpoint > 0){
                dev->isCheckpointed = 0;
                yaffs_CheckpointInvalidateStream(dev);
@@ -4627,7 +4627,7 @@ int yaffs_CheckpointSave(yaffs_Device *dev)
                yaffs_InvalidateCheckpoint(dev);
                yaffs_WriteCheckpointData(dev);
        }
-
+       
        T(YAFFS_TRACE_ALWAYS,(TSTR("save exit: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
 
        return dev->isCheckpointed;
@@ -4637,7 +4637,7 @@ int yaffs_CheckpointRestore(yaffs_Device *dev)
 {
        int retval;
        T(YAFFS_TRACE_CHECKPOINT,(TSTR("restore entry: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-
+               
        retval = yaffs_ReadCheckpointData(dev);
 
        if(dev->isCheckpointed){
@@ -4647,7 +4647,7 @@ int yaffs_CheckpointRestore(yaffs_Device *dev)
        }
 
        T(YAFFS_TRACE_CHECKPOINT,(TSTR("restore exit: isCheckpointed %d"TENDSTR),dev->isCheckpointed));
-
+       
        return retval;
 }
 
@@ -4683,7 +4683,7 @@ int yaffs_ReadDataFromFile(yaffs_Object * in, __u8 * buffer, loff_t offset,
                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;
@@ -4788,12 +4788,12 @@ int yaffs_WriteDataToFile(yaffs_Object * in, const __u8 * buffer, loff_t offset,
        int chunk;
        __u32 start;
        int nToCopy;
-       int n = nBytes;
-       int nDone = 0;
-       int nToWriteBack;
-       int startOfWrite = offset;
-       int chunkWritten = 0;
-       int nBytesRead;
+        int n = nBytes;
+        int nDone = 0;
+        int nToWriteBack;
+        int startOfWrite = offset;
+        int chunkWritten = 0;
+        int nBytesRead;
 
        yaffs_Device *dev;
 
@@ -4842,7 +4842,7 @@ int yaffs_WriteDataToFile(yaffs_Object * in, const __u8 * buffer, loff_t offset,
                                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)) {
@@ -4855,12 +4855,12 @@ int yaffs_WriteDataToFile(yaffs_Object * in, const __u8 * buffer, loff_t offset,
                                                                      cache->
                                                                      data);
                                }
-                               else if(cache &&
+                               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;
                                }
 
@@ -5025,7 +5025,7 @@ 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);
@@ -5033,23 +5033,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 */
@@ -5073,8 +5073,8 @@ 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.
@@ -5223,10 +5223,10 @@ int yaffs_DeleteFile(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;
 
@@ -5241,11 +5241,11 @@ static int yaffs_DeleteSymLink(yaffs_Object * in)
 
 static int yaffs_DeleteHardLink(yaffs_Object * in)
 {
-       /* remove this hardlink from the list assocaited with the equivalent
-        * object
-        */
-       ylist_del(&in->hardLinks);
-       return yaffs_DoGenericObjectDeletion(in);
+        /* remove this hardlink from the list assocaited with the equivalent
+         * object
+         */
+        ylist_del(&in->hardLinks);
+        return yaffs_DoGenericObjectDeletion(in);
 }
 
 static void yaffs_DestroyObject(yaffs_Object * obj)
@@ -5274,12 +5274,12 @@ static void yaffs_DestroyObject(yaffs_Object * obj)
 static int yaffs_UnlinkWorker(yaffs_Object * obj)
 {
 
-       if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
-               return yaffs_DeleteHardLink(obj);
-       } else if (!ylist_empty(&obj->hardLinks)) {
-               /* Curve ball: We're unlinking an object that has a hardlink.
-                *
-                * This problem arises because we are not strictly following
+        if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
+                return yaffs_DeleteHardLink(obj);
+        } else if (!ylist_empty(&obj->hardLinks)) {
+                /* Curve ball: We're unlinking an object that has a hardlink.
+                 *
+                 * This problem arises because we are not strictly following
                 * The Linux link/inode model.
                 *
                 * We can't really delete the object.
@@ -5292,15 +5292,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);
 
@@ -5393,7 +5393,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);
@@ -5402,18 +5402,18 @@ 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);
 
-               }
+                }
 
        }
 
@@ -5435,6 +5435,13 @@ static int ybicmp(const void *a, const void *b){
 
 }
 
+
+struct yaffs_ShadowFixerStruct {
+       int objectId;
+       int shadowedId;
+       struct yaffs_ShadowFixerStruct *next;
+};
+
 static int yaffs_Scan(yaffs_Device * dev)
 {
        yaffs_ExtendedTags tags;
@@ -5442,7 +5449,6 @@ static int yaffs_Scan(yaffs_Device * dev)
        int blockIterator;
        int startIterator;
        int endIterator;
-       int nBlocksToScan = 0;
        int result;
 
        int chunk;
@@ -5455,23 +5461,17 @@ static int yaffs_Scan(yaffs_Device * dev)
        yaffs_ObjectHeader *oh;
        yaffs_Object *in;
        yaffs_Object *parent;
-       int nBlocks = dev->internalEndBlock - dev->internalStartBlock + 1;
-
+       
        int alloc_failed = 0;
-
+       
+       struct yaffs_ShadowFixerStruct *shadowFixerList = NULL;
+       
 
        __u8 *chunkData;
 
-       yaffs_BlockIndex *blockIndex = NULL;
-
-       if (dev->isYaffs2) {
-               T(YAFFS_TRACE_SCAN,
-                 (TSTR("yaffs_Scan is not for YAFFS2!" TENDSTR)));
-               return YAFFS_FAIL;
-       }
-
+       
        //TODO  Throw all the yaffs2 stuuf out of yaffs_Scan since it is only for yaffs1 format.
-
+       
        T(YAFFS_TRACE_SCAN,
          (TSTR("yaffs_Scan starts  intstartblk %d intendblk %d..." TENDSTR),
           dev->internalStartBlock, dev->internalEndBlock));
@@ -5480,12 +5480,6 @@ static int yaffs_Scan(yaffs_Device * dev)
 
        dev->sequenceNumber = YAFFS_LOWEST_SEQUENCE_NUMBER;
 
-       if (dev->isYaffs2) {
-               blockIndex = YMALLOC(nBlocks * sizeof(yaffs_BlockIndex));
-               if(!blockIndex)
-                       return YAFFS_FAIL;
-       }
-
        /* Scan all the blocks to determine their state */
        for (blk = dev->internalStartBlock; blk <= dev->internalEndBlock; blk++) {
                bi = yaffs_GetBlockInfo(dev, blk);
@@ -5510,72 +5504,21 @@ static int yaffs_Scan(yaffs_Device * dev)
                          (TSTR("Block empty " TENDSTR)));
                        dev->nErasedBlocks++;
                        dev->nFreeChunks += dev->nChunksPerBlock;
-               } else if (state == YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
-
-                       /* Determine the highest sequence number */
-                       if (dev->isYaffs2 &&
-                           sequenceNumber >= YAFFS_LOWEST_SEQUENCE_NUMBER &&
-                           sequenceNumber < YAFFS_HIGHEST_SEQUENCE_NUMBER) {
-
-                               blockIndex[nBlocksToScan].seq = sequenceNumber;
-                               blockIndex[nBlocksToScan].block = blk;
-
-                               nBlocksToScan++;
-
-                               if (sequenceNumber >= dev->sequenceNumber) {
-                                       dev->sequenceNumber = sequenceNumber;
-                               }
-                       } else if (dev->isYaffs2) {
-                               /* TODO: Nasty sequence number! */
-                               T(YAFFS_TRACE_SCAN,
-                                 (TSTR
-                                  ("Block scanning block %d has bad sequence number %d"
-                                   TENDSTR), blk, sequenceNumber));
-
-                       }
-               }
-       }
-
-       /* Sort the blocks
-        * Dungy old bubble sort for now...
-        */
-       if (dev->isYaffs2) {
-               yaffs_BlockIndex temp;
-               int i;
-               int j;
-
-               for (i = 0; i < nBlocksToScan; i++)
-                       for (j = i + 1; j < nBlocksToScan; j++)
-                               if (blockIndex[i].seq > blockIndex[j].seq) {
-                                       temp = blockIndex[j];
-                                       blockIndex[j] = blockIndex[i];
-                                       blockIndex[i] = temp;
-                               }
+               } 
        }
 
-       /* Now scan the blocks looking at the data. */
-       if (dev->isYaffs2) {
-               startIterator = 0;
-               endIterator = nBlocksToScan - 1;
-               T(YAFFS_TRACE_SCAN_DEBUG,
-                 (TSTR("%d blocks to be scanned" TENDSTR), nBlocksToScan));
-       } else {
-               startIterator = dev->internalStartBlock;
-               endIterator = dev->internalEndBlock;
-       }
+       startIterator = dev->internalStartBlock;
+       endIterator = dev->internalEndBlock;
 
        /* For each block.... */
        for (blockIterator = startIterator; !alloc_failed && blockIterator <= endIterator;
             blockIterator++) {
+               
+               YYIELD();
 
                YYIELD();
                
-               if (dev->isYaffs2) {
-                       /* get the block to scan in the correct order */
-                       blk = blockIndex[blockIterator].block;
-               } else {
-                       blk = blockIterator;
-               }
+               blk = blockIterator;
 
                bi = yaffs_GetBlockInfo(dev, blk);
                state = bi->blockState;
@@ -5602,7 +5545,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
                                 */
 
@@ -5619,9 +5562,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. */
-
+                                       
                                        /* Yaffs2 sanity check:
                                         * This should be the one with the highest sequence number
                                         */
@@ -5650,7 +5593,7 @@ static int yaffs_Scan(yaffs_Device * dev)
                                /* PutChunkIntoFile checks for a clash (two data chunks with
                                 * the same chunkId).
                                 */
-
+                                
                                if(!in)
                                        alloc_failed = 1;
 
@@ -5658,11 +5601,11 @@ static int yaffs_Scan(yaffs_Device * dev)
                                        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) {
@@ -5694,7 +5637,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.
                                         */
 
@@ -5710,12 +5653,18 @@ static int yaffs_Scan(yaffs_Device * dev)
 
                                if(!in)
                                        alloc_failed = 1;
-
+                                       
                                if (in && oh->shadowsObject > 0) {
-                                       yaffs_HandleShadowedObject(dev,
-                                                                  oh->
-                                                                  shadowsObject,
-                                                                  0);
+                               
+                                       struct yaffs_ShadowFixerStruct *fixer;
+                                       fixer = YMALLOC(sizeof(struct yaffs_ShadowFixerStruct));
+                                       if(fixer){
+                                               fixer-> next = shadowFixerList;
+                                               shadowFixerList = fixer;
+                                               fixer->objectId = tags.objectId;
+                                               fixer->shadowedId = oh->shadowsObject;
+                                       }
+                                       
                                }
 
                                if (in && in->valid) {
@@ -5801,13 +5750,13 @@ static int yaffs_Scan(yaffs_Device * dev)
                                             YAFFS_OBJECT_TYPE_DIRECTORY);
                                        if (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->variantType !=
+                                                /* Set up as a directory */
+                                                parent->variantType =
+                                                    YAFFS_OBJECT_TYPE_DIRECTORY;
+                                                YINIT_LIST_HEAD(&parent->variant.
+                                                               directoryVariant.
+                                                               children);
+                                        } else if (parent->variantType !=
                                                   YAFFS_OBJECT_TYPE_DIRECTORY)
                                        {
                                                /* Hoosterman, another problem....
@@ -5832,11 +5781,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:
@@ -5858,20 +5807,20 @@ 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)
@@ -5903,35 +5852,55 @@ static int yaffs_Scan(yaffs_Device * dev)
 
        }
 
-       if (blockIndex) {
-               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);
-
+       
        /* Handle the unlinked files. Since they were left in an unlinked state we should
-        * just delete them.
-        */
+         * just delete them.
+         */
+        {
+                struct ylist_head *i;
+                struct ylist_head *n;
+
+                yaffs_Object *l;
+                /* Soft delete all the unlinked files */
+                ylist_for_each_safe(i, n,
+                                   &dev->unlinkedDir->variant.directoryVariant.
+                                   children) {
+                        if (i) {
+                                l = ylist_entry(i, yaffs_Object, siblings);
+                                yaffs_DestroyObject(l);
+                        }
+                }
+       }
+
+       /* Fix up any shadowed objects */
        {
-               struct ylist_head *i;
-               struct ylist_head *n;
-
-               yaffs_Object *l;
-               /* Soft delete all the unlinked files */
-               ylist_for_each_safe(i, n,
-                                  &dev->unlinkedDir->variant.directoryVariant.
-                                  children) {
-                       if (i) {
-                               l = ylist_entry(i, yaffs_Object, siblings);
-                               yaffs_DestroyObject(l);
+               struct yaffs_ShadowFixerStruct *fixer;
+               yaffs_Object *obj;
+               
+               while(shadowFixerList){
+                       fixer = shadowFixerList;
+                       shadowFixerList = fixer->next;
+                       /* Complete the rename transaction by deleting the shadowed object
+                        * then setting the object header to unshadowed.
+                        */
+                       obj = yaffs_FindObjectByNumber(dev,fixer->shadowedId);
+                       if(obj)
+                               yaffs_DestroyObject(obj);
+       
+                       obj = yaffs_FindObjectByNumber(dev,fixer->objectId);
+                       if(obj){
+                               yaffs_UpdateObjectHeader(obj,NULL,1,0,0);
                        }
+                       
+                       YFREE(fixer);
                }
        }
 
@@ -5940,9 +5909,9 @@ static int yaffs_Scan(yaffs_Device * dev)
        if(alloc_failed){
                return YAFFS_FAIL;
        }
-
+       
        T(YAFFS_TRACE_SCAN, (TSTR("yaffs_Scan ends" TENDSTR)));
-
+       
 
        return YAFFS_OK;
 }
@@ -5958,7 +5927,7 @@ static void yaffs_CheckObjectDetailsLoaded(yaffs_Object *in)
 
        if(!in)
                return;
-
+               
 #if 0
        T(YAFFS_TRACE_SCAN,(TSTR("details for object %d %s loaded" TENDSTR),
                in->objectId,
@@ -5970,7 +5939,7 @@ static void yaffs_CheckObjectDetailsLoaded(yaffs_Object *in)
                chunkData = yaffs_GetTempBuffer(dev, __LINE__);
 
                result = yaffs_ReadChunkWithTagsFromNAND(dev,in->chunkId,chunkData,&tags);
-               oh = (yaffs_ObjectHeader *) chunkData;
+               oh = (yaffs_ObjectHeader *) chunkData;          
 
                in->yst_mode = oh->yst_mode;
 #ifdef CONFIG_YAFFS_WINCE
@@ -5987,17 +5956,17 @@ 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){
                         in->variant.symLinkVariant.alias =
                                                    yaffs_CloneString(oh->alias);
                        if(!in->variant.symLinkVariant.alias)
                                alloc_failed = 1; /* Not returned to caller */
                }
-
+                                                   
                yaffs_ReleaseTempBuffer(dev,chunkData, __LINE__);
        }
 }
@@ -6025,13 +5994,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;
@@ -6051,20 +6020,20 @@ static int yaffs_ScanBackwards(yaffs_Device * dev)
        dev->sequenceNumber = YAFFS_LOWEST_SEQUENCE_NUMBER;
 
        blockIndex = YMALLOC(nBlocks * sizeof(yaffs_BlockIndex));
-
+       
        if(!blockIndex) {
                blockIndex = YMALLOC_ALT(nBlocks * sizeof(yaffs_BlockIndex));
                altBlockIndex = 1;
        }
-
+       
        if(!blockIndex) {
                T(YAFFS_TRACE_SCAN,
                  (TSTR("yaffs_Scan() could not allocate block index!" TENDSTR)));
                return YAFFS_FAIL;
        }
-
+       
        dev->blocksInCheckpoint = 0;
-
+       
        chunkData = yaffs_GetTempBuffer(dev, __LINE__);
 
        /* Scan all the blocks to determine their state */
@@ -6081,15 +6050,15 @@ static int yaffs_ScanBackwards(yaffs_Device * dev)
 
                if(bi->sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA)
                        bi->blockState = state = YAFFS_BLOCK_STATE_CHECKPOINT;
-
+                       
                T(YAFFS_TRACE_SCAN_DEBUG,
                  (TSTR("Block scanning block %d state %d seq %d" TENDSTR), blk,
                   state, sequenceNumber));
 
-
+               
                if(state == YAFFS_BLOCK_STATE_CHECKPOINT){
                        dev->blocksInCheckpoint++;
-
+                       
                } else if (state == YAFFS_BLOCK_STATE_DEAD) {
                        T(YAFFS_TRACE_BAD_BLOCKS,
                          (TSTR("block %d is bad" TENDSTR), blk));
@@ -6140,7 +6109,7 @@ static int yaffs_ScanBackwards(yaffs_Device * dev)
 #else
        {
                /* Dungy old bubble sort... */
-
+               
                yaffs_BlockIndex temp;
                int i;
                int j;
@@ -6176,22 +6145,22 @@ static int yaffs_ScanBackwards(yaffs_Device * dev)
                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,
@@ -6205,14 +6174,14 @@ 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)
                                {
                                        /* 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;
@@ -6222,7 +6191,7 @@ static int yaffs_ScanBackwards(yaffs_Device * dev)
                                            state == YAFFS_BLOCK_STATE_ALLOCATING) {
                                                if(dev->sequenceNumber == bi->sequenceNumber) {
                                                        /* this is the block being allocated from */
-
+                                               
                                                        T(YAFFS_TRACE_SCAN,
                                                          (TSTR
                                                           (" Allocating from %d %d"
@@ -6231,34 +6200,34 @@ static int yaffs_ScanBackwards(yaffs_Device * dev)
                                                        state = YAFFS_BLOCK_STATE_ALLOCATING;
                                                        dev->allocationBlock = blk;
                                                        dev->allocationPage = c;
-                                                       dev->allocationBlockFinder = blk;
+                                                       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;
                                                         bi->gcPrioritise = 1;
-
+                                                                                                        
                                                         T(YAFFS_TRACE_ALWAYS,
                                                         (TSTR("Partially written block %d being set for retirement" TENDSTR),
                                                         blk));
                                                }
 
                                        }
-
+                                        
                                }
 
                                dev->nFreeChunks++;
-
+                               
                        } else if (tags.chunkId > 0) {
                                /* chunkId > 0 so it is a data chunk... */
                                unsigned int endpos;
                                __u32 chunkBase =
                                    (tags.chunkId - 1) * dev->nDataBytesPerChunk;
-
+                                                               
                                foundChunksInBlock = 1;
 
 
@@ -6273,7 +6242,7 @@ static int yaffs_ScanBackwards(yaffs_Device * dev)
                                        /* Out of memory */
                                        alloc_failed = 1;
                                }
-
+                               
                                if (in &&
                                    in->variantType == YAFFS_OBJECT_TYPE_FILE
                                    && chunkBase <
@@ -6284,14 +6253,14 @@ static int yaffs_ScanBackwards(yaffs_Device * dev)
                                                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) {
@@ -6337,7 +6306,7 @@ static int yaffs_ScanBackwards(yaffs_Device * dev)
                                    ) {
 
                                        /* 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.
                                         */
 
@@ -6370,12 +6339,12 @@ 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 &&
+                                       if ((in->variantType == YAFFS_OBJECT_TYPE_FILE) && 
+                                            ((oh && 
                                               oh-> type == YAFFS_OBJECT_TYPE_FILE)||
                                              (tags.extraHeaderInfoAvailable  &&
                                               tags.extraObjectType == YAFFS_OBJECT_TYPE_FILE))
@@ -6426,7 +6395,7 @@ 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) {
                                                in->variantType = oh->type;
 
@@ -6445,13 +6414,13 @@ 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;
                                                in->lazyLoaded = 1;
                                        }
-
+                                               
                                        in->chunkId = chunk;
 
                                } else if (!in->valid) {
@@ -6459,7 +6428,7 @@ static int yaffs_ScanBackwards(yaffs_Device * dev)
 
                                        in->valid = 1;
                                        in->chunkId = chunk;
-
+                                       
                                        if(oh) {
                                                in->variantType = oh->type;
 
@@ -6480,12 +6449,12 @@ 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 =
@@ -6518,13 +6487,13 @@ static int yaffs_ScanBackwards(yaffs_Device * dev)
 
                                        if (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->variantType !=
+                                                /* Set up as a directory */
+                                                parent->variantType =
+                                                    YAFFS_OBJECT_TYPE_DIRECTORY;
+                                                YINIT_LIST_HEAD(&parent->variant.
+                                                               directoryVariant.
+                                                               children);
+                                        } else if (parent->variantType !=
                                                   YAFFS_OBJECT_TYPE_DIRECTORY)
                                        {
                                                /* Hoosterman, another problem....
@@ -6552,11 +6521,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:
@@ -6565,7 +6534,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;
@@ -6581,13 +6550,13 @@ 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;
+                                                  in->variant.hardLinkVariant.equivalentObjectId =
+                                                    equivalentObjectId;
+                                                  in->hardLinks.next =
+                                                    (struct ylist_head *) hardList;
+                                                  hardList = in;
+                                                }
+                                                break;
                                        case YAFFS_OBJECT_TYPE_DIRECTORY:
                                                /* Do nothing */
                                                break;
@@ -6606,7 +6575,7 @@ static int yaffs_ScanBackwards(yaffs_Device * dev)
                                        }
 
                                }
-
+                               
                        }
 
                } /* End of scanning for each chunk */
@@ -6627,52 +6596,52 @@ 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);
-
-
+       
+       
        /*
-       *  Sort out state of unlinked and deleted objects.
-       */
-       {
-               struct ylist_head *i;
-               struct ylist_head *n;
-
-               yaffs_Object *l;
-
-               /* Soft delete all the unlinked files */
-               ylist_for_each_safe(i, n,
-                                  &dev->unlinkedDir->variant.directoryVariant.
-                                  children) {
-                       if (i) {
-                               l = ylist_entry(i, yaffs_Object, siblings);
-                               yaffs_DestroyObject(l);
-                       }
-               }
-
-               /* Soft delete all the deletedDir files */
-               ylist_for_each_safe(i, n,
-                                  &dev->deletedDir->variant.directoryVariant.
-                                  children) {
-                       if (i) {
-                               l = ylist_entry(i, yaffs_Object, siblings);
-                               yaffs_DestroyObject(l);
-
-                       }
+        *  Sort out state of unlinked and deleted objects.
+        */
+        {
+                struct ylist_head *i;
+                struct ylist_head *n;
+
+                yaffs_Object *l;
+
+                /* Soft delete all the unlinked files */
+                ylist_for_each_safe(i, n,
+                                   &dev->unlinkedDir->variant.directoryVariant.
+                                   children) {
+                        if (i) {
+                                l = ylist_entry(i, yaffs_Object, siblings);
+                                yaffs_DestroyObject(l);
+                        }
+                }
+
+                /* Soft delete all the deletedDir files */
+                ylist_for_each_safe(i, n,
+                                   &dev->deletedDir->variant.directoryVariant.
+                                   children) {
+                        if (i) {
+                                l = ylist_entry(i, yaffs_Object, siblings);
+                                yaffs_DestroyObject(l);
+
+                        }
                }
        }
 
        yaffs_ReleaseTempBuffer(dev, chunkData, __LINE__);
-
+       
        if(alloc_failed){
                return YAFFS_FAIL;
        }
@@ -6687,12 +6656,12 @@ static int yaffs_ScanBackwards(yaffs_Device * dev)
 static void yaffs_RemoveObjectFromDirectory(yaffs_Object * obj)
 {
        yaffs_Device *dev = obj->myDev;
-
-       if(dev && dev->removeObjectCallback)
-               dev->removeObjectCallback(obj);
-
-       ylist_del_init(&obj->siblings);
-       obj->parent = NULL;
+       
+        if(dev && dev->removeObjectCallback)
+                dev->removeObjectCallback(obj);
+           
+        ylist_del_init(&obj->siblings);
+        obj->parent = NULL;
 }
 
 
@@ -6715,19 +6684,19 @@ static void yaffs_AddObjectToDirectory(yaffs_Object * directory,
                YBUG();
        }
 
-       if (obj->siblings.prev == NULL) {
-               /* Not initialised */
-               YINIT_LIST_HEAD(&obj->siblings);
+        if (obj->siblings.prev == NULL) {
+                /* Not initialised */
+                YINIT_LIST_HEAD(&obj->siblings);
 
-       } else if (!ylist_empty(&obj->siblings)) {
-               /* If it is holed up somewhere else, un hook it */
-               yaffs_RemoveObjectFromDirectory(obj);
-       }
-       /* Now add it */
-       ylist_add(&obj->siblings, &directory->variant.directoryVariant.children);
-       obj->parent = directory;
+        } else if (!ylist_empty(&obj->siblings)) {
+                /* If it is holed up somewhere else, un hook it */
+                yaffs_RemoveObjectFromDirectory(obj);
+        }
+        /* Now add it */
+        ylist_add(&obj->siblings, &directory->variant.directoryVariant.children);
+        obj->parent = directory;
 
-       if (directory == obj->myDev->unlinkedDir
+        if (directory == obj->myDev->unlinkedDir
            || directory == obj->myDev->deletedDir) {
                obj->unlinked = 1;
                obj->myDev->nUnlinkedFiles++;
@@ -6738,12 +6707,12 @@ static void yaffs_AddObjectToDirectory(yaffs_Object * directory,
 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;
@@ -6763,20 +6732,20 @@ yaffs_Object *yaffs_FindObjectByName(yaffs_Object * directory,
                YBUG();
        }
 
-       sum = yaffs_CalcNameSum(name);
-
-       ylist_for_each(i, &directory->variant.directoryVariant.children) {
-               if (i) {
-                       l = ylist_entry(i, yaffs_Object, siblings);
+        sum = yaffs_CalcNameSum(name);
 
-                       yaffs_CheckObjectDetailsLoaded(l);
+        ylist_for_each(i, &directory->variant.directoryVariant.children) {
+                if (i) {
+                        l = ylist_entry(i, yaffs_Object, siblings);
+                        
+                        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->chunkId <= 0)
+                       } else if (yaffs_SumCompare(l->sum, sum) || l->chunkId <= 0)    
                        {
                                /* LostnFound cunk called Objxxx
                                 * Do a real check
@@ -6797,12 +6766,12 @@ yaffs_Object *yaffs_FindObjectByName(yaffs_Object * directory,
 
 #if 0
 int yaffs_ApplyToDirectoryChildren(yaffs_Object * theDir,
-                                  int (*fn) (yaffs_Object *))
+                                   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"
@@ -6813,15 +6782,15 @@ int yaffs_ApplyToDirectoryChildren(yaffs_Object * theDir,
                T(YAFFS_TRACE_ALWAYS,
                  (TSTR
                   ("tragedy: yaffs_FindObjectByName: non-directory" TENDSTR)));
-               YBUG();
-       }
-
-       ylist_for_each(i, &theDir->variant.directoryVariant.children) {
-               if (i) {
-                       l = ylist_entry(i, yaffs_Object, siblings);
-                       if (l && !fn(l)) {
-                               return YAFFS_FAIL;
-                       }
+                YBUG();
+        }
+
+        ylist_for_each(i, &theDir->variant.directoryVariant.children) {
+                if (i) {
+                        l = ylist_entry(i, yaffs_Object, siblings);
+                        if (l && !fn(l)) {
+                                return YAFFS_FAIL;
+                        }
                }
        }
 
@@ -6848,7 +6817,7 @@ yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object * obj)
 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) {
@@ -6906,16 +6875,16 @@ int yaffs_GetObjectFileLength(yaffs_Object * obj)
 
 int yaffs_GetObjectLinkCount(yaffs_Object * obj)
 {
-       int count = 0;
-       struct ylist_head *i;
+        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;
+        if (!obj->unlinked) {
+                count++;        /* the object itself */
+        }
+        ylist_for_each(i, &obj->hardLinks) {
+                count++;        /* add the hard links; */
+        }
+        return count;
 
 }
 
@@ -7080,13 +7049,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);
 
@@ -7096,12 +7065,12 @@ 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){
                yaffs_AddObjectToDirectory(dev->rootDir, dev->lostNFoundDir);
                return YAFFS_OK;
        }
-
+       
        return YAFFS_FAIL;
 }
 
@@ -7135,13 +7104,13 @@ int yaffs_GutsInitialise(yaffs_Device * dev)
 
        /* Check geometry parameters. */
 
-       if ((!dev->inbandTags && dev->isYaffs2 && dev->totalBytesPerChunk < 1024) ||
-           (!dev->isYaffs2 && dev->totalBytesPerChunk != 512) ||
+       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->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,
@@ -7193,9 +7162,9 @@ int yaffs_GutsInitialise(yaffs_Device * dev)
 
 
        /* OK now calculate a few things for the device */
-
+       
        /*
-        *  Calculate all the chunk size manipulation numbers:
+        *  Calculate all the chunk size manipulation numbers:   
         */
         {
                __u32 x = dev->nDataBytesPerChunk;
@@ -7206,7 +7175,7 @@ int yaffs_GutsInitialise(yaffs_Device * dev)
                 /* We only use chunk mask if chunkDiv is 1 */
                 dev->chunkMask = (1<<dev->chunkShift) - 1;
        }
-
+               
 
        /*
         * Calculate chunkGroupBits.
@@ -7214,9 +7183,9 @@ int yaffs_GutsInitialise(yaffs_Device * dev)
         */
 
        x = dev->nChunksPerBlock * (dev->internalEndBlock + 1);
-
+       
        bits = ShiftsGE(x);
-
+       
        /* Set up tnode width if wide tnodes are enabled. */
        if(!dev->wideTnodesDisabled){
                /* bits must be even so that we end up with 32-bit words */
@@ -7229,20 +7198,20 @@ int yaffs_GutsInitialise(yaffs_Device * dev)
        }
        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;
 
@@ -7280,11 +7249,11 @@ int yaffs_GutsInitialise(yaffs_Device * dev)
        /* Initialise temporary buffers and caches. */
        if(!yaffs_InitialiseTempBuffers(dev))
                init_failed = 1;
-
+       
        dev->srCache = NULL;
        dev->gcCleanupList = NULL;
-
-
+       
+       
        if (!init_failed &&
            dev->nShortOpCaches > 0) {
                int i;
@@ -7296,10 +7265,10 @@ int yaffs_GutsInitialise(yaffs_Device * dev)
                }
 
                buf = dev->srCache =  YMALLOC(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;
@@ -7308,12 +7277,12 @@ int yaffs_GutsInitialise(yaffs_Device * dev)
                }
                if(!buf)
                        init_failed = 1;
-
+                       
                dev->srLastUse = 0;
        }
 
        dev->cacheHits = 0;
-
+       
        if(!init_failed){
                dev->gcCleanupList = YMALLOC(dev->nChunksPerBlock * sizeof(__u32));
                if(!dev->gcCleanupList)
@@ -7325,7 +7294,7 @@ int yaffs_GutsInitialise(yaffs_Device * dev)
        }
        if(!init_failed && !yaffs_InitialiseBlocks(dev))
                init_failed = 1;
-
+               
        yaffs_InitialiseTnodes(dev);
        yaffs_InitialiseObjects(dev);
 
@@ -7341,14 +7310,14 @@ int yaffs_GutsInitialise(yaffs_Device * dev)
                                  (TSTR("yaffs: restored from checkpoint" TENDSTR)));
                        } else {
 
-                               /* Clean up the mess caused by an aborted checkpoint load
-                                * and scan backwards.
+                               /* Clean up the mess caused by an aborted checkpoint load 
+                                * and scan backwards. 
                                 */
                                yaffs_DeinitialiseBlocks(dev);
                                yaffs_DeinitialiseTnodes(dev);
                                yaffs_DeinitialiseObjects(dev);
-
-
+                               
+                       
                                dev->nErasedBlocks = 0;
                                dev->nFreeChunks = 0;
                                dev->allocationBlock = -1;
@@ -7360,7 +7329,7 @@ int yaffs_GutsInitialise(yaffs_Device * dev)
 
                                if(!init_failed && !yaffs_InitialiseBlocks(dev))
                                        init_failed = 1;
-
+                                       
                                yaffs_InitialiseTnodes(dev);
                                yaffs_InitialiseObjects(dev);
 
@@ -7374,7 +7343,7 @@ int yaffs_GutsInitialise(yaffs_Device * dev)
                        if(!yaffs_Scan(dev))
                                init_failed = 1;
        }
-
+               
        if(init_failed){
                /* Clean up the mess */
                T(YAFFS_TRACE_TRACING,
@@ -7395,7 +7364,7 @@ int yaffs_GutsInitialise(yaffs_Device * dev)
 
        yaffs_VerifyFreeChunks(dev);
        yaffs_VerifyBlocks(dev);
-
+       
 
        T(YAFFS_TRACE_TRACING,
          (TSTR("yaffs: yaffs_GutsInitialise() done.\n" TENDSTR)));
@@ -7480,7 +7449,7 @@ int yaffs_GetNumberOfFreeChunks(yaffs_Device * dev)
 #endif
 
        nFree += dev->nDeletedFiles;
-
+       
        /* Now count the number of dirty chunks in the cache and subtract those */
 
        {
@@ -7494,12 +7463,12 @@ int yaffs_GetNumberOfFreeChunks(yaffs_Device * dev)
        nFree -= nDirtyCacheChunks;
 
        nFree -= ((dev->nReservedBlocks + 1) * dev->nChunksPerBlock);
-
+       
        /* Now we figure out how much to reserve for the checkpoint and report that... */
        blocksForCheckpoint = yaffs_CalcCheckpointBlocksRequired(dev) - dev->blocksInCheckpoint;
        if(blocksForCheckpoint < 0)
                blocksForCheckpoint = 0;
-
+               
        nFree -= (blocksForCheckpoint * dev->nChunksPerBlock);
 
        if (nFree < 0)
@@ -7515,10 +7484,10 @@ static void yaffs_VerifyFreeChunks(yaffs_Device * dev)
 {
        int counted;
        int difference;
-
+       
        if(yaffs_SkipVerification(dev))
                return;
-
+       
        counted = yaffs_CountFreeChunks(dev);
 
        difference = dev->nFreeChunks - counted;
@@ -7549,7 +7518,7 @@ static int yaffs_CheckStructures(void)
 /*      yaffs_CheckStruct(yaffs_TagsUnion,8,"yaffs_TagsUnion"); */
 /*      yaffs_CheckStruct(yaffs_Spare,16,"yaffs_Spare"); */
 #ifndef CONFIG_YAFFS_TNODE_LIST_DEBUG
-       yaffs_CheckStruct(yaffs_Tnode, 2 * YAFFS_NTNODES_LEVEL0, "yaffs_Tnode");
+        yaffs_CheckStruct(yaffs_Tnode, 2 * YAFFS_NTNODES_LEVEL0, "yaffs_Tnode");
 #endif
 #ifndef CONFIG_YAFFS_WINCE
                yaffs_CheckStruct(yaffs_ObjectHeader, 512, "yaffs_ObjectHeader");
index b9b2ea1..4506724 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
  *
  * Copyright (C) 2002-2007 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
 #define YAFFS_OK       1
 #define YAFFS_FAIL  0
 
-/* Give us a  Y=0x59,
- * Give us an A=0x41,
- * Give us an FF=0xFF
+/* Give us a  Y=0x59, 
+ * Give us an A=0x41, 
+ * Give us an FF=0xFF 
  * Give us an S=0x53
- * And what have we got...
+ * And what have we got... 
  */
 #define YAFFS_MAGIC                    0x5941FF53
 
  * The range is limited slightly to help distinguish bad numbers from good.
  * This also allows us to perhaps in the future use special numbers for
  * special purposes.
- * EFFFFF00 allows the allocation of 8 blocks per second (~1Mbytes) for 15 years,
+ * EFFFFF00 allows the allocation of 8 blocks per second (~1Mbytes) for 15 years, 
  * and is a larger number than the lifetime of a 2GB device.
  */
 #define YAFFS_LOWEST_SEQUENCE_NUMBER   0x00001000
@@ -178,7 +178,7 @@ typedef struct {
 
        /* The following stuff only has meaning when we read */
        yaffs_ECCResult eccResult;
-       unsigned blockBad;
+       unsigned blockBad;      
 
        /* YAFFS 1 stuff */
        unsigned chunkDeleted;  /* The chunk is marked deleted */
@@ -244,29 +244,29 @@ typedef enum {
        /* This block is empty */
 
        YAFFS_BLOCK_STATE_ALLOCATING,
-       /* This block is partially allocated.
+       /* This block is partially allocated. 
         * At least one page holds valid data.
         * This is the one currently being used for page
         * allocation. Should never be more than one of these
         */
 
-       YAFFS_BLOCK_STATE_FULL,
+       YAFFS_BLOCK_STATE_FULL, 
        /* All the pages in this block have been allocated.
         */
 
        YAFFS_BLOCK_STATE_DIRTY,
-       /* All pages have been allocated and deleted.
+       /* All pages have been allocated and deleted. 
         * Erase me, reuse me.
         */
 
-       YAFFS_BLOCK_STATE_CHECKPOINT,
+       YAFFS_BLOCK_STATE_CHECKPOINT,   
        /* This block is assigned to holding checkpoint data.
         */
 
-       YAFFS_BLOCK_STATE_COLLECTING,
+       YAFFS_BLOCK_STATE_COLLECTING,   
        /* This block is being garbage collected */
 
-       YAFFS_BLOCK_STATE_DEAD
+       YAFFS_BLOCK_STATE_DEAD  
        /* This block has failed and is not in use */
 } yaffs_BlockState;
 
@@ -281,7 +281,7 @@ typedef struct {
        __u32 needsRetiring:1;  /* Data has failed on this block, need to get valid data off */
                                /* and retire the block. */
        __u32 skipErasedCheck: 1; /* If this is set we can skip the erased check on this block */
-       __u32 gcPrioritise: 1;  /* An ECC check or blank check has failed on this block.
+       __u32 gcPrioritise: 1;  /* An ECC check or blank check has failed on this block. 
                                   It should be prioritised for GC */
         __u32 chunkErrorStrikes:3; /* How many times we've had ecc etc failures on this block and tried to reuse it */
 
@@ -300,11 +300,11 @@ typedef struct {
 
        /* Apply to everything  */
        int parentObjectId;
-       __u16 sum__NoLongerUsed;        /* checksum of name. No longer used */
-       YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];
+        __u16 sum__NoLongerUsed;        /* checksum of name. No longer used */
+        YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];
 
-       /* The following apply to directories, files, symlinks - not hard links */
-       __u32 yst_mode;         /* protection */
+        /* The following apply to directories, files, symlinks - not hard links */
+        __u32 yst_mode;         /* protection */
 
 #ifdef CONFIG_YAFFS_WINCE
        __u32 notForWinCE[5];
@@ -384,7 +384,7 @@ typedef struct {
 } yaffs_FileStructure;
 
 typedef struct {
-       struct ylist_head children;     /* list of child links */
+        struct ylist_head children;     /* list of child links */
 } yaffs_DirectoryStructure;
 
 typedef struct {
@@ -411,7 +411,7 @@ struct yaffs_ObjectStruct {
        __u8 renameAllowed:1;   /* Some objects are not allowed to be renamed. */
        __u8 unlinkAllowed:1;
        __u8 dirty:1;           /* the object needs to be written to flash */
-       __u8 valid:1;           /* When the file system is being loaded up, this
+       __u8 valid:1;           /* When the file system is being loaded up, this 
                                 * object might be created before the data
                                 * is available (ie. file data records appear before the header).
                                 */
@@ -425,19 +425,19 @@ struct yaffs_ObjectStruct {
        __u8 serial;            /* serial number of chunk in NAND. Cached here */
        __u16 sum;              /* sum of the name to speed searching */
 
-       struct yaffs_DeviceStruct *myDev;       /* The device I'm on */
+        struct yaffs_DeviceStruct *myDev;       /* The device I'm on */
 
-       struct ylist_head hashLink;     /* list of objects in this hash bucket */
+        struct ylist_head hashLink;     /* list of objects in this hash bucket */
 
-       struct ylist_head hardLinks;    /* all the equivalent hard linked objects */
+        struct ylist_head hardLinks;    /* all the equivalent hard linked objects */
 
-       /* directory structure stuff */
-       /* also used for linking up the free list */
-       struct yaffs_ObjectStruct *parent;
-       struct ylist_head siblings;
+        /* directory structure stuff */
+        /* also used for linking up the free list */
+        struct yaffs_ObjectStruct *parent; 
+        struct ylist_head siblings;
 
-       /* Where's my object header in NAND? */
-       int chunkId;
+        /* Where's my object header in NAND? */
+        int chunkId;            
 
        int nDataChunks;        /* Number of data chunks attached to the file. */
 
@@ -488,31 +488,31 @@ struct yaffs_ObjectList_struct {
 typedef struct yaffs_ObjectList_struct yaffs_ObjectList;
 
 typedef struct {
-       struct ylist_head list;
-       int count;
+        struct ylist_head list;
+        int count;
 } yaffs_ObjectBucket;
 
 
-/* yaffs_CheckpointObject holds the definition of an object as dumped
+/* yaffs_CheckpointObject holds the definition of an object as dumped 
  * by checkpointing.
  */
 
 typedef struct {
         int structType;
-       __u32 objectId;
+       __u32 objectId;         
        __u32 parentId;
        int chunkId;
-
+                       
        yaffs_ObjectType variantType:3;
-       __u8 deleted:1;
-       __u8 softDeleted:1;
-       __u8 unlinked:1;
-       __u8 fake:1;
+       __u8 deleted:1;         
+       __u8 softDeleted:1;     
+       __u8 unlinked:1;        
+       __u8 fake:1;            
        __u8 renameAllowed:1;
        __u8 unlinkAllowed:1;
-       __u8 serial;
-
-       int nDataChunks;
+       __u8 serial;            
+       
+       int nDataChunks;        
        __u32 fileSizeOrEquivalentObjectId;
 
 }yaffs_CheckpointObject;
@@ -531,25 +531,25 @@ typedef struct {
 /*----------------- Device ---------------------------------*/
 
 struct yaffs_DeviceStruct {
-       struct ylist_head devList;
-       const char *name;
-
-       /* Entry parameters set up way early. Yaffs sets up the rest.*/
-       int nDataBytesPerChunk; /* Should be a power of 2 >= 512 */
-       int nChunksPerBlock;    /* does not need to be a power of 2 */
-       int nBytesPerSpare;     /* spare area size */
-       int startBlock;         /* Start block we're allowed to use */
-       int endBlock;           /* End block we're allowed to use */
-       int nReservedBlocks;    /* We want this tuneable so that we can reduce */
+        struct ylist_head devList;
+        const char *name;
+
+        /* Entry parameters set up way early. Yaffs sets up the rest.*/
+        int nDataBytesPerChunk; /* Should be a power of 2 >= 512 */
+        int nChunksPerBlock;    /* does not need to be a power of 2 */
+        int spareBytesPerChunk;/* spare area size */
+        int startBlock;         /* Start block we're allowed to use */
+        int endBlock;           /* End block we're allowed to use */
+        int nReservedBlocks;    /* We want this tuneable so that we can reduce */
                                /* reserved blocks on NOR and RAM. */
-
-
+       
+       
        /* Stuff used by the shared space checkpointing mechanism */
        /* If this value is zero, then this mechanism is disabled */
-
+       
 //     int nCheckpointReservedBlocks; /* Blocks to reserve for checkpoint data */
 
-
+       
 
 
        int nShortOpCaches;     /* If <= 0, then short op caching is disabled, else
@@ -564,7 +564,7 @@ struct yaffs_DeviceStruct {
                                 * On an mtd this holds the mtd pointer.
                                 */
         void *superBlock;
-
+        
        /* NAND access functions (Must be set before calling YAFFS)*/
 
        int (*writeChunkToNAND) (struct yaffs_DeviceStruct * dev,
@@ -590,22 +590,23 @@ struct yaffs_DeviceStruct {
 #endif
 
        int isYaffs2;
-
-       /* The removeObjectCallback function must be supplied by OS flavours that
+       
+       /* The removeObjectCallback function must be supplied by OS flavours that 
         * need it. The Linux kernel does not use this, but yaffs direct does use
         * it to implement the faster readdir
         */
        void (*removeObjectCallback)(struct yaffs_ObjectStruct *obj);
-
+       
        /* Callback to mark the superblock dirsty */
        void (*markSuperBlockDirty)(void * superblock);
-
+       
        int wideTnodesDisabled; /* Set to disable wide tnodes */
        
        YCHAR *pathDividers;    /* String of legal path dividers */
+       
 
        /* End of stuff that must be set before initialisation. */
-
+       
        /* Checkpoint control. Can be set before or after initialisation */
        __u8 skipCheckpointRead;
        __u8 skipCheckpointWrite;
@@ -614,11 +615,11 @@ struct yaffs_DeviceStruct {
 
        __u16 chunkGroupBits;   /* 0 for devices <= 32MB. else log2(nchunks) - 16 */
        __u16 chunkGroupSize;   /* == 2^^chunkGroupBits */
-
+       
        /* Stuff to support wide tnodes */
        __u32 tnodeWidth;
        __u32 tnodeMask;
-
+       
        /* Stuff for figuring out file offset to chunk conversions */
        __u32 chunkShift; /* Shift value */
        __u32 chunkDiv;   /* Divisor after shifting: 1 for power-of-2 sizes */
@@ -632,14 +633,14 @@ struct yaffs_DeviceStruct {
 
        struct semaphore sem;   /* Semaphore for waiting on erasure.*/
        struct semaphore grossLock;     /* Gross locking semaphore */
-       __u8 *spareBuffer;      /* For mtdif2 use. Don't know the size of the buffer
+       __u8 *spareBuffer;      /* For mtdif2 use. Don't know the size of the buffer 
                                 * at compile time so we have to allocate it.
                                 */
        void (*putSuperFunc) (struct super_block * sb);
 #endif
 
        int isMounted;
-
+       
        int isCheckpointed;
 
 
@@ -648,7 +649,7 @@ struct yaffs_DeviceStruct {
        int internalEndBlock;
        int blockOffset;
        int chunkOffset;
-
+       
 
        /* Runtime checkpointing stuff */
        int checkpointPageSequence;   /* running sequence number of checkpoint pages */
@@ -664,15 +665,15 @@ struct yaffs_DeviceStruct {
        int checkpointMaxBlocks;
        __u32 checkpointSum;
        __u32 checkpointXor;
-
+       
        int nCheckpointBlocksRequired; /* Number of blocks needed to store current checkpoint set */
-
+       
        /* Block Info */
        yaffs_BlockInfo *blockInfo;
        __u8 *chunkBits;        /* bitmap of chunks in use */
        unsigned blockInfoAlt:1;        /* was allocated using alternative strategy */
        unsigned chunkBitsAlt:1;        /* was allocated using alternative strategy */
-       int chunkBitmapStride;  /* Number of bytes of chunkBits per block.
+       int chunkBitmapStride;  /* Number of bytes of chunkBits per block. 
                                 * Must be consistent with nChunksPerBlock.
                                 */
 
@@ -720,7 +721,7 @@ struct yaffs_DeviceStruct {
        int tagsEccUnfixed;
        int nDeletions;
        int nUnmarkedDeletions;
-
+       
        int hasPendingPrioritisedGCs; /* We think this device might have pending prioritised gcs */
 
        /* Special directories */
@@ -731,7 +732,7 @@ struct yaffs_DeviceStruct {
         *      __u8            bufferedData[YAFFS_CHUNKS_PER_BLOCK][YAFFS_BYTES_PER_CHUNK];
         *      yaffs_Spare bufferedSpare[YAFFS_CHUNKS_PER_BLOCK];
         */
-
+       
        int bufferedBlock;      /* Which block is buffered here? */
        int doingBufferedBlockRewrite;
 
@@ -767,14 +768,14 @@ typedef struct yaffs_DeviceStruct yaffs_Device;
 /* The static layout of block usage etc is stored in the super block header */
 typedef struct {
         int StructType;
-       int version;
+        int version;
        int checkpointStartBlock;
        int checkpointEndBlock;
        int startBlock;
        int endBlock;
        int rfu[100];
 } yaffs_SuperBlockHeader;
-
+       
 /* The CheckpointDevice structure holds the device information that changes at runtime and
  * must be preserved over unmount/mount cycles.
  */
@@ -828,13 +829,13 @@ int yaffs_GetAttributes(yaffs_Object * obj, struct iattr *attr);
 
 /* File operations */
 int yaffs_ReadDataFromFile(yaffs_Object * obj, __u8 * buffer, loff_t offset,
-                          int nBytes);
+                           int nBytes);
 int yaffs_WriteDataToFile(yaffs_Object * obj, const __u8 * buffer, loff_t offset,
-                         int nBytes, int writeThrough);
+                          int nBytes, int writeThrough);
 int yaffs_ResizeFile(yaffs_Object * obj, loff_t newSize);
 
 yaffs_Object *yaffs_MknodFile(yaffs_Object * parent, const YCHAR * name,
-                             __u32 mode, __u32 uid, __u32 gid);
+                              __u32 mode, __u32 uid, __u32 gid);
 int yaffs_FlushFile(yaffs_Object * obj, int updateTime);
 
 /* Flushing and checkpointing */
index ab756d0..aed101e 100644 (file)
@@ -253,6 +253,9 @@ static int yaffs_ReadChunkFromNAND(struct yaffs_DeviceStruct *dev,
                /* Must allocate enough memory for spare+2*sizeof(int) */
                /* for ecc results from device. */
                struct yaffs_NANDSpare nspare;
+               
+               memset(&nspare,0,sizeof(nspare));
+               
                retVal =
                    dev->readChunkFromNAND(dev, chunkInNAND, data,
                                           (yaffs_Spare *) & nspare);
@@ -337,7 +340,7 @@ static void yaffs_HandleReadDataError(yaffs_Device * dev, int chunkInNAND)
        int blockInNAND = chunkInNAND / dev->nChunksPerBlock;
 
        /* Mark the block for retirement */
-       yaffs_GetBlockInfo(dev, blockInNAND)->needsRetiring = 1;
+       yaffs_GetBlockInfo(dev, blockInNAND + dev->blockOffset)->needsRetiring = 1;
        T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
          (TSTR("**>>Block %d marked for retirement" TENDSTR), blockInNAND));