*** empty log message ***
authorcharles <charles>
Tue, 26 Nov 2002 01:15:37 +0000 (01:15 +0000)
committercharles <charles>
Tue, 26 Nov 2002 01:15:37 +0000 (01:15 +0000)
Documentation/yaffs2.html [new file with mode: 0644]
Documentation/yaffs_on_mtd.html
Makefile
snMakefile
yaffs_fs.c
yaffs_guts.c
yaffs_guts.h
yaffs_mtdif.c
yaffs_ramem.c
yaffsdev.proj
yportenv.h

diff --git a/Documentation/yaffs2.html b/Documentation/yaffs2.html
new file mode 100644 (file)
index 0000000..e83dcc6
--- /dev/null
@@ -0,0 +1,756 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<HTML>
+<HEAD>
+       <META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=iso-8859-1">
+       <TITLE></TITLE>
+       <META NAME="GENERATOR" CONTENT="StarOffice/5.2 (Linux)">
+       <META NAME="AUTHOR" CONTENT=" ">
+       <META NAME="CREATED" CONTENT="20021004;15061000">
+       <META NAME="CHANGEDBY" CONTENT=" ">
+       <META NAME="CHANGED" CONTENT="20021126;13574600">
+</HEAD>
+<BODY>
+<H1>YAFFS2</H1>
+<H4>Summary</H4>
+<P>The original motivation for YAFFS 2 was to add support for the new
+NAND with 2kB pages instead of 512-byte pages and strictly sequential
+page writing order. 
+</P>
+<P>To achieve this, a new design is used which also realises the
+following benefits:</P>
+<UL>
+       <LI><P>zero page rewrites, which means faster operation. (YAFFS1
+       uses a single rewrite in the spare area to delete a page).</P>
+       <LI><P>ability to exploit simultaneous page programming on some
+       chips.</P>
+       <LI><P>improves performance relative to YAFFS1 speed(write:1.5x to
+       5x, delete: 4x, garbage collection: 2x)</P>
+       <LI><P>lower RAM footprint (approx. 25% to 50% of YAFFS1, depending
+       on chunk size used).</P>
+       <LI><P>Can support Toshiba/Sandisk MLC parts.</P>
+       <LI><P>Runtime selection between various chunk sizes.</P>
+</UL>
+<P>Most of YAFFS and YAFFS2 code is common, therefore the code will
+likely be kept common with YAFFS vs YAFFS2 being run-time selected.</P>
+<H4>Method</H4>
+<P>The main philosophical difference between YAFFS and YAFFS2 is how
+discarded status is tracked. Since we can't do any re-writing, we
+can't use the &quot;discarded&quot; flags in YAFFS2.</P>
+<P>Instead YAFFS2 uses two mechanisms to resolve data state.</P>
+<UL>
+       <LI><P>YAFFS2 chunks have more tag information, including a block
+       sequence Id. From that we can determine the chunk sequence Id since
+       the chunks are allocated sequentially in a block. Thus we always
+       know the patch order for all chunks in the system.</P>
+       <LI><P>The above helps us track stale -vs- fresh data, but does not
+       help determine when a file/object is deleted. Deletion is achieved
+       by moving the object to the &quot;unlinked&quot; directory. We also
+       keep track of the number of chunks (both stale and current) in the
+       system for each object. While this number indicates that there are
+       still chunks associated with this object we keep the deletion
+       record. When the last trace of the object has been really erased
+       from NAND, we can forget about the deletion record too. 
+       </P>
+       <LI><P>Since there is no deletion, a resize (shrinking) of a file
+       will still have valid data chunks past the end of file on the NAND.
+       However, we write a new ObjectHeader at the time of the resize,
+       therefore this shows the shrunken file size.</P>
+</UL>
+<P>This changes erasure slightly:</P>
+<UL>
+       <LI><P>During garbage collection we can't just look at chunk state
+       flags, instead we must read the tags of each chunk to determine
+       which object's chunk count we must decrement. This step must also be
+       performed when a block is erased (as part of deletion).</P>
+</UL>
+<P>This makes erasure &amp; garbage collection more expensive (by
+adding reads), but remember that ion YAFFS2 we don't need to do page
+deletions which are much more expensive operations. Thus, all-up
+YAFFS2 wins.</P>
+<H4>Tag structure</H4>
+<P>Each chunk in YAFFS2 has the following information:</P>
+<TABLE WIDTH=100% BORDER=1 CELLPADDING=4 CELLSPACING=3>
+       <COL WIDTH=45*>
+       <COL WIDTH=83*>
+       <COL WIDTH=64*>
+       <COL WIDTH=64*>
+       <THEAD>
+               <TR VALIGN=TOP>
+                       <TH WIDTH=18%>
+                               <P>Field</P>
+                       </TH>
+                       <TH WIDTH=32%>
+                               <P>Comment</P>
+                       </TH>
+                       <TH WIDTH=25%>
+                               <P>Size for 1kb chunks</P>
+                       </TH>
+                       <TH WIDTH=25%>
+                               <P>Size for 2kB chunks</P>
+                       </TH>
+               </TR>
+       </THEAD>
+       <TBODY>
+               <TR VALIGN=TOP>
+                       <TD WIDTH=18%>
+                               <P>blockState</P>
+                       </TD>
+                       <TD WIDTH=32%>
+                               <P>Block state. non-0xFF for bad block</P>
+                       </TD>
+                       <TD WIDTH=25%>
+                               <P>1 byte</P>
+                       </TD>
+                       <TD WIDTH=25%>
+                               <P>1 byte</P>
+                       </TD>
+               </TR>
+               <TR VALIGN=TOP>
+                       <TD WIDTH=18%>
+                               <P>chunkId</P>
+                       </TD>
+                       <TD WIDTH=32%>
+                               <P>32-bit chunk Id</P>
+                       </TD>
+                       <TD WIDTH=25%>
+                               <P>4 bytes</P>
+                       </TD>
+                       <TD WIDTH=25%>
+                               <P>4 bytes</P>
+                       </TD>
+               </TR>
+               <TR VALIGN=TOP>
+                       <TD WIDTH=18%>
+                               <P>objectId</P>
+                       </TD>
+                       <TD WIDTH=32%>
+                               <P>32-bit object Id</P>
+                       </TD>
+                       <TD WIDTH=25%>
+                               <P>4 bytes</P>
+                       </TD>
+                       <TD WIDTH=25%>
+                               <P>4 bytes</P>
+                       </TD>
+               </TR>
+               <TR VALIGN=TOP>
+                       <TD WIDTH=18%>
+                               <P>nBytes</P>
+                       </TD>
+                       <TD WIDTH=32%>
+                               <P>Number of data bytes in this chunk</P>
+                       </TD>
+                       <TD WIDTH=25%>
+                               <P>2 bytes</P>
+                       </TD>
+                       <TD WIDTH=25%>
+                               <P>2 bytes</P>
+                       </TD>
+               </TR>
+               <TR VALIGN=TOP>
+                       <TD WIDTH=18%>
+                               <P>blockSequence</P>
+                       </TD>
+                       <TD WIDTH=32%>
+                               <P>sequence number for this block</P>
+                       </TD>
+                       <TD WIDTH=25%>
+                               <P>4 bytes</P>
+                       </TD>
+                       <TD WIDTH=25%>
+                               <P>4 bytes</P>
+                       </TD>
+               </TR>
+               <TR VALIGN=TOP>
+                       <TD WIDTH=18%>
+                               <P>tagsEcc</P>
+                       </TD>
+                       <TD WIDTH=32%>
+                               <P>ECC on tags area</P>
+                       </TD>
+                       <TD WIDTH=25%>
+                               <P>3 bytes</P>
+                       </TD>
+                       <TD WIDTH=25%>
+                               <P>3 bytes</P>
+                       </TD>
+               </TR>
+               <TR VALIGN=TOP>
+                       <TD WIDTH=18%>
+                               <P>ecc</P>
+                       </TD>
+                       <TD WIDTH=32%>
+                               <P>ECC, 3 bytes/256 bytes of data</P>
+                       </TD>
+                       <TD WIDTH=25%>
+                               <P>12 bytes</P>
+                       </TD>
+                       <TD WIDTH=25%>
+                               <P>24 bytes</P>
+                       </TD>
+               </TR>
+               <TR VALIGN=TOP>
+                       <TD WIDTH=18%>
+                               <P><B>Total</B></P>
+                       </TD>
+                       <TD WIDTH=32%>
+                               <P><BR>
+                               </P>
+                       </TD>
+                       <TD WIDTH=25%>
+                               <P ALIGN=LEFT><B>30 bytes</B></P>
+                       </TD>
+                       <TD WIDTH=25%>
+                               <P><B>42 bytes</B></P>
+                       </TD>
+               </TR>
+       </TBODY>
+</TABLE>
+<P><BR><BR>
+</P>
+<P>To get enough spare bytes for this tagging structure requires a
+chunk-size of at least 1kB. YAFFS1 is still used for 512-byte chunk
+sizes.</P>
+<P>The blockSequence increments each time a block is allocated. (ie.
+the first block allocated is block 1, and so on).</P>
+<H4>Scanning</H4>
+<P>The only reason we need to keep track of data status on NAND is to
+be able to recreate the file system state during scanning. Since we
+no longer have chunk deletion status flags we use a slightly
+different process for scanning a YAFFS2 system.</P>
+<P>In effect, YAFFS2 recreates its state by &quot;replaying the
+tape&quot;. ie. it scans the chunks in their allocation order (block
+sequence Id order) rather than in their order on the media. This
+implies that at start up, the blocks must be read and their block
+sequence determined.</P>
+<H4>Performance</H4>
+<P>These  numbers are indicative of relative performance. These only
+apply to the NAND data transfer and do not include other overheads.</P>
+<P>As an example, read/write cycle times of 100nS are used (though
+NAND can typically do 50nS), &quot;seek time&quot; of 10uS and
+program time of 200uS. Mileage will vary.</P>
+<P>NB x16 means using a 16-bit bus. Clearly this cuts down on data
+transfer time relative to an 8-bit bus.</P>
+<P>Times for 2kB read(units of 1uS).</P>
+<TABLE WIDTH=937 BORDER=1 CELLPADDING=4 CELLSPACING=3>
+       <COL WIDTH=175>
+       <COL WIDTH=176>
+       <COL WIDTH=177>
+       <COL WIDTH=176>
+       <COL WIDTH=173>
+       <THEAD>
+               <TR VALIGN=TOP>
+                       <TH WIDTH=175>
+                               <P>Operation</P>
+                       </TH>
+                       <TH WIDTH=176>
+                               <P>YAFFS1</P>
+                       </TH>
+                       <TH WIDTH=177>
+                               <P>YAFFS2 (512b pages)</P>
+                       </TH>
+                       <TH WIDTH=176>
+                               <P>YAFFS2 (2kB pages)</P>
+                       </TH>
+                       <TH WIDTH=173>
+                               <P>YAFFS2(2kB pages, x16)</P>
+                       </TH>
+               </TR>
+       </THEAD>
+       <TBODY>
+               <TR>
+                       <TD WIDTH=175 VALIGN=TOP>
+                               <P>Seek 
+                               </P>
+                       </TD>
+                       <TD WIDTH=176 VALIGN=BOTTOM SDVAL="40" SDNUM="5129;">
+                               <P ALIGN=RIGHT>40</P>
+                       </TD>
+                       <TD WIDTH=177 VALIGN=BOTTOM SDVAL="40" SDNUM="5129;">
+                               <P ALIGN=RIGHT>40</P>
+                       </TD>
+                       <TD WIDTH=176 VALIGN=BOTTOM SDVAL="10" SDNUM="5129;">
+                               <P ALIGN=RIGHT>10</P>
+                       </TD>
+                       <TD WIDTH=173 VALIGN=BOTTOM SDVAL="10" SDNUM="5129;">
+                               <P ALIGN=RIGHT>10</P>
+                       </TD>
+               </TR>
+               <TR>
+                       <TD WIDTH=175 VALIGN=TOP>
+                               <P>Read</P>
+                       </TD>
+                       <TD WIDTH=176 VALIGN=BOTTOM SDVAL="220" SDNUM="5129;">
+                               <P ALIGN=RIGHT>220</P>
+                       </TD>
+                       <TD WIDTH=177 VALIGN=BOTTOM SDVAL="220" SDNUM="5129;">
+                               <P ALIGN=RIGHT>220</P>
+                       </TD>
+                       <TD WIDTH=176 VALIGN=BOTTOM SDVAL="220" SDNUM="5129;">
+                               <P ALIGN=RIGHT>220</P>
+                       </TD>
+                       <TD WIDTH=173 VALIGN=BOTTOM SDVAL="110" SDNUM="5129;">
+                               <P ALIGN=RIGHT>110</P>
+                       </TD>
+               </TR>
+               <TR>
+                       <TD WIDTH=175 VALIGN=TOP>
+                               <P>Total</P>
+                       </TD>
+                       <TD WIDTH=176 VALIGN=BOTTOM SDVAL="260" SDNUM="5129;">
+                               <P ALIGN=RIGHT>260</P>
+                       </TD>
+                       <TD WIDTH=177 VALIGN=BOTTOM SDVAL="260" SDNUM="5129;">
+                               <P ALIGN=RIGHT>260</P>
+                       </TD>
+                       <TD WIDTH=176 VALIGN=BOTTOM SDVAL="230" SDNUM="5129;">
+                               <P ALIGN=RIGHT>230</P>
+                       </TD>
+                       <TD WIDTH=173 VALIGN=BOTTOM SDVAL="120" SDNUM="5129;">
+                               <P ALIGN=RIGHT>120</P>
+                       </TD>
+               </TR>
+               <TR>
+                       <TD WIDTH=175 VALIGN=TOP>
+                               <P>MB/s</P>
+                       </TD>
+                       <TD WIDTH=176 VALIGN=BOTTOM SDVAL="7.6" SDNUM="5129;">
+                               <P ALIGN=RIGHT>7.6</P>
+                       </TD>
+                       <TD WIDTH=177 VALIGN=BOTTOM SDVAL="7.6" SDNUM="5129;">
+                               <P ALIGN=RIGHT>7.6</P>
+                       </TD>
+                       <TD WIDTH=176 VALIGN=BOTTOM SDVAL="8.7" SDNUM="5129;">
+                               <P ALIGN=RIGHT>8.7</P>
+                       </TD>
+                       <TD WIDTH=173 VALIGN=BOTTOM SDVAL="16.7" SDNUM="5129;">
+                               <P ALIGN=RIGHT>16.7</P>
+                       </TD>
+               </TR>
+               <TR>
+                       <TD WIDTH=175 VALIGN=TOP>
+                               <P>Relative speed</P>
+                       </TD>
+                       <TD WIDTH=176 VALIGN=BOTTOM SDVAL="1" SDNUM="5129;">
+                               <P ALIGN=RIGHT>1</P>
+                       </TD>
+                       <TD WIDTH=177 VALIGN=BOTTOM SDVAL="1" SDNUM="5129;">
+                               <P ALIGN=RIGHT>1</P>
+                       </TD>
+                       <TD WIDTH=176 VALIGN=BOTTOM SDVAL="1.1" SDNUM="5129;">
+                               <P ALIGN=RIGHT>1.1</P>
+                       </TD>
+                       <TD WIDTH=173 VALIGN=BOTTOM SDVAL="2.2" SDNUM="5129;">
+                               <P ALIGN=RIGHT>2.2</P>
+                       </TD>
+               </TR>
+       </TBODY>
+</TABLE>
+<P><BR><BR>
+</P>
+<P>Times for 2kB writes(units of 1uS).</P>
+<TABLE WIDTH=100% BORDER=1 CELLPADDING=4 CELLSPACING=3>
+       <COL WIDTH=51*>
+       <COL WIDTH=51*>
+       <COL WIDTH=51*>
+       <COL WIDTH=51*>
+       <COL WIDTH=51*>
+       <THEAD>
+               <TR VALIGN=TOP>
+                       <TH WIDTH=20%>
+                               <P>Operation</P>
+                       </TH>
+                       <TH WIDTH=20%>
+                               <P>YAFFS1</P>
+                       </TH>
+                       <TH WIDTH=20%>
+                               <P>YAFFS2 (512b pages)</P>
+                       </TH>
+                       <TH WIDTH=20%>
+                               <P>YAFFS2 (2kB pages)</P>
+                       </TH>
+                       <TH WIDTH=20%>
+                               <P>YAFFS2(2kB pages, x16)</P>
+                       </TH>
+               </TR>
+       </THEAD>
+       <TBODY>
+               <TR>
+                       <TD WIDTH=20% VALIGN=TOP>
+                               <P>Seek</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="40" SDNUM="5129;">
+                               <P ALIGN=RIGHT>40</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="40" SDNUM="5129;">
+                               <P ALIGN=RIGHT>40</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="10" SDNUM="5129;">
+                               <P ALIGN=RIGHT>10</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="10" SDNUM="5129;">
+                               <P ALIGN=RIGHT>10</P>
+                       </TD>
+               </TR>
+               <TR>
+                       <TD WIDTH=20% VALIGN=TOP>
+                               <P>Program</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="800" SDNUM="5129;">
+                               <P ALIGN=RIGHT>800</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="800" SDNUM="5129;">
+                               <P ALIGN=RIGHT>800</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="200" SDNUM="5129;">
+                               <P ALIGN=RIGHT>200</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="200" SDNUM="5129;">
+                               <P ALIGN=RIGHT>200</P>
+                       </TD>
+               </TR>
+               <TR>
+                       <TD WIDTH=20% VALIGN=TOP>
+                               <P>Seek</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="40" SDNUM="5129;">
+                               <P ALIGN=RIGHT>40</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="40" SDNUM="5129;">
+                               <P ALIGN=RIGHT>40</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="10" SDNUM="5129;">
+                               <P ALIGN=RIGHT>10</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="10" SDNUM="5129;">
+                               <P ALIGN=RIGHT>10</P>
+                       </TD>
+               </TR>
+               <TR>
+                       <TD WIDTH=20% VALIGN=TOP>
+                               <P>Read</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="220" SDNUM="5129;">
+                               <P ALIGN=RIGHT>220</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="220" SDNUM="5129;">
+                               <P ALIGN=RIGHT>220</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="220" SDNUM="5129;">
+                               <P ALIGN=RIGHT>220</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="110" SDNUM="5129;">
+                               <P ALIGN=RIGHT>110</P>
+                       </TD>
+               </TR>
+               <TR>
+                       <TD WIDTH=20% VALIGN=TOP>
+                               <P>Total</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="1320" SDNUM="5129;">
+                               <P ALIGN=RIGHT>1320</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="1320" SDNUM="5129;">
+                               <P ALIGN=RIGHT>1320</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="660" SDNUM="5129;">
+                               <P ALIGN=RIGHT>660</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="440" SDNUM="5129;">
+                               <P ALIGN=RIGHT>440</P>
+                       </TD>
+               </TR>
+               <TR>
+                       <TD WIDTH=20% VALIGN=TOP>
+                               <P>MB/s</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="1.5" SDNUM="5129;">
+                               <P ALIGN=RIGHT>1.5</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="1.5" SDNUM="5129;">
+                               <P ALIGN=RIGHT>1.5</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="3" SDNUM="5129;">
+                               <P ALIGN=RIGHT>3</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="4.5" SDNUM="5129;">
+                               <P ALIGN=RIGHT>4.5</P>
+                       </TD>
+               </TR>
+               <TR>
+                       <TD WIDTH=20% VALIGN=TOP>
+                               <P>Relative speed</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="1" SDNUM="5129;">
+                               <P ALIGN=RIGHT>1</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="1" SDNUM="5129;">
+                               <P ALIGN=RIGHT>1</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="2" SDNUM="5129;">
+                               <P ALIGN=RIGHT>2</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="3" SDNUM="5129;">
+                               <P ALIGN=RIGHT>3</P>
+                       </TD>
+               </TR>
+       </TBODY>
+</TABLE>
+<P><BR><BR>
+</P>
+<P>Times for 1MB delete (units of 1uS).</P>
+<TABLE WIDTH=100% BORDER=1 CELLPADDING=4 CELLSPACING=3>
+       <COL WIDTH=51*>
+       <COL WIDTH=51*>
+       <COL WIDTH=51*>
+       <COL WIDTH=51*>
+       <COL WIDTH=51*>
+       <THEAD>
+               <TR VALIGN=TOP>
+                       <TH WIDTH=20%>
+                               <P>Operation</P>
+                       </TH>
+                       <TH WIDTH=20%>
+                               <P>YAFFS1</P>
+                       </TH>
+                       <TH WIDTH=20%>
+                               <P>YAFFS2 (512b pages)</P>
+                       </TH>
+                       <TH WIDTH=20%>
+                               <P>YAFFS2 (2kB pages)</P>
+                       </TH>
+                       <TH WIDTH=20%>
+                               <P>YAFFS2(2kB pages, x16)</P>
+                       </TH>
+               </TR>
+       </THEAD>
+       <TBODY>
+               <TR>
+                       <TD WIDTH=20% VALIGN=TOP>
+                               <P>Seek</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="20480" SDNUM="5129;">
+                               <P ALIGN=RIGHT>20480</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="0" SDNUM="5129;">
+                               <P ALIGN=RIGHT>0</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="0" SDNUM="5129;">
+                               <P ALIGN=RIGHT>0</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="0" SDNUM="5129;">
+                               <P ALIGN=RIGHT>0</P>
+                       </TD>
+               </TR>
+               <TR>
+                       <TD WIDTH=20% VALIGN=TOP>
+                               <P>Program</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="409600" SDNUM="5129;">
+                               <P ALIGN=RIGHT>409600</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="0" SDNUM="5129;">
+                               <P ALIGN=RIGHT>0</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="0" SDNUM="5129;">
+                               <P ALIGN=RIGHT>0</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="0" SDNUM="5129;">
+                               <P ALIGN=RIGHT>0</P>
+                       </TD>
+               </TR>
+               <TR>
+                       <TD WIDTH=20% VALIGN=TOP>
+                               <P>Erase</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="128000" SDNUM="5129;">
+                               <P ALIGN=RIGHT>128000</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="128000" SDNUM="5129;">
+                               <P ALIGN=RIGHT>128000</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="16000" SDNUM="5129;">
+                               <P ALIGN=RIGHT>16000</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="16000" SDNUM="5129;">
+                               <P ALIGN=RIGHT>16000</P>
+                       </TD>
+               </TR>
+               <TR>
+                       <TD WIDTH=20% VALIGN=TOP>
+                               <P>Total</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="558080" SDNUM="5129;">
+                               <P ALIGN=RIGHT>558080</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="128000" SDNUM="5129;">
+                               <P ALIGN=RIGHT>128000</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="16000" SDNUM="5129;">
+                               <P ALIGN=RIGHT>16000</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="16000" SDNUM="5129;">
+                               <P ALIGN=RIGHT>16000</P>
+                       </TD>
+               </TR>
+               <TR>
+                       <TD WIDTH=20% VALIGN=TOP>
+                               <P>MB/s</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="1.8" SDNUM="5129;">
+                               <P ALIGN=RIGHT>1.8</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="7.8" SDNUM="5129;">
+                               <P ALIGN=RIGHT>7.8</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="62.5" SDNUM="5129;">
+                               <P ALIGN=RIGHT>62.5</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="62.5" SDNUM="5129;">
+                               <P ALIGN=RIGHT>62.5</P>
+                       </TD>
+               </TR>
+               <TR>
+                       <TD WIDTH=20% VALIGN=TOP>
+                               <P>Relative speed</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="1" SDNUM="5129;">
+                               <P ALIGN=RIGHT>1</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="4" SDNUM="5129;">
+                               <P ALIGN=RIGHT>4</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="34" SDNUM="5129;">
+                               <P ALIGN=RIGHT>34</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="34" SDNUM="5129;">
+                               <P ALIGN=RIGHT>34</P>
+                       </TD>
+               </TR>
+       </TBODY>
+</TABLE>
+<P><BR><BR>
+</P>
+<P>Times for 1MB of garbage collection at 50% dirty (units of 1uS).</P>
+<TABLE WIDTH=100% BORDER=1 CELLPADDING=4 CELLSPACING=3>
+       <COL WIDTH=51*>
+       <COL WIDTH=51*>
+       <COL WIDTH=51*>
+       <COL WIDTH=51*>
+       <COL WIDTH=51*>
+       <THEAD>
+               <TR VALIGN=TOP>
+                       <TH WIDTH=20%>
+                               <P>Operation</P>
+                       </TH>
+                       <TH WIDTH=20%>
+                               <P>YAFFS1</P>
+                       </TH>
+                       <TH WIDTH=20%>
+                               <P>YAFFS2 (512b pages)</P>
+                       </TH>
+                       <TH WIDTH=20%>
+                               <P>YAFFS2 (2kB pages)</P>
+                       </TH>
+                       <TH WIDTH=20%>
+                               <P>YAFFS2(2kB pages, x16)</P>
+                       </TH>
+               </TR>
+       </THEAD>
+       <TBODY>
+               <TR>
+                       <TD WIDTH=20% VALIGN=TOP>
+                               <P>Delete 1MB</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="558080" SDNUM="5129;">
+                               <P ALIGN=RIGHT>558080</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="128000" SDNUM="5129;">
+                               <P ALIGN=RIGHT>128000</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="16000" SDNUM="5129;">
+                               <P ALIGN=RIGHT>16000</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="16000" SDNUM="5129;">
+                               <P ALIGN=RIGHT>16000</P>
+                       </TD>
+               </TR>
+               <TR>
+                       <TD WIDTH=20% VALIGN=TOP>
+                               <P>Write 0.5MB</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="337920" SDNUM="5129;">
+                               <P ALIGN=RIGHT>337920</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="337920" SDNUM="5129;">
+                               <P ALIGN=RIGHT>337920</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="168960" SDNUM="5129;">
+                               <P ALIGN=RIGHT>168960</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="112640" SDNUM="5129;">
+                               <P ALIGN=RIGHT>112640</P>
+                       </TD>
+               </TR>
+               <TR>
+                       <TD WIDTH=20% VALIGN=TOP>
+                               <P>Total</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="896000" SDNUM="5129;">
+                               <P ALIGN=RIGHT>896000</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="465920" SDNUM="5129;">
+                               <P ALIGN=RIGHT>465920</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="184960" SDNUM="5129;">
+                               <P ALIGN=RIGHT>184960</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="128640" SDNUM="5129;">
+                               <P ALIGN=RIGHT>128640</P>
+                       </TD>
+               </TR>
+               <TR>
+                       <TD WIDTH=20% VALIGN=TOP>
+                               <P>MB/s</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="1.1" SDNUM="5129;">
+                               <P ALIGN=RIGHT>1.1</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="2.1" SDNUM="5129;">
+                               <P ALIGN=RIGHT>2.1</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="5.4" SDNUM="5129;">
+                               <P ALIGN=RIGHT>5.4</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="7.7" SDNUM="5129;">
+                               <P ALIGN=RIGHT>7.7</P>
+                       </TD>
+               </TR>
+               <TR>
+                       <TD WIDTH=20% VALIGN=TOP>
+                               <P>Relative speed</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="1" SDNUM="5129;">
+                               <P ALIGN=RIGHT>1</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="1.9" SDNUM="5129;">
+                               <P ALIGN=RIGHT>1.9</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="4.9" SDNUM="5129;">
+                               <P ALIGN=RIGHT>4.9</P>
+                       </TD>
+                       <TD WIDTH=20% VALIGN=BOTTOM SDVAL="7" SDNUM="5129;">
+                               <P ALIGN=RIGHT>7</P>
+                       </TD>
+               </TR>
+       </TBODY>
+</TABLE>
+<P><BR><BR>
+</P>
+<P>$Id: yaffs2.html,v 1.1 2002-11-26 01:15:37 charles Exp $</P>
+<P><BR><BR>
+</P>
+<P><BR><BR>
+</P>
+</BODY>
+</HTML>
\ No newline at end of file
index bba25e739469b643ea5c4b24b23b25339a094a8e..f35591eb58af416e0d3407beb89b4b8c3fa00188 100644 (file)
@@ -6,7 +6,7 @@
        <META NAME="GENERATOR" CONTENT="StarOffice/5.2 (Linux)">
        <META NAME="CREATED" CONTENT="20020517;23103700">
        <META NAME="CHANGEDBY" CONTENT=" ">
-       <META NAME="CHANGED" CONTENT="20020531;19314400">
+       <META NAME="CHANGED" CONTENT="20021126;14003000">
 </HEAD>
 <BODY>
 <H2 ALIGN=CENTER>Running up YAFFS using the MTD interface</H2>
@@ -80,6 +80,11 @@ NAND, with a few issues. </FONT>
 </P>
 <P><BR><BR>
 </P>
+<P><FONT FACE="Times, serif">$Id: yaffs_on_mtd.html,v 1.3 2002-11-26 01:15:38 charles Exp $</FONT></P>
+<P><BR><BR>
+</P>
+<P><BR><BR>
+</P>
 <P><BR><BR>
 </P>
 </BODY>
index e8c77e10c6823dd1a0599540f4e18ea56c82173b..633c1b124c4c8b45131feb92f2defe2ff1d553a0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@
 # it under the terms of the GNU General Public License version 2 as
 # published by the Free Software Foundation.
 #
-# $Id: Makefile,v 1.7 2002-11-08 07:19:41 charles Exp $
+# $Id: Makefile,v 1.8 2002-11-26 01:15:37 charles Exp $
 #
 
 ## Change or override  KERNELDIR to your kernel
@@ -36,6 +36,19 @@ USE_RAM_FOR_TEST = -DCONFIG_YAFFS_RAM_ENABLED
 
 USE_MTD = -DCONFIG_YAFFS_MTD_ENABLED
 
+# CONFIG_YAFFS_USE_OLD_MTD
+# Enable this to use the old MTD stuff that did not have yaffs support.
+# You can use this to get around compilation problems, but the best
+# thing to do is to upgrade your MTD support. You will get better speed.
+
+#USE_OLD_MTD = -DCONFIG_YAFFS_USE_OLD_MTD
+
+# CONFIG_YAFFS_USE_NANDECC
+# This enables the ECC functions of the generic MTD-NAND driver.
+# This will not work if you are using the old mtd.
+
+USE_NANDECC = -DCONFIG_YAFFS_USE_NANDECC
+
 # CONFIG_YAFFS_USE_GENERIC_RW
 # Use generic_read/generic_write for reading/writing files. This enables the use of the Linux
 # file caching layer.
@@ -77,7 +90,7 @@ ENABLE_SHORT_NAMES_IN_RAM = -DCONFIG_SHORT_NAMES_IN_RAM
 # End of configuration options.
 
 YAFFS_CONFIGS = $(USE_RAM_FOR_TEST) $(USE_MTD) $(USE_GENERIC_RW) $(USE_HEADER_FILE_SIZE) $(IGNORE_CHUNK_ERASED) $(IGNORE_WRITE_VERIFY) \
-                $(ENABLE_SHORT_NAMES_IN_RAM)
+                $(ENABLE_SHORT_NAMES_IN_RAM) $(USE_NANDECC) $(USE_OLD_MTD)
 
 
 CFLAGS = -D__KERNEL__ -DMODULE $(YAFFS_CONFIGS)  -I$(KERNELDIR)/include -O2 -Wall
index 58d3abdfa0965e18230ee4f966405482f84d3b7f..c27a5cbeff9a75821e119542ef8ba92a27a32b6a 100644 (file)
@@ -1,6 +1,6 @@
 #########################################################
 # Makefile auto generated by Cygnus Source Navigator.
-# Target: yaffsdev_disk Date: Nov 08 2002 Time: 07:50:14 PM
+# Target: yaffsdev_disk Date: Nov 26 2002 Time: 01:05:25 PM
 #
 
 
index 473078edb40294c061d6694e6ac9875b5e43c3e4..da3b7f923daa288db1bca8efa4eaf0d635abb940 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 
-const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.19 2002-11-22 00:12:23 charles Exp $";
+const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.20 2002-11-26 01:15:37 charles Exp $";
 extern const char *yaffs_guts_c_version;
 
 
@@ -67,7 +67,7 @@ unsigned yaffs_traceMask = YAFFS_TRACE_ALWAYS | YAFFS_TRACE_BAD_BLOCKS;
 #include "yaffs_mtdif.h"
 #endif //CONFIG_YAFFS_MTD_ENABLED
 
-#define T(x) printk x
+//#define T(x) printk x
 
 
 
@@ -182,14 +182,14 @@ static struct super_operations yaffs_super_ops = {
 
 static void yaffs_GrossLock(yaffs_Device *dev)
 {
-       T((KERN_DEBUG"yaffs locking\n"));
+       T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs locking\n"));
 
        down(&dev->grossLock);
 }
 
 static void yaffs_GrossUnlock(yaffs_Device *dev)
 {
-       T((KERN_DEBUG"yaffs unlocking\n"));
+       T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs unlocking\n"));
        up(&dev->grossLock);
 
 }
@@ -254,7 +254,7 @@ static struct dentry * yaffs_lookup(struct inode *dir, struct dentry *dentry)
        yaffs_GrossLock(dev);
 
        
-       T((KERN_DEBUG"yaffs_lookup for %d:%s\n",yaffs_InodeToObject(dir)->objectId,dentry->d_name.name));
+       T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_lookup for %d:%s\n",yaffs_InodeToObject(dir)->objectId,dentry->d_name.name));
        
        obj = yaffs_FindObjectByName(yaffs_InodeToObject(dir),dentry->d_name.name);
        
@@ -264,13 +264,13 @@ static struct dentry * yaffs_lookup(struct inode *dir, struct dentry *dentry)
        
        if(obj)
        {
-               T((KERN_DEBUG"yaffs_lookup found %d\n",obj->objectId));
+               T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_lookup found %d\n",obj->objectId));
                
                inode = yaffs_get_inode(dir->i_sb, obj->st_mode,0,obj);
                
                if(inode)
                {
-                       T((KERN_DEBUG"yaffs_loookup dentry \n"));
+                       T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_loookup dentry \n"));
                        //dget(dentry); // try to solve directory bug
                        d_add(dentry,inode);
                        
@@ -283,7 +283,7 @@ static struct dentry * yaffs_lookup(struct inode *dir, struct dentry *dentry)
        }
        else
        {
-               T((KERN_DEBUG"yaffs_lookup not found\n"));
+               T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_lookup not found\n"));
                
        }
        yaffs_GrossUnlock(dev);
@@ -297,7 +297,7 @@ static struct dentry * yaffs_lookup(struct inode *dir, struct dentry *dentry)
 // Put inode is called when the inode **structure** is put.
 static void yaffs_put_inode(struct inode *inode)
 {
-       T(("yaffs_put_inode: ino %d, count %d\n",(int)inode->i_ino, atomic_read(&inode->i_count)));
+       T(YAFFS_TRACE_OS,("yaffs_put_inode: ino %d, count %d\n",(int)inode->i_ino, atomic_read(&inode->i_count)));
        
 }
 
@@ -306,7 +306,7 @@ static void yaffs_clear_inode(struct inode *inode)
 {
        yaffs_Object *obj = yaffs_InodeToObject(inode);
        
-       T(("yaffs_clear_inode: ino %d, count %d %s\n",(int)inode->i_ino, atomic_read(&inode->i_count),
+       T(YAFFS_TRACE_OS,("yaffs_clear_inode: ino %d, count %d %s\n",(int)inode->i_ino, atomic_read(&inode->i_count),
                obj ? "object exists" : "null object"));        
 
        if(obj)
@@ -327,7 +327,7 @@ static void yaffs_delete_inode(struct inode *inode)
        yaffs_Object *obj = yaffs_InodeToObject(inode);
        yaffs_Device *dev;
 
-       T(("yaffs_delete_inode: ino %d, count %d %s\n",(int)inode->i_ino, atomic_read(&inode->i_count),
+       T(YAFFS_TRACE_OS,("yaffs_delete_inode: ino %d, count %d %s\n",(int)inode->i_ino, atomic_read(&inode->i_count),
                obj ? "object exists" : "null object"));
        
        if(obj)
@@ -347,7 +347,7 @@ static int yaffs_file_flush(struct file* file)
        
        yaffs_Device *dev = obj->myDev;
        
-       T((KERN_DEBUG"yaffs_file_flush object %d (%s)\n",obj->objectId,
+       T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_file_flush object %d (%s)\n",obj->objectId,
                                obj->dirty ? "dirty" : "clean"));
 
        yaffs_GrossLock(dev);
@@ -371,7 +371,7 @@ static int yaffs_readpage_nolock(struct file *f, struct page * pg)
        
        yaffs_Device *dev;
        
-       T((KERN_DEBUG"yaffs_readpage at %08x, size %08x\n", 
+       T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_readpage at %08x, size %08x\n", 
                      (unsigned)(pg->index << PAGE_CACHE_SHIFT), (unsigned)PAGE_CACHE_SIZE));
 
        obj  = yaffs_DentryToObject(f->f_dentry);
@@ -405,7 +405,7 @@ static int yaffs_readpage_nolock(struct file *f, struct page * pg)
        kunmap(pg);
 
 
-       T((KERN_DEBUG"yaffs_readpage done\n"));
+       T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_readpage done\n"));
        return ret;
 }
 
@@ -425,7 +425,7 @@ static int yaffs_readpage(struct file *f, struct page * pg)
 static int yaffs_prepare_write(struct file *f, struct page *pg, unsigned offset, unsigned to)
 {
 
-       T((KERN_DEBUG"yaffs_prepair_write\n"));
+       T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_prepair_write\n"));
        if(!Page_Uptodate(pg) && (offset || to < PAGE_CACHE_SIZE))
                return  yaffs_readpage_nolock(f,pg);    
 
@@ -444,13 +444,13 @@ static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
        unsigned spos = pos;
        unsigned saddr = (unsigned)addr;
 
-       T((KERN_DEBUG"yaffs_commit_write addr %x pos %x nBytes %d\n",saddr,spos,nBytes));
+       T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_commit_write addr %x pos %x nBytes %d\n",saddr,spos,nBytes));
        
        nWritten = yaffs_file_write(f,addr, nBytes, &pos);
        
        if(nWritten != nBytes)
        {
-               T((KERN_DEBUG"yaffs_commit_write not same size nWritten %d  nBytes %d\n",nWritten,nBytes));
+               T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_commit_write not same size nWritten %d  nBytes %d\n",nWritten,nBytes));
                SetPageError(pg);
                ClearPageUptodate(pg);
        }
@@ -459,7 +459,7 @@ static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset,
                SetPageUptodate(pg);
        }
 
-       T((KERN_DEBUG"yaffs_commit_write returning %d\n",nWritten));
+       T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_commit_write returning %d\n",nWritten));
        
        return nWritten;
 
@@ -484,7 +484,7 @@ static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object *obj)
                inode->i_size = yaffs_GetObjectFileLength(obj);
                inode->i_nlink = yaffs_GetObjectLinkCount(obj);
                
-               T((KERN_DEBUG"yaffs_FillInode mode %x uid %d gid %d size %d count %d\n",
+               T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_FillInode mode %x uid %d gid %d size %d count %d\n",
                                inode->i_mode, inode->i_uid, inode->i_gid, (int)inode->i_size, atomic_read(&inode->i_count)));
                
                switch (obj->st_mode & S_IFMT) 
@@ -513,7 +513,7 @@ static void yaffs_FillInodeFromObject(struct inode *inode, yaffs_Object *obj)
        }
        else
        {
-               T((KERN_DEBUG"yaffs_FileInode invalid parameters\n"));
+               T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_FileInode invalid parameters\n"));
        }
 
 }
@@ -522,7 +522,7 @@ struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,yaffs_Ob
 {
        struct inode * inode;
        
-       T((KERN_DEBUG"yaffs_get_inode for object %d\n",obj->objectId));
+       T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_get_inode for object %d\n",obj->objectId));
 
        inode = iget(sb,obj->objectId);
 
@@ -539,7 +539,7 @@ static ssize_t yaffs_file_read(struct file *f, char *buf, size_t n, loff_t *pos)
        struct inode *inode;
        yaffs_Device *dev;
        
-       T((KERN_DEBUG"yaffs_file_read\n"));
+       T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_file_read\n"));
 
        obj  = yaffs_DentryToObject(f->f_dentry);
        
@@ -571,7 +571,7 @@ static ssize_t yaffs_file_read(struct file *f, char *buf, size_t n, loff_t *pos)
        
        ipos = *pos;
        
-       T((KERN_DEBUG"yaffs_file_read read %d bytes, %d read at %d\n",n,nRead,ipos));
+       T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_file_read read %d bytes, %d read at %d\n",n,nRead,ipos));
        return nRead;
        
 }
@@ -605,16 +605,16 @@ static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, loff_
        
        if(!obj)
        {
-               T((KERN_DEBUG"yaffs_file_write: hey obj is null!\n"));
+               T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_file_write: hey obj is null!\n"));
        }
        else
        {
-               T((KERN_DEBUG"yaffs_file_write about to write writing %d bytes to object %d at %d\n",n,obj->objectId,ipos));
+               T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_file_write about to write writing %d bytes to object %d at %d\n",n,obj->objectId,ipos));
        }
 
        nWritten = yaffs_WriteDataToFile(obj,buf,ipos,n);
 
-       T((KERN_DEBUG"yaffs_file_write writing %d bytes, %d written at %d\n",n,nWritten,ipos));
+       T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_file_write writing %d bytes, %d written at %d\n",n,nWritten,ipos));
        if(nWritten > 0)
        {
                ipos += nWritten;
@@ -624,7 +624,7 @@ static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, loff_
                        inode->i_size = ipos;
                        inode->i_blocks = (ipos + inode->i_blksize - 1)/ inode->i_blksize;
                        
-                       T((KERN_DEBUG"yaffs_file_write size updated to %d bytes, %d blocks\n",ipos,(int)(inode->i_blocks)));
+                       T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_file_write size updated to %d bytes, %d blocks\n",ipos,(int)(inode->i_blocks)));
                }
                
        }
@@ -652,11 +652,11 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
        
        offset = f->f_pos;
        
-       T(("yaffs_readdir: starting at %d\n",(int)offset));
+       T(YAFFS_TRACE_OS,("yaffs_readdir: starting at %d\n",(int)offset));
        
        if(offset == 0)
        {
-        T((KERN_DEBUG"yaffs_readdir: entry . ino %d \n",(int)inode->i_ino));
+        T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_readdir: entry . ino %d \n",(int)inode->i_ino));
                if(filldir(dirent,".",1,offset,inode->i_ino,DT_DIR) < 0)
                {
                        goto out;
@@ -666,7 +666,7 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
        }
        if(offset == 1)
        {
-               T((KERN_DEBUG"yaffs_readdir: entry .. ino %d \n",(int)f->f_dentry->d_parent->d_inode->i_ino));
+               T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_readdir: entry .. ino %d \n",(int)f->f_dentry->d_parent->d_inode->i_ino));
                if(filldir(dirent,"..",2,offset,f->f_dentry->d_parent->d_inode->i_ino,DT_DIR) < 0)
                {
                        goto out;
@@ -685,7 +685,7 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)
                        l = list_entry(i, yaffs_Object,siblings);
                        
                        yaffs_GetObjectName(l,name,YAFFS_MAX_NAME_LENGTH+1); 
-                       T((KERN_DEBUG"yaffs_readdir: %s inode %d\n",name,yaffs_GetObjectInode(l)));
+                       T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_readdir: %s inode %d\n",name,yaffs_GetObjectInode(l)));
                        
                        if(filldir(dirent,
                                           name,
@@ -728,16 +728,16 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, int r
 
        if(parent)
        {
-               T((KERN_DEBUG"yaffs_mknod: parent object %d type %d\n",
+               T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_mknod: parent object %d type %d\n",
                                         parent->objectId,parent->variantType));
        }
        else
        {
-               T((KERN_DEBUG"yaffs_mknod: could not get parent object\n"));
+               T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_mknod: could not get parent object\n"));
                return -EPERM;
        }
        
-       T(("yaffs_mknod: making oject for %s, mode %x dev %x\n",
+       T(YAFFS_TRACE_OS,("yaffs_mknod: making oject for %s, mode %x dev %x\n",
                                        dentry->d_name.name, mode,rdev));
 
        dev = parent->myDev;
@@ -748,19 +748,19 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, int r
        {
                default:
                        // Special (socket, fifo, device...)
-                       T((KERN_DEBUG"yaffs_mknod: making special\n"));
+                       T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_mknod: making special\n"));
                        obj = yaffs_MknodSpecial(parent,dentry->d_name.name,mode,current->uid, current->gid,rdev);
                        break;
                case S_IFREG:   // file         
-                       T((KERN_DEBUG"yaffs_mknod: making file\n"));
+                       T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_mknod: making file\n"));
                        obj = yaffs_MknodFile(parent,dentry->d_name.name,mode,current->uid, current->gid);
                        break;
                case S_IFDIR:   // directory
-                       T((KERN_DEBUG"yaffs_mknod: making directory\n"));
+                       T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_mknod: making directory\n"));
                        obj = yaffs_MknodDirectory(parent,dentry->d_name.name,mode,current->uid, current->gid);
                        break;
                case S_IFLNK:   // symlink
-                       T((KERN_DEBUG"yaffs_mknod: making file\n"));
+                       T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_mknod: making file\n"));
                        obj = NULL; // Do we ever get here?
                        break;
        }
@@ -769,12 +769,12 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, int r
        {
                inode = yaffs_get_inode(dir->i_sb, mode, rdev, obj);
                d_instantiate(dentry, inode);
-               T((KERN_DEBUG"yaffs_mknod created object %d count = %d\n",obj->objectId,atomic_read(&inode->i_count)));
+               T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_mknod created object %d count = %d\n",obj->objectId,atomic_read(&inode->i_count)));
                error = 0;
        }
        else
        {
-               T((KERN_DEBUG"yaffs_mknod failed making object\n"));
+               T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_mknod failed making object\n"));
                error = -ENOMEM;
        }
 
@@ -786,7 +786,7 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, int r
 static int yaffs_mkdir(struct inode * dir, struct dentry * dentry, int mode)
 {
        int retVal;
-       T((KERN_DEBUG"yaffs_mkdir\n"));
+       T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_mkdir\n"));
        retVal =  yaffs_mknod(dir, dentry, mode | S_IFDIR, 0);
 #if 0
  // attempt to fix dir bug - didn't work
@@ -800,7 +800,7 @@ static int yaffs_mkdir(struct inode * dir, struct dentry * dentry, int mode)
 
 static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode)
 {
-       T((KERN_DEBUG"yaffs_create\n"));
+       T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_create\n"));
        return yaffs_mknod(dir, dentry, mode | S_IFREG, 0);
 }
 
@@ -808,12 +808,11 @@ static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode)
 static int yaffs_unlink(struct inode * dir, struct dentry *dentry)
 {
        int retVal;
-       int nlinks;
        
        yaffs_Device *dev;
        
        
-       T((KERN_DEBUG"yaffs_unlink %d:%s\n",(int)(dir->i_ino),dentry->d_name.name));
+       T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_unlink %d:%s\n",(int)(dir->i_ino),dentry->d_name.name));
        
        dev = yaffs_InodeToObject(dir)->myDev;
        
@@ -848,7 +847,7 @@ static int yaffs_link(struct dentry *old_dentry, struct inode * dir, struct dent
        yaffs_Object *link=NULL;
        yaffs_Device *dev;
        
-       T((KERN_DEBUG"yaffs_link\n"));
+       T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_link\n"));
        
        obj = yaffs_InodeToObject(inode);
        dev = obj->myDev;
@@ -863,7 +862,7 @@ static int yaffs_link(struct dentry *old_dentry, struct inode * dir, struct dent
                old_dentry->d_inode->i_nlink =  yaffs_GetObjectLinkCount(obj);
                d_instantiate(dentry, old_dentry->d_inode);
                atomic_inc(&old_dentry->d_inode->i_count);
-               T((KERN_DEBUG"yaffs_link link count %d i_count %d\n",   
+               T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_link link count %d i_count %d\n",    
                        old_dentry->d_inode->i_nlink,atomic_read(&old_dentry->d_inode->i_count)));
        
        }
@@ -887,7 +886,7 @@ static int yaffs_symlink(struct inode * dir, struct dentry *dentry, const char *
        yaffs_Object *obj;
        yaffs_Device *dev;
        
-       T((KERN_DEBUG"yaffs_symlink\n"));
+       T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_symlink\n"));
        
        dev = yaffs_InodeToObject(dir)->myDev;
        yaffs_GrossLock(dev);
@@ -903,12 +902,12 @@ static int yaffs_symlink(struct inode * dir, struct dentry *dentry, const char *
        
                inode = yaffs_get_inode(dir->i_sb, obj->st_mode, 0, obj);
                d_instantiate(dentry, inode);
-               T((KERN_DEBUG"symlink created OK\n"));
+               T(YAFFS_TRACE_OS,(KERN_DEBUG"symlink created OK\n"));
                return 0;
        }
        else
        {
-               T((KERN_DEBUG"symlink not created\n"));
+               T(YAFFS_TRACE_OS,(KERN_DEBUG"symlink not created\n"));
 
        }
        
@@ -925,7 +924,7 @@ static int yaffs_sync_object(struct file * file, struct dentry *dentry, int data
 
        dev = obj->myDev;
        
-       T((KERN_DEBUG"yaffs_sync_object\n"));
+       T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_sync_object\n"));
        yaffs_GrossLock(dev);
        yaffs_FlushFile(obj);
        yaffs_GrossUnlock(dev);
@@ -972,7 +971,7 @@ static int yaffs_setattr(struct dentry *dentry, struct iattr *attr)
        int error;
        yaffs_Device *dev;
        
-       T((KERN_DEBUG"yaffs_setattr of object %d\n",yaffs_InodeToObject(inode)->objectId));
+       T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_setattr of object %d\n",yaffs_InodeToObject(inode)->objectId));
        
        if((error = inode_change_ok(inode,attr)) == 0)
        {
@@ -996,7 +995,7 @@ static int yaffs_setattr(struct dentry *dentry, struct iattr *attr)
 static int yaffs_statfs(struct super_block *sb, struct statfs *buf)
 {
        yaffs_Device *dev = yaffs_SuperToDevice(sb);
-       T((KERN_DEBUG"yaffs_statfs\n"));
+       T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_statfs\n"));
 
        yaffs_GrossLock(dev);
        
@@ -1023,7 +1022,7 @@ static void yaffs_read_inode (struct inode *inode)
        yaffs_Object *obj ; 
        yaffs_Device *dev = yaffs_SuperToDevice(inode->i_sb);
        
-       T((KERN_DEBUG"yaffs_read_inode for %d\n",(int)inode->i_ino));
+       T(YAFFS_TRACE_OS,(KERN_DEBUG"yaffs_read_inode for %d\n",(int)inode->i_ino));
 
        obj  = yaffs_FindObjectByNumber(dev,inode->i_ino);
        
@@ -1103,10 +1102,10 @@ static struct super_block *yaffs_internal_read_super(int useRam, struct super_bl
        sb->s_blocksize = PAGE_CACHE_SIZE;
        sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
 #endif
-       T(("yaffs_read_super: %s block size %d\n", useRam ? "RAM" : "MTD",(int)(sb->s_blocksize)));
+       T(YAFFS_TRACE_OS,("yaffs_read_super: %s block size %d\n", useRam ? "RAM" : "MTD",(int)(sb->s_blocksize)));
 
 #ifdef CONFIG_YAFFS_DISABLE_WRITE_VERIFY
-       T(("yaffs: Write verification disabled. All guarantees null and void\n");
+       T(YAFFS_TRACE_OS,("yaffs: Write verification disabled. All guarantees null and void\n");
 #endif
 
 
@@ -1231,7 +1230,7 @@ static struct super_block *yaffs_internal_read_super(int useRam, struct super_bl
        yaffs_GrossLock(dev);
        yaffs_GutsInitialise(yaffs_SuperToDevice(sb));
 
-       T(("yaffs_read_super: guts initialised\n"));
+       T(YAFFS_TRACE_OS,("yaffs_read_super: guts initialised\n"));
 
        // Create root inode
        inode = yaffs_get_inode(sb, S_IFDIR | 0755, 0,yaffs_Root(yaffs_SuperToDevice(sb)));
@@ -1241,12 +1240,12 @@ static struct super_block *yaffs_internal_read_super(int useRam, struct super_bl
        if (!inode)
                return NULL;
 
-       T(("yaffs_read_super: got root inode\n"));
+       T(YAFFS_TRACE_OS,("yaffs_read_super: got root inode\n"));
                
 
        root = d_alloc_root(inode);
 
-       T(("yaffs_read_super: d_alloc_root done\n"));
+       T(YAFFS_TRACE_OS,("yaffs_read_super: d_alloc_root done\n"));
 
        if (!root) {
                iput(inode);
@@ -1254,7 +1253,7 @@ static struct super_block *yaffs_internal_read_super(int useRam, struct super_bl
        }
        sb->s_root = root;
 
-       T(("yaffs_read_super: done\n"));
+       T(YAFFS_TRACE_OS,("yaffs_read_super: done\n"));
        return sb;
 }
 
index 32b755972370aae9773519c0704e1d69df651dad..0069da4c4c519205694282689fd44b9c5f641bec 100644 (file)
-/*\r
- * YAFFS: Yet another FFS. A NAND-flash specific file system.\r
- * yaffs_guts.c  The main guts of YAFFS\r
- *\r
- * Copyright (C) 2002 Aleph One Ltd.\r
- *   for Toby Churchill Ltd and Brightstar Engineering\r
- *\r
- * Created by Charles Manning <charles@aleph1.co.uk>\r
- *\r
- * This program is free software; you can redistribute it and/or modify\r
- * it under the terms of the GNU General Public License version 2 as\r
- * published by the Free Software Foundation.\r
- *\r
- */\r
- //yaffs_guts.c\r
-\r
-const char *yaffs_guts_c_version="$Id: yaffs_guts.c,v 1.12 2002-11-08 07:19:41 charles Exp $";\r
-\r
-#include "yportenv.h"\r
-\r
-#include "yaffsinterface.h"\r
-#include "yaffs_guts.h"\r
-\r
-\r
-#define YAFFS_GARBAGE_COLLECT_LOW_WATER 2\r
-\r
-\r
-\r
-// External functions for ECC on data\r
-void nand_calculate_ecc (const u_char *dat, u_char *ecc_code);\r
-int nand_correct_data (u_char *dat, u_char *read_ecc, u_char *calc_ecc);\r
-\r
-\r
-// countBits is a quick way of counting the number of bits in a byte.\r
-// ie. countBits[n] holds the number of 1 bits in a byte with the value n.\r
-\r
-static const char yaffs_countBitsTable[256] =\r
-{\r
-0,1,1,2,1,2,2,3,1,2,2,3,2,3,3,4,\r
-1,2,2,3,2,3,3,4,2,3,3,4,3,4,4,5,\r
-1,2,2,3,2,3,3,4,2,3,3,4,3,4,4,5,\r
-2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,\r
-1,2,2,3,2,3,3,4,2,3,3,4,3,4,4,5,\r
-2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,\r
-2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,\r
-3,4,4,5,4,5,5,6,4,5,5,6,5,6,6,7,\r
-1,2,2,3,2,3,3,4,2,3,3,4,3,4,4,5,\r
-2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,\r
-2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,\r
-3,4,4,5,4,5,5,6,4,5,5,6,5,6,6,7,\r
-2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,\r
-3,4,4,5,4,5,5,6,4,5,5,6,5,6,6,7,\r
-3,4,4,5,4,5,5,6,4,5,5,6,5,6,6,7,\r
-4,5,5,6,5,6,6,7,5,6,6,7,6,7,7,8\r
-};\r
-\r
-static int yaffs_CountBits(__u8 x)\r
-{\r
-       int retVal;\r
-       retVal = yaffs_countBitsTable[x];\r
-       return retVal;\r
-}\r
-\r
-\r
-\r
-// Local prototypes\r
-static int yaffs_CheckObjectHashSanity(yaffs_Device *dev);\r
-static void yaffs_LoadTagsIntoSpare(yaffs_Spare *sparePtr, yaffs_Tags *tagsPtr);\r
-static void yaffs_GetTagsFromSpare(yaffs_Device *dev, yaffs_Spare *sparePtr,yaffs_Tags *tagsPtr);\r
-static int yaffs_PutChunkIntoFile(yaffs_Object *in,int chunkInInode, int chunkInNAND, int inScan);\r
-\r
-static yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev,int number,yaffs_ObjectType type);\r
-static void yaffs_AddObjectToDirectory(yaffs_Object *directory, yaffs_Object *obj);\r
-static int yaffs_UpdateObjectHeader(yaffs_Object *in,const char *name, int force);\r
-static void yaffs_DeleteChunk(yaffs_Device *dev,int chunkId);\r
-static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj);\r
-static int yaffs_CheckStructures(void);\r
-static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level, int chunkOffset,int *limit);\r
-static int yaffs_DoGenericObjectDeletion(yaffs_Object *in);\r
-\r
-static yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device *dev,int blockNo);\r
-\r
-// Robustification\r
-static void yaffs_RetireBlock(yaffs_Device *dev,int blockInNAND);\r
-static void yaffs_HandleReadDataError(yaffs_Device *dev,int chunkInNAND);\r
-static void yaffs_HandleWriteChunkError(yaffs_Device *dev,int chunkInNAND);\r
-static void yaffs_HandleWriteChunkOk(yaffs_Device *dev,int chunkInNAND,const __u8 *data, const yaffs_Spare *spare);\r
-static void yaffs_HandleUpdateChunk(yaffs_Device *dev,int chunkInNAND, const yaffs_Spare *spare);\r
-\r
-static int  yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,int chunkInNAND);\r
-\r
-static int yaffs_UnlinkWorker(yaffs_Object *obj);\r
-\r
-\r
-static int yaffs_VerifyCompare(const __u8 *d0, const __u8 * d1, const yaffs_Spare *s0, const yaffs_Spare *s1);\r
-\r
-\r
-\r
-loff_t yaffs_GetFileSize(yaffs_Object *obj);\r
-\r
-static int yaffs_ReadChunkTagsFromNAND(yaffs_Device *dev,int chunkInNAND, yaffs_Tags *tags, int *chunkDeleted);\r
-static int yaffs_TagsMatch(const yaffs_Tags *tags, int objectId, int chunkInObject, int chunkDeleted);\r
-\r
-\r
-static int yaffs_AllocateChunk(yaffs_Device *dev,int useReserve);\r
-\r
-#ifdef YAFFS_PARANOID\r
-static int yaffs_CheckFileSanity(yaffs_Object *in);\r
-#else\r
-#define yaffs_CheckFileSanity(in)\r
-#endif\r
-\r
-static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in);\r
-static void yaffs_InvalidateChunkCache(yaffs_Object *object, int chunkId);\r
-\r
-\r
-static  __inline__ yaffs_BlockInfo* yaffs_GetBlockInfo(yaffs_Device *dev, int blk)\r
-{\r
-       if(blk < dev->startBlock || blk > dev->endBlock)\r
-       {\r
-               T(YAFFS_TRACE_ERROR,(TSTR("**>> yaffs: block %d is not valid" TENDSTR),blk));\r
-               YBUG();\r
-       }\r
-       return &dev->blockInfo[blk - dev->startBlock];\r
-}\r
-\r
-\r
-static  __inline__ int yaffs_HashFunction(int n)\r
-{\r
-       return (n % YAFFS_NOBJECT_BUCKETS);\r
-}\r
-\r
-\r
-yaffs_Object *yaffs_Root(yaffs_Device *dev)\r
-{\r
-       return dev->rootDir;\r
-}\r
-\r
-yaffs_Object *yaffs_LostNFound(yaffs_Device *dev)\r
-{\r
-       return dev->lostNFoundDir;\r
-}\r
-\r
-\r
-static int yaffs_WriteChunkToNAND(struct yaffs_DeviceStruct *dev,int chunkInNAND, const __u8 *data, yaffs_Spare *spare)\r
-{\r
-       if(chunkInNAND < dev->startBlock * YAFFS_CHUNKS_PER_BLOCK)\r
-       {\r
-               T(YAFFS_TRACE_ERROR,(TSTR("**>> yaffs chunk %d is not valid" TENDSTR),chunkInNAND));\r
-               return YAFFS_FAIL;\r
-       }\r
-\r
-       dev->nPageWrites++;\r
-       return dev->writeChunkToNAND(dev,chunkInNAND,data,spare);\r
-}\r
-\r
-\r
-int yaffs_ReadChunkFromNAND(struct yaffs_DeviceStruct *dev,\r
-                                                       int chunkInNAND, \r
-                                                       __u8 *data, \r
-                                                       yaffs_Spare *spare, \r
-                                                       int doErrorCorrection)\r
-{\r
-       int retVal;\r
-       __u8 calcEcc[3];\r
-       yaffs_Spare localSpare;\r
-       int eccResult1,eccResult2;\r
-       \r
-       dev->nPageReads++;\r
-       \r
-       \r
-\r
-       \r
-       if(!spare && data)\r
-       {\r
-               // If we don't have a real spare, then we use a local one.\r
-               // Need this for the calculation of the ecc\r
-               spare = &localSpare;\r
-       }\r
-       \r
-       retVal  = dev->readChunkFromNAND(dev,chunkInNAND,data,spare);\r
-       if(data && doErrorCorrection)\r
-       {\r
-               // Do ECC correction\r
-               //Todo handle any errors\r
-                nand_calculate_ecc(data,calcEcc);\r
-                eccResult1 = nand_correct_data (data,spare->ecc1, calcEcc);\r
-                nand_calculate_ecc(&data[256],calcEcc);\r
-                eccResult2 = nand_correct_data (&data[256],spare->ecc2, calcEcc);\r
-                \r
-                if(eccResult1>0)\r
-                {\r
-                       T(YAFFS_TRACE_ERROR, (TSTR("**>>ecc error fix performed on chunk %d:0" TENDSTR),chunkInNAND));\r
-                       dev->eccFixed++;\r
-                }\r
-                else if(eccResult1<0)\r
-                {\r
-                       T(YAFFS_TRACE_ERROR,(TSTR("**>>ecc error unfixed on chunk %d:0" TENDSTR),chunkInNAND));\r
-                       dev->eccUnfixed++;\r
-                }\r
-                \r
-                if(eccResult2>0)\r
-                {\r
-                       T(YAFFS_TRACE_ERROR,(TSTR("**>>ecc error fix performed on chunk %d:1" TENDSTR),chunkInNAND));\r
-                       dev->eccFixed++;\r
-                }\r
-                else if(eccResult2<0)\r
-                {\r
-                       T(YAFFS_TRACE_ERROR,(TSTR("**>>ecc error unfixed on chunk %d:1" TENDSTR),chunkInNAND));\r
-                       dev->eccUnfixed++;\r
-                }\r
-                \r
-                if(eccResult1 || eccResult2)\r
-                {\r
-                       // Hoosterman, we had a data problem on this page\r
-                       yaffs_HandleReadDataError(dev,chunkInNAND);\r
-                }\r
-       }\r
-\r
-       return retVal;\r
-}\r
-\r
-\r
-static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,int chunkInNAND)\r
-{\r
-\r
-       static int init = 0;\r
-       static __u8 cmpbuf[YAFFS_BYTES_PER_CHUNK];\r
-       static __u8 data[YAFFS_BYTES_PER_CHUNK];\r
-       static __u8 spare[16];\r
-       \r
-       \r
-       dev->readChunkFromNAND(dev,chunkInNAND,data,(yaffs_Spare *)spare);\r
-       \r
-       \r
-       \r
-       if(!init)\r
-       {\r
-               memset(cmpbuf,0xff,YAFFS_BYTES_PER_CHUNK);\r
-               init = 1;\r
-       }\r
-       \r
-       if(memcmp(cmpbuf,data,YAFFS_BYTES_PER_CHUNK)) return  YAFFS_FAIL;\r
-       if(memcmp(cmpbuf,spare,16)) return YAFFS_FAIL;\r
-\r
-       \r
-       return YAFFS_OK;\r
-       \r
-}\r
-\r
-\r
-\r
-int yaffs_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,int blockInNAND)\r
-{\r
-       dev->nBlockErasures++;\r
-       return dev->eraseBlockInNAND(dev,blockInNAND);\r
-}\r
-\r
-int yaffs_InitialiseNAND(struct yaffs_DeviceStruct *dev)\r
-{\r
-       return dev->initialiseNAND(dev);\r
-}\r
-\r
-static int yaffs_WriteNewChunkToNAND(struct yaffs_DeviceStruct *dev, const __u8 *data, yaffs_Spare *spare,int useReserve)\r
-{\r
-       int chunk;\r
-       \r
-       int writeOk = 1;\r
-       int attempts = 0;\r
-       \r
-       unsigned char rbData[YAFFS_BYTES_PER_CHUNK];\r
-       yaffs_Spare rbSpare;\r
-       \r
-       do{\r
-               chunk = yaffs_AllocateChunk(dev,useReserve);\r
-       \r
-               if(chunk >= 0)\r
-               {\r
-\r
-                       // First check this chunk is erased...\r
-#ifndef CONFIG_YAFFS_DISABLE_CHUNK_ERASED_CHECK\r
-                       writeOk = yaffs_CheckChunkErased(dev,chunk);\r
-#endif         \r
-                       if(!writeOk)\r
-                       {\r
-                               T(YAFFS_TRACE_ERROR,(TSTR("**>> yaffs chunk %d was not erased" TENDSTR),chunk));\r
-                       }\r
-                       else\r
-                       {\r
-                               writeOk =  yaffs_WriteChunkToNAND(dev,chunk,data,spare);\r
-                       }\r
-                       attempts++;\r
-                       if(writeOk)\r
-                       {\r
-                               // Readback & verify\r
-                               // If verify fails, then delete this chunk and try again\r
-                               // To verify we compare everything except the block and \r
-                               // page status bytes.\r
-                               // NB We check a raw read without ECC correction applied\r
-                               yaffs_ReadChunkFromNAND(dev,chunk,rbData,&rbSpare,0);\r
-                               \r
-#ifndef CONFIG_YAFFS_DISABLE_WRITE_VERIFY\r
-                               if(!yaffs_VerifyCompare(data,rbData,spare,&rbSpare))\r
-                               {\r
-                                       // Didn't verify\r
-                                       T(YAFFS_TRACE_ERROR,(TSTR("**>> yaffs write verify failed on chunk %d" TENDSTR), chunk));\r
-\r
-                                       writeOk = 0;\r
-                               }       \r
-#endif                         \r
-                               \r
-                       }\r
-                       if(writeOk)\r
-                       {\r
-                               // Copy the data into the write buffer.\r
-                               // NB We do this at the end to prevent duplicates in the case of a write error.\r
-                               //Todo\r
-                               yaffs_HandleWriteChunkOk(dev,chunk,data,spare);\r
-                       }\r
-                       else\r
-                       {\r
-                               yaffs_HandleWriteChunkError(dev,chunk);\r
-                       }\r
-               }\r
-               \r
-       } while(chunk >= 0 && ! writeOk);\r
-       \r
-       if(attempts > 1)\r
-       {\r
-               T(YAFFS_TRACE_ERROR,(TSTR("**>> yaffs write required %d attempts" TENDSTR),attempts));\r
-               dev->nRetriedWrites+= (attempts - 1);   \r
-       }\r
-       \r
-       return chunk;\r
-}\r
-\r
-///\r
-// Functions for robustisizing\r
-//\r
-//\r
-\r
-static void yaffs_RetireBlock(yaffs_Device *dev,int blockInNAND)\r
-{\r
-       // Ding the blockStatus in the first two pages of the block.\r
-       \r
-       yaffs_Spare spare;\r
-\r
-       memset(&spare, 0xff,sizeof(yaffs_Spare));\r
-\r
-       spare.blockStatus = 0;\r
-       \r
-       yaffs_WriteChunkToNAND(dev, blockInNAND * YAFFS_CHUNKS_PER_BLOCK, NULL , &spare);\r
-       yaffs_WriteChunkToNAND(dev, blockInNAND * YAFFS_CHUNKS_PER_BLOCK + 1, NULL , &spare);\r
-       \r
-       yaffs_GetBlockInfo(dev,blockInNAND)->blockState = YAFFS_BLOCK_STATE_DEAD;\r
-       dev->nRetiredBlocks++;\r
-}\r
-\r
-\r
-\r
-static int yaffs_RewriteBufferedBlock(yaffs_Device *dev)\r
-{\r
-       dev->doingBufferedBlockRewrite = 1;\r
-       //\r
-       //      Remove erased chunks\r
-       //  Rewrite existing chunks to a new block\r
-       //      Set current write block to the new block\r
-       \r
-       dev->doingBufferedBlockRewrite = 0;\r
-       \r
-       return 1;\r
-}\r
-\r
-\r
-static void yaffs_HandleReadDataError(yaffs_Device *dev,int chunkInNAND)\r
-{\r
-       int blockInNAND = chunkInNAND/YAFFS_CHUNKS_PER_BLOCK;\r
-\r
-       // Mark the block for retirement\r
-       yaffs_GetBlockInfo(dev,blockInNAND)->needsRetiring = 1;\r
-       T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,(TSTR("**>>Block %d marked for retirement" TENDSTR),blockInNAND));\r
-\r
-\r
-       //TODO  \r
-       // Just do a garbage collection on the affected block then retire the block\r
-       // NB recursion\r
-}\r
-\r
-\r
-static void yaffs_CheckWrittenBlock(yaffs_Device *dev,int chunkInNAND)\r
-{\r
-}\r
-\r
-static void yaffs_HandleWriteChunkOk(yaffs_Device *dev,int chunkInNAND,const __u8 *data, const yaffs_Spare *spare)\r
-{\r
-}\r
-\r
-static void yaffs_HandleUpdateChunk(yaffs_Device *dev,int chunkInNAND, const yaffs_Spare *spare)\r
-{\r
-}\r
-\r
-static void yaffs_HandleWriteChunkError(yaffs_Device *dev,int chunkInNAND)\r
-{\r
-       int blockInNAND = chunkInNAND/YAFFS_CHUNKS_PER_BLOCK;\r
-\r
-       // Mark the block for retirement\r
-       yaffs_GetBlockInfo(dev,blockInNAND)->needsRetiring = 1;\r
-       // Delete the chunk\r
-       yaffs_DeleteChunk(dev,chunkInNAND);\r
-}\r
-\r
-\r
-\r
-\r
-static int yaffs_VerifyCompare(const __u8 *d0, const __u8 * d1, const yaffs_Spare *s0, const yaffs_Spare *s1)\r
-{\r
-\r
-\r
-       if( memcmp(d0,d1,YAFFS_BYTES_PER_CHUNK) != 0 ||\r
-               s0->tagByte0 != s1->tagByte0 ||\r
-               s0->tagByte1 != s1->tagByte1 ||\r
-               s0->tagByte2 != s1->tagByte2 ||\r
-               s0->tagByte3 != s1->tagByte3 ||\r
-               s0->tagByte4 != s1->tagByte4 ||\r
-               s0->tagByte5 != s1->tagByte5 ||\r
-               s0->tagByte6 != s1->tagByte6 ||\r
-               s0->tagByte7 != s1->tagByte7 ||\r
-               s0->ecc1[0]  != s1->ecc1[0]  ||\r
-               s0->ecc1[1]  != s1->ecc1[1]  ||\r
-               s0->ecc1[2]  != s1->ecc1[2]  ||\r
-               s0->ecc2[0]  != s1->ecc2[0]  ||\r
-               s0->ecc2[1]  != s1->ecc2[1]  ||\r
-               s0->ecc2[2]  != s1->ecc2[2] )\r
-               {\r
-                       return 0;\r
-               }\r
-       \r
-       return 1;\r
-}\r
-\r
-\r
-///////////////////////// Object management //////////////////\r
-// List of spare objects\r
-// The list is hooked together using the first pointer\r
-// in the object\r
-\r
-// static yaffs_Object *yaffs_freeObjects = NULL;\r
-\r
-// static int yaffs_nFreeObjects;\r
-\r
-// static yaffs_ObjectList *yaffs_allocatedObjectList = NULL;\r
-\r
-// static yaffs_ObjectBucket yaffs_objectBucket[YAFFS_NOBJECT_BUCKETS];\r
-\r
-\r
-static __u16 yaffs_CalcNameSum(const char *name)\r
-{\r
-       __u16 sum = 0;\r
-       __u16 i = 1;\r
-       \r
-       __u8 *bname = (__u8 *)name;\r
-       if(bname)\r
-       {\r
-               while ((*bname) && (i <=YAFFS_MAX_NAME_LENGTH))\r
-               {\r
-#ifdef CONFIG_YAFFS_WINCE\r
-                       sum += toupper(*bname) * i;\r
-#else\r
-                       sum += (*bname) * i;\r
-#endif\r
-                       i++;\r
-                       bname++;\r
-               }\r
-       }\r
-       return sum;\r
-}\r
-\r
-void yaffs_SetObjectName(yaffs_Object *obj, const char *name)\r
-{\r
-#ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM\r
-                                       if(name && strlen(name) <= YAFFS_SHORT_NAME_LENGTH)\r
-                                       {\r
-                                               strcpy(obj->shortName,name);\r
-                                       }\r
-                                       else\r
-                                       {\r
-                                               obj->shortName[0]='\0';\r
-                                       }\r
-#endif\r
-                                       obj->sum = yaffs_CalcNameSum(name);\r
-}\r
-\r
-void yaffs_CalcECC(const __u8 *data, yaffs_Spare *spare)\r
-{\r
-       nand_calculate_ecc (data , spare->ecc1);\r
-       nand_calculate_ecc (&data[256] , spare->ecc2);\r
-}\r
-\r
-void yaffs_CalcTagsECC(yaffs_Tags *tags)\r
-{\r
-       // Calculate an ecc\r
-       \r
-       unsigned char *b = ((yaffs_TagsUnion *)tags)->asBytes;\r
-       unsigned  i,j;\r
-       unsigned  ecc = 0;\r
-       unsigned bit = 0;\r
-\r
-       tags->ecc = 0;\r
-       \r
-       for(i = 0; i < 8; i++)\r
-       {\r
-               for(j = 1; j &0xff; j<<=1)\r
-               {\r
-                       bit++;\r
-                       if(b[i] & j)\r
-                       {\r
-                               ecc ^= bit;\r
-                       }\r
-               }\r
-       }\r
-       \r
-       tags->ecc = ecc;\r
-       \r
-       \r
-}\r
-\r
-int  yaffs_CheckECCOnTags(yaffs_Tags *tags)\r
-{\r
-       unsigned ecc = tags->ecc;\r
-       \r
-       yaffs_CalcTagsECC(tags);\r
-       \r
-       ecc ^= tags->ecc;\r
-       \r
-       if(ecc && ecc <= 64)\r
-       {\r
-               // TODO: Handle the failure better. Retire?\r
-               unsigned char *b = ((yaffs_TagsUnion *)tags)->asBytes;\r
-\r
-               ecc--;\r
-                               \r
-               b[ecc / 8] ^= (1 << (ecc & 7));\r
-               \r
-               // Now recvalc the ecc\r
-               yaffs_CalcTagsECC(tags);\r
-               \r
-               return 1; // recovered error\r
-       }\r
-       else if(ecc)\r
-       {\r
-               // Wierd ecc failure value\r
-               // TODO Need to do somethiong here\r
-               return -1; //unrecovered error\r
-       }\r
-       \r
-       return 0;\r
-}\r
-\r
-\r
-///////////////////////// TNODES ///////////////////////\r
-\r
-// List of spare tnodes\r
-// The list is hooked together using the first pointer\r
-// in the tnode.\r
-\r
-//static yaffs_Tnode *yaffs_freeTnodes = NULL;\r
-\r
-// static int yaffs_nFreeTnodes;\r
-\r
-//static yaffs_TnodeList *yaffs_allocatedTnodeList = NULL;\r
-\r
-\r
-\r
-// yaffs_CreateTnodes creates a bunch more tnodes and\r
-// adds them to the tnode free list.\r
-// Don't use this function directly\r
-\r
-static int yaffs_CreateTnodes(yaffs_Device *dev,int nTnodes)\r
-{\r
-    int i;\r
-    yaffs_Tnode *newTnodes;\r
-    yaffs_TnodeList *tnl;\r
-    \r
-    if(nTnodes < 1) return YAFFS_OK;\r
-   \r
-       // make these things\r
-       \r
-    newTnodes = YMALLOC(nTnodes * sizeof(yaffs_Tnode));\r
-   \r
-    if (!newTnodes)\r
-    {\r
-               T(YAFFS_TRACE_ERROR,(TSTR("yaffs: Could not allocate Tnodes"TENDSTR)));\r
-               return YAFFS_FAIL;\r
-    }\r
-    \r
-    // Hook them into the free list\r
-    for(i = 0; i < nTnodes - 1; i++)\r
-    {\r
-       newTnodes[i].internal[0] = &newTnodes[i+1];\r
-    }\r
-       \r
-       newTnodes[nTnodes - 1].internal[0] = dev->freeTnodes;\r
-       dev->freeTnodes = newTnodes;\r
-       dev->nFreeTnodes+= nTnodes;\r
-       dev->nTnodesCreated += nTnodes;\r
-\r
-       // Now add this bunch of tnodes to a list for freeing up.\r
-       // NB If we can't add this to the management list it isn't fatal\r
-       // but it just means we can't free this bunch of tnodes later.\r
-       tnl = YMALLOC(sizeof(yaffs_TnodeList));\r
-       if(!tnl)\r
-       {\r
-               T(YAFFS_TRACE_ERROR,(TSTR("yaffs: Could not add tnodes to management list" TENDSTR)));\r
-               \r
-       }\r
-       else\r
-       {\r
-               tnl->tnodes = newTnodes;\r
-               tnl->next = dev->allocatedTnodeList;\r
-               dev->allocatedTnodeList = tnl;\r
-       }\r
-\r
-\r
-       T(YAFFS_TRACE_ALLOCATE,(TSTR("yaffs: Tnodes added" TENDSTR)));\r
-\r
-\r
-       return YAFFS_OK;\r
-}\r
-\r
-\r
-// GetTnode gets us a clean tnode. Tries to make allocate more if we run out\r
-static yaffs_Tnode *yaffs_GetTnode(yaffs_Device *dev)\r
-{\r
-       yaffs_Tnode *tn = NULL;\r
-       \r
-       // If there are none left make more\r
-       if(!dev->freeTnodes)\r
-       {\r
-               yaffs_CreateTnodes(dev,YAFFS_ALLOCATION_NTNODES);\r
-       }\r
-       \r
-       if(dev->freeTnodes)\r
-       {\r
-               tn = dev->freeTnodes;\r
-               dev->freeTnodes = dev->freeTnodes->internal[0];\r
-               dev->nFreeTnodes--;\r
-               // zero out\r
-               memset(tn,0,sizeof(yaffs_Tnode));\r
-       }\r
-       \r
-\r
-       return tn;\r
-}\r
-\r
-\r
-// FreeTnode frees up a tnode and puts it back on the free list\r
-static void yaffs_FreeTnode(yaffs_Device*dev, yaffs_Tnode *tn)\r
-{\r
-       tn->internal[0] = dev->freeTnodes;\r
-       dev->freeTnodes = tn;\r
-       dev->nFreeTnodes++;\r
-}\r
-\r
-\r
-static void yaffs_DeinitialiseTnodes(yaffs_Device*dev)\r
-{\r
-       // Free the list of allocated tnodes\r
-       \r
-       while(dev->allocatedTnodeList)\r
-       {\r
-               YFREE(dev->allocatedTnodeList->tnodes);\r
-               dev->allocatedTnodeList =  dev->allocatedTnodeList->next;\r
-       }\r
-       \r
-       dev->freeTnodes = NULL;\r
-       dev->nFreeTnodes = 0;\r
-}\r
-\r
-static void yaffs_InitialiseTnodes(yaffs_Device*dev)\r
-{\r
-       dev->allocatedTnodeList = NULL;\r
-       dev->freeTnodes = NULL;\r
-       dev->nFreeTnodes = 0;\r
-       dev->nTnodesCreated = 0;\r
-\r
-}\r
-\r
-#if 0\r
-void yaffs_TnodeTest(yaffs_Device *dev)\r
-{\r
-\r
-       int i;\r
-       int j;\r
-       yaffs_Tnode *tn[1000];\r
-       \r
-       YINFO("Testing TNodes");\r
-       \r
-       for(j = 0; j < 50; j++)\r
-       {\r
-               for(i = 0; i < 1000; i++)\r
-               {\r
-                       tn[i] = yaffs_GetTnode(dev);\r
-                       if(!tn[i])\r
-                       {\r
-                               YALERT("Getting tnode failed");\r
-                       }\r
-               }\r
-               for(i = 0; i < 1000; i+=3)\r
-               {\r
-                       yaffs_FreeTnode(dev,tn[i]);\r
-                       tn[i] = NULL;\r
-               }\r
-               \r
-       }\r
-}\r
-#endif\r
-\r
-\r
-////////////////// END OF TNODE MANIPULATION ///////////////////////////\r
-\r
-/////////////// Functions to manipulate the look-up tree (made up of tnodes)\r
-// The look up tree is represented by the top tnode and the number of topLevel\r
-// in the tree. 0 means only the level 0 tnode is in the tree.\r
-\r
-\r
-// FindLevel0Tnode finds the level 0 tnode, if one exists.\r
-// Used when reading.....\r
-static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev,yaffs_FileStructure *fStruct, __u32 chunkId)\r
-{\r
-       \r
-       yaffs_Tnode *tn = fStruct->top;\r
-       __u32 i;\r
-       int requiredTallness;   \r
-       int level = fStruct->topLevel;\r
-       \r
-       // Check sane level and chunk Id\r
-       if(level < 0 || level > YAFFS_TNODES_MAX_LEVEL)\r
-       {\r
-//             char str[50];\r
-//             sprintf(str,"Bad level %d",level);\r
-//             YALERT(str);\r
-               return NULL;\r
-       }\r
-       \r
-       if(chunkId > YAFFS_MAX_CHUNK_ID)\r
-       {\r
-//             char str[50];\r
-//             sprintf(str,"Bad chunkId %d",chunkId);\r
-//             YALERT(str);\r
-               return NULL;\r
-       }\r
-\r
-       // First check we're tall enough (ie enough topLevel)\r
-       \r
-       i = chunkId >> (/*dev->chunkGroupBits  + */YAFFS_TNODES_LEVEL0_BITS);\r
-       requiredTallness = 0;\r
-       while(i)\r
-       {\r
-               i >>= YAFFS_TNODES_INTERNAL_BITS;\r
-               requiredTallness++;\r
-       }\r
-       \r
-       \r
-       if(requiredTallness > fStruct->topLevel)\r
-       {\r
-               // Not tall enough, so we can't find it, return NULL.\r
-               return NULL;\r
-       }\r
-               \r
-       \r
-       // Traverse down to level 0\r
-       while (level > 0 && tn)\r
-       {\r
-           tn = tn->internal[(chunkId >>(/* dev->chunkGroupBits + */ YAFFS_TNODES_LEVEL0_BITS + (level-1) * YAFFS_TNODES_INTERNAL_BITS)) & \r
-                              YAFFS_TNODES_INTERNAL_MASK]; \r
-               level--;\r
-       \r
-       }\r
-       \r
-       return tn;              \r
-}\r
-\r
-// AddOrFindLevel0Tnode finds the level 0 tnode if it exists, otherwise first expands the tree.\r
-// This happens in two steps:\r
-//  1. If the tree isn't tall enough, then make it taller.\r
-//  2. Scan down the tree towards the level 0 tnode adding tnodes if required.\r
-//\r
-// Used when modifying the tree.\r
-//\r
-static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device *dev, yaffs_FileStructure *fStruct, __u32 chunkId)\r
-{\r
-       \r
-       yaffs_Tnode *tn; \r
-       \r
-       int requiredTallness;\r
-       int i;\r
-       int l;\r
-       \r
-       __u32 x;\r
-               \r
-       \r
-       //T((TSTR("AddOrFind topLevel=%d, chunk=%d"),fStruct->topLevel,chunkId));\r
-       \r
-       // Check sane level and page Id\r
-       if(fStruct->topLevel < 0 || fStruct->topLevel > YAFFS_TNODES_MAX_LEVEL)\r
-       {\r
-//             char str[50];\r
-//             sprintf(str,"Bad level %d",fStruct->topLevel);\r
-//             YALERT(str);\r
-               return NULL;\r
-       }\r
-       \r
-       if(chunkId > YAFFS_MAX_CHUNK_ID)\r
-       {\r
-//             char str[50];\r
-//             sprintf(str,"Bad chunkId %d",chunkId);\r
-//             YALERT(str);\r
-               return NULL;\r
-       }\r
-       \r
-       // First check we're tall enough (ie enough topLevel)\r
-       \r
-       x = chunkId >> (/*dev->chunkGroupBits + */YAFFS_TNODES_LEVEL0_BITS);\r
-       requiredTallness = 0;\r
-       while(x)\r
-       {\r
-               x >>= YAFFS_TNODES_INTERNAL_BITS;\r
-               requiredTallness++;\r
-       }\r
-       \r
-       //T((TSTR(" required=%d"),requiredTallness));\r
-       \r
-       \r
-       if(requiredTallness > fStruct->topLevel)\r
-       {\r
-               // Not tall enough,gotta make the tree taller\r
-               for(i = fStruct->topLevel; i < requiredTallness; i++)\r
-               {\r
-                       //T((TSTR(" add new top")));\r
-                       \r
-                       tn = yaffs_GetTnode(dev);\r
-                       \r
-                       if(tn)\r
-                       {\r
-                               tn->internal[0] = fStruct->top;\r
-                               fStruct->top = tn;\r
-                       }\r
-                       else\r
-                       {\r
-                                       T(YAFFS_TRACE_ERROR,(TSTR("yaffs: no more tnodes" TENDSTR)));\r
-                       }\r
-               }\r
-               \r
-               fStruct->topLevel = requiredTallness;\r
-       }\r
-       \r
-       \r
-       // Traverse down to level 0, adding anything we need\r
-       \r
-       l = fStruct->topLevel;\r
-       tn = fStruct->top;\r
-       while (l > 0 && tn)\r
-       {\r
-               x = (chunkId >> (/*dev->chunkGroupBits + */YAFFS_TNODES_LEVEL0_BITS + (l-1) * YAFFS_TNODES_INTERNAL_BITS)) & \r
-                              YAFFS_TNODES_INTERNAL_MASK;\r
-                              \r
-               //T((TSTR(" [%d:%d]"),l,i));\r
-               \r
-           if(!tn->internal[x])\r
-           {\r
-               //T((TSTR(" added")));\r
-               \r
-               tn->internal[x] = yaffs_GetTnode(dev);\r
-           }\r
-           \r
-           tn =        tn->internal[x];\r
-               l--;\r
-       \r
-       }\r
-       \r
-       //TSTR(TENDSTR)));\r
-       \r
-       return tn;              \r
-}\r
-\r
-// DeleteWorker scans backwards through the tnode tree and deletes all the\r
-// chunks and tnodes in the file\r
-// Returns 1 if the tree was deleted. Returns 0 if it stopped early due to hitting the limit and the delete is incomplete.\r
-\r
-static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level, int chunkOffset,int *limit)\r
-{\r
-       int i;\r
-       int chunkInInode;\r
-       int theChunk;\r
-       yaffs_Tags tags;\r
-       int found;\r
-       int chunkDeleted;\r
-       int allDone = 1;\r
-       \r
-       \r
-       if(tn)\r
-       {\r
-               if(level > 0)\r
-               {\r
-               \r
-                       for(i = YAFFS_NTNODES_INTERNAL -1; allDone && i >= 0; i--)\r
-                       {\r
-                           if(tn->internal[i])\r
-                       {\r
-                                       if(limit && (*limit) < 0)\r
-                                       {\r
-                                               allDone = 0;\r
-                                       }\r
-                                       else\r
-                                       {\r
-                                               allDone = yaffs_DeleteWorker(in,tn->internal[i],level - 1,\r
-                                                                               (chunkOffset << YAFFS_TNODES_INTERNAL_BITS ) + i ,limit);\r
-                                       }\r
-                                       if(allDone)\r
-                                       {\r
-                                               yaffs_FreeTnode(in->myDev,tn->internal[i]);\r
-                                       tn->internal[i] = NULL;\r
-                                       }\r
-                           }\r
-                   \r
-                       }\r
-                       return (allDone) ? 1 : 0;\r
-               }\r
-               else if(level == 0)\r
-               {\r
-                       for(i = YAFFS_NTNODES_LEVEL0 -1; i >= 0; i--) //NB Don't apply the limit here, always delete a whole level0\r
-                       {\r
-                           if(tn->level0[i])\r
-                       {\r
-                                       int j;\r
-                                       \r
-                                       chunkInInode = (chunkOffset << YAFFS_TNODES_LEVEL0_BITS ) + i;\r
-                                       \r
-                                       theChunk =  tn->level0[i] << in->myDev->chunkGroupBits;\r
-\r
-                                       // Now we need to search for it\r
-                                       for(j = 0,found = 0; theChunk && j < in->myDev->chunkGroupSize && !found; j++)\r
-                                       {\r
-                                               yaffs_ReadChunkTagsFromNAND(in->myDev,theChunk,&tags,&chunkDeleted);\r
-                                               if(yaffs_TagsMatch(&tags,in->objectId,chunkInInode,chunkDeleted))\r
-                                               {\r
-                                                       // found it;\r
-                                                       found = 1;\r
-                                       \r
-                                               }\r
-                                               else\r
-                                               {\r
-                                                       theChunk++;\r
-                                               }\r
-                                       }\r
-                                       \r
-                                       if(found)\r
-                                       {\r
-                                               yaffs_DeleteChunk(in->myDev,theChunk);\r
-                                               in->nDataChunks--;\r
-                                               if(limit)\r
-                                               { \r
-                                                       *limit = *limit-1;\r
-                                               }\r
-                                       \r
-                                       }\r
-                                       \r
-                               tn->level0[i] = 0;\r
-                           }\r
-                   \r
-                       }\r
-                       return 1;\r
-\r
-                       \r
-               }\r
-               \r
-       }\r
-       \r
-       return 1;\r
-       \r
-}\r
-\r
-\r
-\r
-\r
-// Pruning removes any part of the file structure tree that is beyond the\r
-// bounds of the file (ie that does not point to chunks).\r
-//\r
-// A file should only get pruned when its size is reduced.\r
-//\r
-// Before pruning, the chunks must be pulled from the tree and the\r
-// level 0 tnode entries must be zeroed out.\r
-// Could also use this for file deletion, but that's probably better handled\r
-// by a special case.\r
-\r
-// yaffs_PruneWorker should only be called by yaffs_PruneFileStructure()\r
-\r
-static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device *dev, yaffs_Tnode *tn, __u32 level, int del0)\r
-{\r
-       int i;\r
-       int hasData;\r
-       \r
-       if(tn)\r
-       {\r
-               hasData = 0;\r
-               \r
-               for(i = 0; i < YAFFS_NTNODES_INTERNAL; i++)\r
-               {\r
-                   if(tn->internal[i] && level > 0)\r
-                   {\r
-                       tn->internal[i] = yaffs_PruneWorker(dev,tn->internal[i],level - 1, ( i == 0) ? del0 : 1);\r
-                   }\r
-                   \r
-                   if(tn->internal[i])\r
-                   {\r
-                       hasData++;\r
-                       }\r
-               }\r
-               \r
-               if(hasData == 0 && del0)\r
-               {\r
-                       // Free and return NULL\r
-                       \r
-                       yaffs_FreeTnode(dev,tn);\r
-                       tn = NULL;\r
-               }\r
-               \r
-       }\r
-\r
-       return tn;\r
-       \r
-}\r
-\r
-static int yaffs_PruneFileStructure(yaffs_Device *dev, yaffs_FileStructure *fStruct)\r
-{\r
-       int i;\r
-       int hasData;\r
-       int done = 0;\r
-       yaffs_Tnode *tn;\r
-       \r
-       if(fStruct->topLevel > 0)\r
-       {\r
-               fStruct->top = yaffs_PruneWorker(dev,fStruct->top, fStruct->topLevel,0);\r
-               \r
-               // Now we have a tree with all the non-zero branches NULL but the height\r
-               // is the same as it was.\r
-               // Let's see if we can trim internal tnodes to shorten the tree.\r
-               // We can do this if only the 0th element in the tnode is in use \r
-               // (ie all the non-zero are NULL)\r
-               \r
-               while(fStruct->topLevel && !done)\r
-               {\r
-                       tn = fStruct->top;\r
-                       \r
-                       hasData = 0;\r
-                       for(i = 1; i <YAFFS_NTNODES_INTERNAL; i++)\r
-                       {\r
-                               if(tn->internal[i])\r
-                       {\r
-                               hasData++;\r
-                               }\r
-                       }\r
-                       \r
-                       if(!hasData)\r
-                       {\r
-                               fStruct->top = tn->internal[0];\r
-                               fStruct->topLevel--;\r
-                               yaffs_FreeTnode(dev,tn);\r
-                       }\r
-                       else\r
-                       {\r
-                               done = 1;\r
-                       }\r
-               }\r
-       }\r
-       \r
-       return YAFFS_OK;\r
-}\r
-\r
-\r
-\r
-\r
-\r
-/////////////////////// End of File Structure functions. /////////////////\r
-\r
-// yaffs_CreateFreeObjects creates a bunch more objects and\r
-// adds them to the object free list.\r
-static int yaffs_CreateFreeObjects(yaffs_Device *dev, int nObjects)\r
-{\r
-    int i;\r
-    yaffs_Object *newObjects;\r
-    yaffs_ObjectList *list;\r
-    \r
-    if(nObjects < 1) return YAFFS_OK;\r
-   \r
-       // make these things\r
-       \r
-    newObjects = YMALLOC(nObjects * sizeof(yaffs_Object));\r
-   \r
-    if (!newObjects)\r
-    {\r
-               T(YAFFS_TRACE_ALLOCATE,(TSTR("yaffs: Could not allocate more objects" TENDSTR)));\r
-               return YAFFS_FAIL;\r
-    }\r
-    \r
-    // Hook them into the free list\r
-    for(i = 0; i < nObjects - 1; i++)\r
-    {\r
-       (yaffs_Object *)newObjects[i].siblings.next = &newObjects[i+1];\r
-    }\r
-       \r
-       newObjects[nObjects - 1].siblings.next = (void *)dev->freeObjects;\r
-       dev->freeObjects = newObjects;\r
-       dev->nFreeObjects+= nObjects;\r
-       dev->nObjectsCreated+= nObjects;\r
-       \r
-       // Now add this bunch of Objects to a list for freeing up.\r
-       \r
-       list = YMALLOC(sizeof(yaffs_ObjectList));\r
-       if(!list)\r
-       {\r
-               T(YAFFS_TRACE_ALLOCATE,(TSTR("Could not add objects to management list" TENDSTR)));\r
-       }\r
-       else\r
-       {\r
-               list->objects = newObjects;\r
-               list->next = dev->allocatedObjectList;\r
-               dev->allocatedObjectList = list;\r
-       }\r
-       \r
-       \r
-       \r
-       return YAFFS_OK;\r
-}\r
-\r
-\r
-// AllocateEmptyObject gets us a clean Object. Tries to make allocate more if we run out\r
-static yaffs_Object *yaffs_AllocateEmptyObject(yaffs_Device *dev)\r
-{\r
-       yaffs_Object *tn = NULL;\r
-       \r
-       // If there are none left make more\r
-       if(!dev->freeObjects)\r
-       {\r
-               yaffs_CreateFreeObjects(dev,YAFFS_ALLOCATION_NOBJECTS);\r
-       }\r
-       \r
-       if(dev->freeObjects)\r
-       {\r
-               tn = dev->freeObjects;\r
-               dev->freeObjects = (yaffs_Object *)(dev->freeObjects->siblings.next);\r
-               dev->nFreeObjects--;\r
-               \r
-               // Now sweeten it up...\r
-       \r
-               memset(tn,0,sizeof(yaffs_Object));\r
-               tn->myDev = dev;\r
-               tn->chunkId = -1;\r
-               tn->variantType = YAFFS_OBJECT_TYPE_UNKNOWN;\r
-               INIT_LIST_HEAD(&(tn->hardLinks));\r
-               INIT_LIST_HEAD(&(tn->hashLink));\r
-               INIT_LIST_HEAD(&tn->siblings);\r
-               \r
-               // Add it to the lost and found directory.\r
-               // NB Can't put root or lostNFound in lostNFound so\r
-               // check if lostNFound exists first\r
-               if(dev->lostNFoundDir)\r
-               {\r
-                       yaffs_AddObjectToDirectory(dev->lostNFoundDir,tn);      \r
-               }\r
-       }\r
-       \r
-\r
-       return tn;\r
-}\r
-\r
-static yaffs_Object *yaffs_CreateFakeDirectory(yaffs_Device *dev,int number,__u32 mode)\r
-{\r
-\r
-       yaffs_Object *obj = yaffs_CreateNewObject(dev,number,YAFFS_OBJECT_TYPE_DIRECTORY);              \r
-       if(obj)\r
-       {\r
-               obj->fake = 1;                  // it is fake so it has no NAND presence...\r
-               obj->renameAllowed= 0;  // ... and we're not allowed to rename it...\r
-               obj->unlinkAllowed= 0;  // ... or unlink it\r
-               obj->deleted = 0;\r
-               obj->unlinked = 0;\r
-               obj->st_mode = mode;\r
-               obj->myDev = dev;\r
-               obj->chunkId = 0; // Not a valid chunk.\r
-       }\r
-       \r
-       return obj;\r
-       \r
-}\r
-\r
-\r
-static void yaffs_UnhashObject(yaffs_Object *tn)\r
-{\r
-       int bucket;\r
-       yaffs_Device *dev = tn->myDev;\r
-       \r
-       \r
-       // If it is still linked into the bucket list, free from the list\r
-       if(!list_empty(&tn->hashLink))\r
-       {\r
-               list_del_init(&tn->hashLink);\r
-               bucket =  yaffs_HashFunction(tn->objectId);\r
-               dev->objectBucket[bucket].count--;\r
-       }\r
-       \r
-}\r
-\r
-\r
-// FreeObject frees up a Object and puts it back on the free list\r
-static void yaffs_FreeObject(yaffs_Object *tn)\r
-{\r
-\r
-       yaffs_Device *dev = tn->myDev;\r
-       \r
-       yaffs_UnhashObject(tn);\r
-       \r
-       // Link into the free list.\r
-       (yaffs_Object *)(tn->siblings.next) = dev->freeObjects;\r
-       dev->freeObjects = tn;\r
-       dev->nFreeObjects++;\r
-}\r
-\r
-\r
-\r
-\r
-static void yaffs_DeinitialiseObjects(yaffs_Device *dev)\r
-{\r
-       // Free the list of allocated Objects\r
-       \r
-       while( dev->allocatedObjectList)\r
-       {\r
-               YFREE(dev->allocatedObjectList->objects);\r
-               dev->allocatedObjectList =  dev->allocatedObjectList->next;\r
-       }\r
-       \r
-       dev->freeObjects = NULL;\r
-       dev->nFreeObjects = 0;\r
-}\r
-\r
-static void yaffs_InitialiseObjects(yaffs_Device *dev)\r
-{\r
-       int i;\r
-       \r
-       dev->allocatedObjectList = NULL;\r
-       dev->freeObjects = NULL;\r
-       dev->nFreeObjects = 0;\r
-       \r
-       for(i = 0; i < YAFFS_NOBJECT_BUCKETS; i++)\r
-       {\r
-               INIT_LIST_HEAD(&dev->objectBucket[i].list);\r
-               dev->objectBucket[i].count = 0; \r
-       }\r
-\r
-}\r
-\r
-\r
-\r
-\r
-\r
-\r
-int yaffs_FindNiceObjectBucket(yaffs_Device *dev)\r
-{\r
-       static int x = 0;\r
-       int i;\r
-       int l = 999;\r
-       int lowest = 999999;\r
-\r
-               \r
-       // First let's see if we can find one that's empty.\r
-       \r
-       for(i = 0; i < 10 && lowest > 0; i++)\r
-        {\r
-               x++;\r
-               x %=  YAFFS_NOBJECT_BUCKETS;\r
-               if(dev->objectBucket[x].count < lowest)\r
-               {\r
-                       lowest = dev->objectBucket[x].count;\r
-                       l = x;\r
-               }\r
-               \r
-       }\r
-       \r
-       // If we didn't find an empty list, then try\r
-       // looking a bit further for a short one\r
-       \r
-       for(i = 0; i < 10 && lowest > 3; i++)\r
-        {\r
-               x++;\r
-               x %=  YAFFS_NOBJECT_BUCKETS;\r
-               if(dev->objectBucket[x].count < lowest)\r
-               {\r
-                       lowest = dev->objectBucket[x].count;\r
-                       l = x;\r
-               }\r
-               \r
-       }\r
-       \r
-       return l;\r
-}\r
-\r
-static int yaffs_CreateNewObjectNumber(yaffs_Device *dev)\r
-{\r
-       int bucket = yaffs_FindNiceObjectBucket(dev);\r
-       \r
-       // Now find an object value that has not already been taken\r
-       // by scanning the list.\r
-       \r
-       int found = 0;\r
-       struct list_head *i;\r
-       \r
-       __u32 n = (__u32)bucket;\r
-\r
-       //yaffs_CheckObjectHashSanity();        \r
-       \r
-       while(!found)\r
-       {\r
-               found = 1;\r
-               n +=  YAFFS_NOBJECT_BUCKETS;\r
-               if(1 ||dev->objectBucket[bucket].count > 0)\r
-               {\r
-                       list_for_each(i,&dev->objectBucket[bucket].list)\r
-                       {\r
-                               // If there is already one in the list\r
-                               if(list_entry(i, yaffs_Object,hashLink)->objectId == n)\r
-                               {\r
-                                       found = 0;\r
-                               }\r
-                       }\r
-               }\r
-       }\r
-       \r
-       //T(("bucket %d count %d inode %d\n",bucket,yaffs_objectBucket[bucket].count,n);\r
-       \r
-       return n;       \r
-}\r
-\r
-void yaffs_HashObject(yaffs_Object *in)\r
-{\r
-       int bucket = yaffs_HashFunction(in->objectId);\r
-       yaffs_Device *dev = in->myDev;\r
-       \r
-       if(!list_empty(&in->hashLink))\r
-       {\r
-               //YINFO("!!!");\r
-       }\r
-\r
-       \r
-       list_add(&in->hashLink,&dev->objectBucket[bucket].list);\r
-       dev->objectBucket[bucket].count++;\r
-\r
-}\r
-\r
-yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device *dev,__u32 number)\r
-{\r
-       int bucket = yaffs_HashFunction(number);\r
-       struct list_head *i;\r
-       yaffs_Object *in;\r
-       \r
-       list_for_each(i,&dev->objectBucket[bucket].list)\r
-       {\r
-               // Look if it is in the list\r
-               in = list_entry(i, yaffs_Object,hashLink);\r
-               if(in->objectId == number)\r
-               {\r
-                       return in;\r
-               }\r
-       }\r
-       \r
-       return NULL;\r
-}\r
-\r
-\r
-\r
-yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev,int number,yaffs_ObjectType type)\r
-{\r
-               \r
-       yaffs_Object *theObject;\r
-\r
-       if(number < 0)\r
-       {\r
-               number = yaffs_CreateNewObjectNumber(dev);\r
-       }\r
-       \r
-       theObject = yaffs_AllocateEmptyObject(dev);\r
-       \r
-       if(theObject)\r
-       {\r
-               theObject->fake = 0;\r
-               theObject->renameAllowed = 1;\r
-               theObject->unlinkAllowed = 1;\r
-               theObject->objectId = number;\r
-               yaffs_HashObject(theObject);\r
-               theObject->variantType = type;\r
-#ifdef CONFIG_YAFFS_WINCE\r
-               yfsd_WinFileTimeNow(theObject->win_atime);\r
-               theObject->win_ctime[0] = theObject->win_mtime[0] = theObject->win_atime[0];\r
-               theObject->win_ctime[1] = theObject->win_mtime[1] = theObject->win_atime[1];\r
-\r
-#else\r
-               theObject->st_atime = theObject->st_mtime =     theObject->st_ctime = CURRENT_TIME;\r
-#endif\r
-               switch(type)\r
-               {\r
-                       case YAFFS_OBJECT_TYPE_FILE: \r
-                               theObject->variant.fileVariant.fileSize = 0;\r
-                               theObject->variant.fileVariant.scannedFileSize = 0;\r
-                               theObject->variant.fileVariant.topLevel = 0;\r
-                               theObject->variant.fileVariant.top  = yaffs_GetTnode(dev);\r
-                               break;\r
-                       case YAFFS_OBJECT_TYPE_DIRECTORY:\r
-                               INIT_LIST_HEAD(&theObject->variant.directoryVariant.children);\r
-                               break;\r
-                       case YAFFS_OBJECT_TYPE_SYMLINK:\r
-                               // No action required\r
-                               break;\r
-                       case YAFFS_OBJECT_TYPE_HARDLINK:\r
-                               // No action required\r
-                               break;\r
-                       case YAFFS_OBJECT_TYPE_SPECIAL:\r
-                               // No action required\r
-                               break;\r
-                       case YAFFS_OBJECT_TYPE_UNKNOWN:\r
-                               // todo this should not happen\r
-                               break;\r
-               }\r
-       }\r
-       \r
-       return theObject;\r
-}\r
-\r
-yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device *dev, int number,yaffs_ObjectType type)\r
-{\r
-       yaffs_Object *theObject = NULL;\r
-       \r
-       if(number > 0)\r
-       {\r
-               theObject = yaffs_FindObjectByNumber(dev,number);\r
-       }\r
-       \r
-       if(!theObject)\r
-       {\r
-               theObject = yaffs_CreateNewObject(dev,number,type);\r
-       }\r
-       \r
-       return theObject;\r
-\r
-}\r
-\r
-char *yaffs_CloneString(const char *str)\r
-{\r
-       char *newStr = NULL;\r
-       \r
-       if(str && *str)\r
-       {\r
-               newStr = YMALLOC(strlen(str) + 1);\r
-               strcpy(newStr,str);\r
-       }\r
-\r
-       return newStr;\r
-       \r
-}\r
-\r
-//\r
-// Mknod (create) a new object.\r
-// equivalentObject only has meaning for a hard link;\r
-// aliasString only has meaning for a sumlink.\r
-// rdev only has meaning for devices (a subset of special objects)\r
-yaffs_Object *yaffs_MknodObject( yaffs_ObjectType type,\r
-                                                                yaffs_Object *parent,\r
-                                                                const char *name, \r
-                                                                __u32 mode,\r
-                                                                __u32 uid,\r
-                                                                __u32 gid,\r
-                                                                yaffs_Object *equivalentObject,\r
-                                                                const char *aliasString,\r
-                                                                __u32 rdev)\r
-{\r
-       yaffs_Object *in;\r
-\r
-       yaffs_Device *dev = parent->myDev;\r
-       \r
-       // Check if the entry exists. If it does then fail the call since we don't want a dup.\r
-       if(yaffs_FindObjectByName(parent,name))\r
-       {\r
-               return NULL;\r
-       }\r
-       \r
-       in = yaffs_CreateNewObject(dev,-1,type);\r
-       \r
-       if(in)\r
-       {\r
-               in->chunkId = -1;\r
-               in->valid = 1;\r
-               in->variantType = type;\r
-\r
-               in->st_mode  = mode;\r
-               \r
-#ifdef CONFIG_YAFFS_WINCE\r
-               yfsd_WinFileTimeNow(in->win_atime);\r
-               in->win_ctime[0] = in->win_mtime[0] = in->win_atime[0];\r
-               in->win_ctime[1] = in->win_mtime[1] = in->win_atime[0];\r
-               \r
-#else\r
-               in->st_atime = in->st_mtime = in->st_ctime = CURRENT_TIME;\r
-               in->st_rdev  = rdev;\r
-               in->st_uid   = uid;\r
-               in->st_gid   = gid;\r
-#endif         \r
-               in->nDataChunks = 0;\r
-\r
-               yaffs_SetObjectName(in,name);\r
-               in->dirty = 1;\r
-               \r
-               yaffs_AddObjectToDirectory(parent,in);\r
-               \r
-               in->myDev = parent->myDev;\r
-               \r
-                               \r
-               switch(type)\r
-               {\r
-                       case YAFFS_OBJECT_TYPE_SYMLINK:\r
-                               in->variant.symLinkVariant.alias = yaffs_CloneString(aliasString);\r
-                               break;\r
-                       case YAFFS_OBJECT_TYPE_HARDLINK:\r
-                               in->variant.hardLinkVariant.equivalentObject = equivalentObject;\r
-                               in->variant.hardLinkVariant.equivalentObjectId = equivalentObject->objectId;\r
-                               list_add(&in->hardLinks,&equivalentObject->hardLinks);\r
-                               break;\r
-                       case YAFFS_OBJECT_TYPE_FILE: // do nothing\r
-                       case YAFFS_OBJECT_TYPE_DIRECTORY: // do nothing\r
-                       case YAFFS_OBJECT_TYPE_SPECIAL: // do nothing\r
-                       case YAFFS_OBJECT_TYPE_UNKNOWN:\r
-                               break;\r
-               }\r
-\r
-               if(yaffs_GetNumberOfFreeChunks(dev) <= 0 ||\r
-                  yaffs_UpdateObjectHeader(in,name,0) < 0)\r
-               {\r
-                       // Could not create the object header, fail the creation\r
-                       yaffs_UnlinkWorker(in);\r
-                       in = NULL;\r
-               }\r
-\r
-       }\r
-       \r
-       return in;\r
-}\r
-\r
-yaffs_Object *yaffs_MknodFile(yaffs_Object *parent,const char *name, __u32 mode, __u32 uid, __u32 gid)\r
-{\r
-       return yaffs_MknodObject(YAFFS_OBJECT_TYPE_FILE,parent,name,mode,uid,gid,NULL,NULL,0);\r
-}\r
-\r
-yaffs_Object *yaffs_MknodDirectory(yaffs_Object *parent,const char *name, __u32 mode, __u32 uid, __u32 gid)\r
-{\r
-       return yaffs_MknodObject(YAFFS_OBJECT_TYPE_DIRECTORY,parent,name,mode,uid,gid,NULL,NULL,0);\r
-}\r
-\r
-yaffs_Object *yaffs_MknodSpecial(yaffs_Object *parent,const char *name, __u32 mode, __u32 uid, __u32 gid, __u32 rdev)\r
-{\r
-       return yaffs_MknodObject(YAFFS_OBJECT_TYPE_DIRECTORY,parent,name,mode,uid,gid,NULL,NULL,rdev);\r
-}\r
-\r
-yaffs_Object *yaffs_MknodSymLink(yaffs_Object *parent,const char *name, __u32 mode, __u32 uid, __u32 gid,const char *alias)\r
-{\r
-       return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SYMLINK,parent,name,mode,uid,gid,NULL,alias,0);\r
-}\r
-\r
-// NB yaffs_Link returns the object id of the equivalent object.\r
-yaffs_Object *yaffs_Link(yaffs_Object *parent, const char *name, yaffs_Object *equivalentObject)\r
-{\r
-       // Get the real object in case we were fed a hard link as an equivalent object\r
-       equivalentObject = yaffs_GetEquivalentObject(equivalentObject);\r
-       \r
-       if(yaffs_MknodObject(YAFFS_OBJECT_TYPE_HARDLINK,parent,name,0,0,0,equivalentObject,NULL,0))\r
-       {\r
-               return equivalentObject;\r
-       }\r
-       else\r
-       {\r
-               return NULL;\r
-       }\r
-       \r
-}\r
-\r
-\r
-static int yaffs_ChangeObjectName(yaffs_Object *obj, yaffs_Object *newDir, const char *newName,int force)\r
-{\r
-       int unlinkOp;\r
-\r
-       if(newDir == NULL)\r
-       {\r
-               newDir = obj->parent; // use the old directory\r
-       }\r
-\r
-       unlinkOp = (newDir == obj->myDev->unlinkedDir && obj->variantType == YAFFS_OBJECT_TYPE_FILE);\r
-       \r
-       // If the object is a file going into the unlinked directory, then it is OK to just stuff it in since\r
-       // duplicate names are allowed.\r
-       // Otherwise only proceed if the new name does not exist and if we're putting it into a directory.\r
-       if( (unlinkOp|| \r
-                force || \r
-                !yaffs_FindObjectByName(newDir,newName))  &&\r
-            newDir->variantType == YAFFS_OBJECT_TYPE_DIRECTORY)\r
-       {\r
-               yaffs_SetObjectName(obj,newName);\r
-               obj->dirty = 1;\r
-               \r
-               yaffs_AddObjectToDirectory(newDir,obj);\r
-               \r
-               if(unlinkOp) obj->unlinked = 1;\r
-               \r
-               \r
-               if(yaffs_UpdateObjectHeader(obj,newName,0) >= 0)\r
-               {\r
-                       return YAFFS_OK;\r
-               }\r
-       }\r
-       \r
-       return YAFFS_FAIL;\r
-}\r
-\r
-\r
-\r
-int yaffs_RenameObject(yaffs_Object *oldDir, const char *oldName, yaffs_Object *newDir, const char *newName)\r
-{\r
-       yaffs_Object *obj;\r
-       int force = 0;\r
-       \r
-#ifdef CONFIG_YAFFS_WINCE\r
-       // Special case for WinCE.\r
-       // While look-up is case insensitive, the name isn't.\r
-       // THerefore we might want to change x.txt to X.txt\r
-       if(oldDir == newDir && _stricmp(oldName,newName) == 0)\r
-       {\r
-               force = 1;\r
-       }       \r
-#endif\r
-       \r
-       obj = yaffs_FindObjectByName(oldDir,oldName);\r
-       if(obj && obj->renameAllowed)\r
-       {\r
-               return yaffs_ChangeObjectName(obj,newDir,newName,force);\r
-       }\r
-       return YAFFS_FAIL;\r
-}\r
-\r
-\r
-\r
-static int yaffs_CheckObjectHashSanity(yaffs_Device *dev)\r
-{\r
-       // Scan the buckets and check that the lists \r
-       // have as many members as the count says there are\r
-       int bucket;\r
-       int countEm;\r
-       struct list_head *j;\r
-       int ok = YAFFS_OK;\r
-       \r
-       for(bucket = 0; bucket < YAFFS_NOBJECT_BUCKETS; bucket++)\r
-       {\r
-               countEm = 0;\r
-               \r
-               list_for_each(j,&dev->objectBucket[bucket].list)\r
-               {\r
-                       countEm++;\r
-               }\r
-               \r
-               if(countEm != dev->objectBucket[bucket].count)\r
-               {\r
-                       T(YAFFS_TRACE_ERROR,(TSTR("Inode hash inconsistency" TENDSTR)));\r
-                       ok = YAFFS_FAIL;\r
-               }\r
-       }\r
-\r
-       return ok;\r
-}\r
-\r
-#if 0\r
-void yaffs_ObjectTest(yaffs_Device *dev)\r
-{\r
-       yaffs_Object *in[1000];\r
-       int inNo[1000];\r
-       yaffs_Object *inold[1000];\r
-       int i;\r
-       int j;\r
-       \r
-       memset(in,0,1000*sizeof(yaffs_Object *));\r
-       memset(inold,0,1000*sizeof(yaffs_Object *));\r
-       \r
-       yaffs_CheckObjectHashSanity(dev);\r
-       \r
-       for(j = 0; j < 10; j++)\r
-       {\r
-               //T(("%d\n",j));\r
-               \r
-               for(i = 0; i < 1000; i++)\r
-               {\r
-                       in[i] = yaffs_CreateNewObject(dev,-1,YAFFS_OBJECT_TYPE_FILE);\r
-                       if(!in[i])\r
-                       {\r
-                               YINFO("No more inodes");\r
-                       }\r
-                       else\r
-                       {\r
-                               inNo[i] = in[i]->objectId;\r
-                       }\r
-               }\r
-               \r
-               for(i = 0; i < 1000; i++)\r
-               {\r
-                       if(yaffs_FindObjectByNumber(dev,inNo[i]) != in[i])\r
-                       {\r
-                               //T(("Differnce in look up test\n"));\r
-                       }\r
-                       else\r
-                       {\r
-                               // T(("Look up ok\n"));\r
-                       }\r
-               }\r
-               \r
-               yaffs_CheckObjectHashSanity(dev);\r
-       \r
-               for(i = 0; i < 1000; i+=3)\r
-               {\r
-                       yaffs_FreeObject(in[i]);        \r
-                       in[i] = NULL;\r
-               }\r
-               \r
-       \r
-               yaffs_CheckObjectHashSanity(dev);\r
-       }\r
-               \r
-}\r
-\r
-#endif\r
-\r
-/////////////////////////// Block Management and Page Allocation ///////////////////\r
-\r
-\r
-static int yaffs_InitialiseBlocks(yaffs_Device *dev,int nBlocks)\r
-{\r
-       dev->allocationBlock = -1; // force it to get a new one\r
-       //Todo we're assuming the malloc will pass.\r
-       dev->blockInfo = YMALLOC(nBlocks * sizeof(yaffs_BlockInfo));\r
-       if(dev->blockInfo)\r
-       {\r
-               memset(dev->blockInfo,0,nBlocks * sizeof(yaffs_BlockInfo));\r
-               return YAFFS_OK;\r
-       }\r
-       return YAFFS_FAIL;\r
-       \r
-}\r
-\r
-static void yaffs_DeinitialiseBlocks(yaffs_Device *dev)\r
-{\r
-       YFREE(dev->blockInfo);\r
-}\r
-\r
-// FindDiretiestBlock is used to select the dirtiest block (or close enough)\r
-// for garbage collection.\r
-\r
-static int yaffs_FindDirtiestBlock(yaffs_Device *dev)\r
-{\r
-\r
-       int b = dev->currentDirtyChecker;\r
-       \r
-       int i;\r
-       int dirtiest = -1;\r
-       int pagesInUse = 100; // silly big number\r
-       yaffs_BlockInfo *bi;\r
-       \r
-       for(i = dev->startBlock; i <= dev->endBlock && pagesInUse > 2 ; i++)\r
-       {\r
-               b++;\r
-               if ( b < dev->startBlock || b > dev->endBlock)\r
-               {\r
-                       b =  dev->startBlock;\r
-               }\r
-\r
-               if(b < dev->startBlock || b > dev->endBlock)\r
-               {\r
-                       T(YAFFS_TRACE_ERROR,(TSTR("**>> Block %d is not valid" TENDSTR),b));\r
-                       YBUG();\r
-               }\r
-               \r
-               bi = yaffs_GetBlockInfo(dev,b);\r
-               \r
-               if(bi->blockState == YAFFS_BLOCK_STATE_FULL &&\r
-                  bi->pagesInUse < pagesInUse)\r
-               {\r
-                       dirtiest = b;\r
-                       pagesInUse = bi->pagesInUse;\r
-               }\r
-       }\r
-       \r
-       dev->currentDirtyChecker = b;\r
-       \r
-       return dirtiest;\r
-}\r
-\r
-\r
-static void yaffs_BlockBecameDirty(yaffs_Device *dev,int blockNo)\r
-{\r
-       yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,blockNo);\r
-       \r
-       int erasedOk = 0;\r
-       \r
-       // If the block is still healthy erase it and mark as clean.\r
-       // If the block has had a data failure, then retire it.\r
-       bi->blockState = YAFFS_BLOCK_STATE_DIRTY;\r
-\r
-       if(!bi->needsRetiring)\r
-       {\r
-               erasedOk = yaffs_EraseBlockInNAND(dev,blockNo);\r
-               if(!erasedOk)\r
-               {\r
-                       T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,(TSTR("**>> Erasure failed %d" TENDSTR),blockNo));\r
-               }\r
-       }\r
-       \r
-       if( erasedOk )\r
-       {\r
-               bi->blockState = YAFFS_BLOCK_STATE_EMPTY;\r
-               dev->nErasedBlocks++;\r
-               bi->pagesInUse = 0;\r
-               bi->pageBits = 0;\r
-       \r
-               T(YAFFS_TRACE_ERASE,(TSTR("Erased block %d" TENDSTR),blockNo));\r
-       }\r
-       else\r
-       {\r
-               yaffs_RetireBlock(dev,blockNo);\r
-               T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,(TSTR("**>> Block %d retired" TENDSTR),blockNo));\r
-       }\r
-}\r
-\r
-\r
-static int yaffs_FindBlockForAllocation(yaffs_Device *dev)\r
-{\r
-       int i;\r
-       yaffs_BlockInfo *bi;\r
-       \r
-       if(dev->nErasedBlocks < 1)\r
-       {\r
-               // Hoosterman we've got a problem.\r
-               // Can't get space to gc\r
-               T(YAFFS_TRACE_ERROR, (TSTR("yaffs tradgedy: no space during gc" TENDSTR)));\r
-\r
-               return -1;\r
-       }\r
-       \r
-       // Find an empty block.\r
-       \r
-       for(i = dev->startBlock; i <= dev->endBlock; i++)\r
-       {\r
-               bi = yaffs_GetBlockInfo(dev,i);\r
-               if(bi->blockState == YAFFS_BLOCK_STATE_EMPTY)\r
-               {\r
-                       bi->blockState = YAFFS_BLOCK_STATE_ALLOCATING;\r
-                       dev->nErasedBlocks--;                   \r
-                       return i;\r
-               }\r
-       }\r
-       \r
-       return -1;      \r
-}\r
-\r
-\r
-\r
-static int yaffs_AllocateChunk(yaffs_Device *dev,int useReserve)\r
-{\r
-       int retVal;\r
-       yaffs_BlockInfo *bi;\r
-       \r
-       if(dev->allocationBlock < 0)\r
-       {\r
-               // Get next block to allocate off\r
-               dev->allocationBlock = yaffs_FindBlockForAllocation(dev);\r
-               dev->allocationPage = 0;\r
-       }\r
-       \r
-       if(!useReserve &&  dev->nErasedBlocks <= YAFFS_RESERVED_BLOCKS)\r
-       {\r
-               // Not enough space to allocate unless we're allowed to use the reserve.\r
-               return -1;\r
-       }\r
-       \r
-       // Next page please....\r
-       if(dev->allocationBlock >= 0)\r
-       {\r
-               bi = yaffs_GetBlockInfo(dev,dev->allocationBlock);\r
-               \r
-               retVal = (dev->allocationBlock * YAFFS_CHUNKS_PER_BLOCK) + \r
-                                 dev->allocationPage;\r
-               bi->pagesInUse++;\r
-               bi->pageBits |= (1 << (dev->allocationPage));\r
-\r
-               dev->allocationPage++;\r
-               \r
-               dev->nFreeChunks--;\r
-               \r
-               // If the block is full set the state to full\r
-               if(dev->allocationPage >= YAFFS_CHUNKS_PER_BLOCK)\r
-               {\r
-                       bi->blockState = YAFFS_BLOCK_STATE_FULL;\r
-                       dev->allocationBlock = -1;\r
-               }\r
-\r
-\r
-               return retVal;\r
-               \r
-       }\r
-       T(YAFFS_TRACE_ERROR,(TSTR("!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!" TENDSTR)));\r
-\r
-       return -1;      \r
-}\r
-\r
-// To determine if we have enough space we just look at the \r
-// number of erased blocks.\r
-// The cache is allowed to use reserved blocks.\r
-\r
-int yaffs_CheckSpaceForChunkCache(yaffs_Device *dev)\r
-{\r
-       return (dev->nErasedBlocks >= YAFFS_RESERVED_BLOCKS);\r
-}\r
-\r
-\r
-int  yaffs_GarbageCollectBlock(yaffs_Device *dev,int block)\r
-{\r
-       int oldChunk;\r
-       int newChunk;\r
-       __u32 mask;\r
-       \r
-       \r
-       yaffs_Spare spare;\r
-       yaffs_Tags  tags;\r
-               __u8  buffer[YAFFS_BYTES_PER_CHUNK];\r
-       \r
-       yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,block);\r
-       \r
-       yaffs_Object *object;\r
-\r
-       //T(("Collecting block %d n %d bits %x\n",block, bi->pagesInUse, bi->pageBits));        \r
-       \r
-       for(mask = 1,oldChunk = block * YAFFS_CHUNKS_PER_BLOCK; \r
-           mask && bi->pageBits;\r
-           mask <<= 1, oldChunk++ )\r
-       {\r
-               if(bi->pageBits & mask)\r
-               {\r
-                       \r
-                       // This page is in use and needs to be copied off\r
-                       \r
-                       dev->nGCCopies++;\r
-                       \r
-                       //T(("copying page %x from %d to %d\n",mask,oldChunk,newChunk));\r
-                       \r
-                       yaffs_ReadChunkFromNAND(dev,oldChunk,buffer, &spare,1);\r
-                       \r
-                       yaffs_GetTagsFromSpare(dev,&spare,&tags);\r
-\r
-                       object = yaffs_FindObjectByNumber(dev,tags.objectId);\r
-                       \r
-                       if(object && object->deleted && tags.chunkId != 0)\r
-                       {\r
-                               // Data chunk in a deleted file, throw it away\r
-                               // It's a deleted data chunk,\r
-                               // No need to copy this, just forget about it and fix up the\r
-                               // object.\r
-                               \r
-                               yaffs_PutChunkIntoFile(object, tags.chunkId, 0,0); \r
-                               object->nDataChunks--;\r
-                       }\r
-                       else if( 0 /* Todo object && object->deleted && object->nDataChunks == 0 */)\r
-                       {\r
-                               // Deleted object header with no data chunks.\r
-                               // Can be discarded\r
-                               object->chunkId = 0;\r
-                               //Todo some clean up\r
-                               \r
-                       }\r
-                       else if(object)\r
-                       {\r
-                               // It's either a data chunk in a live file or\r
-                               // an ObjectHeader, so we're interested in it.\r
-                               // NB Need to keep the ObjectHeaders of deleted files\r
-                               // until the whole file has been deleted off\r
-                               tags.serialNumber++;\r
-                               yaffs_LoadTagsIntoSpare(&spare,&tags);\r
-\r
-\r
-                               newChunk = yaffs_WriteNewChunkToNAND(dev, buffer, &spare,1);\r
-                       \r
-                               if(newChunk < 0)\r
-                               {\r
-                                       return YAFFS_FAIL;\r
-                               }\r
-                       \r
-                               // Ok, now fix up the Tnodes etc.\r
-                       \r
-                               if(tags.chunkId == 0)\r
-                               {\r
-                                       // It's a header\r
-                                       object->chunkId = newChunk;\r
-                               }\r
-                               else\r
-                               {\r
-                                       // It's a data chunk\r
-                                       yaffs_PutChunkIntoFile(object, tags.chunkId, newChunk,0);\r
-                               }\r
-                       }\r
-                       \r
-                       yaffs_DeleteChunk(dev,oldChunk);                        \r
-                       \r
-               }\r
-       }\r
-\r
-       return YAFFS_OK;\r
-}\r
-\r
-\r
-static yaffs_Object *yaffs_FindDeletedUnlinkedFile(yaffs_Device *dev)\r
-{\r
-       // todo find a file to delete\r
-       struct list_head *i;    \r
-       yaffs_Object *l;\r
-\r
-\r
-       // To the free chunks add the chunks that are in the deleted unlinked files.\r
-       list_for_each(i,&dev->unlinkedDir->variant.directoryVariant.children)\r
-       {\r
-               l = list_entry(i, yaffs_Object,siblings);\r
-               if(l->deleted)\r
-               {\r
-                       return l;                       \r
-               }\r
-       }       \r
-       return NULL;\r
-}\r
-\r
-static void yaffs_DoUnlinkedFileDeletion(yaffs_Device *dev)\r
-{\r
-       // This does background deletion on unlinked files.. only deleted ones.\r
-       // If we don't have a file we're working on then find one\r
-       if(!dev->unlinkedDeletion && dev->nDeletedFiles > 0)\r
-       {\r
-               dev->unlinkedDeletion = yaffs_FindDeletedUnlinkedFile(dev);\r
-       }\r
-       \r
-       // OK, we're working on a file...\r
-       if(dev->unlinkedDeletion)\r
-       {\r
-               yaffs_Object *obj = dev->unlinkedDeletion;\r
-               int delresult;\r
-               int limit; // Number of chunks to delete in a file.\r
-                                  // NB this can be exceeded, but not by much.\r
-                                  \r
-               limit = 5;\r
-#if 0                             \r
-               if(dev->nErasedBlocks <= (YAFFS_RESERVED_BLOCKS + YAFFS_GARBAGE_COLLECT_LOW_WATER))\r
-               {\r
-                       limit = 50; // Doing GC soon, so dig deeper     \r
-               }\r
-               else\r
-               {\r
-                       limit = 5;\r
-               }\r
-#endif\r
-       \r
-               delresult = yaffs_DeleteWorker(obj, obj->variant.fileVariant.top, obj->variant.fileVariant.topLevel, 0,&limit);\r
-               \r
-               if(obj->nDataChunks == 0)\r
-               {\r
-                       // Done all the deleting of data chunks.\r
-                       // Now dump the header and clean up\r
-                       yaffs_FreeTnode(dev,obj->variant.fileVariant.top);\r
-                       yaffs_DoGenericObjectDeletion(obj);\r
-                       dev->nDeletedFiles--;\r
-                       dev->nUnlinkedFiles--;\r
-                       dev->nBackgroundDeletions++;\r
-                       dev->unlinkedDeletion = NULL;   \r
-               }\r
-       }\r
-}\r
-\r
-\r
-\r
-static int yaffs_CheckGarbageCollection(yaffs_Device *dev)\r
-{\r
-       int block;\r
-       \r
-       yaffs_DoUnlinkedFileDeletion(dev);\r
-       \r
-       if(dev->nErasedBlocks <= (YAFFS_RESERVED_BLOCKS + YAFFS_GARBAGE_COLLECT_LOW_WATER))\r
-       {\r
-               dev->garbageCollectionRequired = 1;\r
-       }       \r
-       \r
-       if(dev->garbageCollectionRequired)\r
-       {\r
-               dev->garbageCollections++;\r
-               dev->garbageCollectionRequired = 0;\r
-               if(dev->blockSelectedForGC >= 0)\r
-               {\r
-                       block = dev->blockSelectedForGC;\r
-               }\r
-               else\r
-               {\r
-                       block = yaffs_FindDirtiestBlock(dev);\r
-               }\r
-               \r
-               if(block >= 0)\r
-               {\r
-                       return yaffs_GarbageCollectBlock(dev,block);\r
-               }       \r
-               else\r
-               {\r
-                       return YAFFS_FAIL;\r
-               }\r
-       }\r
-\r
-       return YAFFS_OK;\r
-}\r
-\r
-\r
-//////////////////////////// TAGS ///////////////////////////////////////\r
-\r
-static void yaffs_LoadTagsIntoSpare(yaffs_Spare *sparePtr, yaffs_Tags *tagsPtr)\r
-{\r
-       yaffs_TagsUnion *tu = (yaffs_TagsUnion *)tagsPtr;\r
-       \r
-       yaffs_CalcTagsECC(tagsPtr);\r
-       \r
-       sparePtr->tagByte0 = tu->asBytes[0];\r
-       sparePtr->tagByte1 = tu->asBytes[1];\r
-       sparePtr->tagByte2 = tu->asBytes[2];\r
-       sparePtr->tagByte3 = tu->asBytes[3];\r
-       sparePtr->tagByte4 = tu->asBytes[4];\r
-       sparePtr->tagByte5 = tu->asBytes[5];\r
-       sparePtr->tagByte6 = tu->asBytes[6];\r
-       sparePtr->tagByte7 = tu->asBytes[7];\r
-}\r
-\r
-static void yaffs_GetTagsFromSpare(yaffs_Device *dev, yaffs_Spare *sparePtr,yaffs_Tags *tagsPtr)\r
-{\r
-       yaffs_TagsUnion *tu = (yaffs_TagsUnion *)tagsPtr;\r
-       int result;\r
-\r
-       tu->asBytes[0]= sparePtr->tagByte0;\r
-       tu->asBytes[1]= sparePtr->tagByte1;\r
-       tu->asBytes[2]= sparePtr->tagByte2;\r
-       tu->asBytes[3]= sparePtr->tagByte3;\r
-       tu->asBytes[4]= sparePtr->tagByte4;\r
-       tu->asBytes[5]= sparePtr->tagByte5;\r
-       tu->asBytes[6]= sparePtr->tagByte6;\r
-       tu->asBytes[7]= sparePtr->tagByte7;\r
-       \r
-       result =  yaffs_CheckECCOnTags(tagsPtr);\r
-       if(result> 0)\r
-       {\r
-               dev->tagsEccFixed++;\r
-       }\r
-       else if(result <0)\r
-       {\r
-               dev->tagsEccUnfixed++;\r
-       }\r
-}\r
-\r
-static void yaffs_SpareInitialise(yaffs_Spare *spare)\r
-{\r
-       memset(spare,0xFF,sizeof(yaffs_Spare));\r
-}\r
-\r
-static int yaffs_ReadChunkTagsFromNAND(yaffs_Device *dev,int chunkInNAND, yaffs_Tags *tags, int *chunkDeleted)\r
-{\r
-       if(tags)\r
-       {\r
-               yaffs_Spare spare;\r
-               if(yaffs_ReadChunkFromNAND(dev,chunkInNAND,NULL,&spare,1) == YAFFS_OK)\r
-               {\r
-                       *chunkDeleted = (yaffs_CountBits(spare.pageStatus) < 7) ? 1 : 0;\r
-                       yaffs_GetTagsFromSpare(dev,&spare,tags);\r
-                       return YAFFS_OK;\r
-               }\r
-               else\r
-               {\r
-                       return YAFFS_FAIL;\r
-               }\r
-       }\r
-       \r
-       return YAFFS_OK;\r
-}\r
-\r
-#if 0\r
-static int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND, const __u8 *buffer, yaffs_Tags *tags)\r
-{\r
-       // NB There must be tags, data is optional\r
-       // If there is data, then an ECC is calculated on it.\r
-       \r
-       yaffs_Spare spare;\r
-       \r
-       if(!tags)\r
-       {\r
-               return YAFFS_FAIL;\r
-       }\r
-       \r
-       yaffs_SpareInitialise(&spare);\r
-       \r
-\r
-       if(buffer)\r
-       {\r
-               yaffs_CalcECC(buffer,&spare);\r
-       }\r
-       \r
-       yaffs_LoadTagsIntoSpare(&spare,tags);\r
-       \r
-       return yaffs_WriteChunkToNAND(dev,chunkInNAND,buffer,&spare);\r
-       \r
-}\r
-#endif\r
-\r
-\r
-static int yaffs_WriteNewChunkWithTagsToNAND(yaffs_Device *dev, const __u8 *buffer, yaffs_Tags *tags, int useReserve)\r
-{\r
-       // NB There must be tags, data is optional\r
-       // If there is data, then an ECC is calculated on it.\r
-       \r
-       yaffs_Spare spare;\r
-       \r
-       if(!tags)\r
-       {\r
-               return YAFFS_FAIL;\r
-       }\r
-       \r
-       yaffs_SpareInitialise(&spare);\r
-       \r
-\r
-       if(buffer)\r
-       {\r
-               yaffs_CalcECC(buffer,&spare);\r
-       }\r
-       \r
-       yaffs_LoadTagsIntoSpare(&spare,tags);\r
-       \r
-       return yaffs_WriteNewChunkToNAND(dev,buffer,&spare,useReserve);\r
-       \r
-}\r
-\r
-static int yaffs_TagsMatch(const yaffs_Tags *tags, int objectId, int chunkInObject, int chunkDeleted)\r
-{\r
-       return  (  tags->chunkId == chunkInObject &&\r
-                          tags->objectId == objectId &&\r
-                          !chunkDeleted) ? 1 : 0;\r
-       \r
-}\r
-\r
-\r
-\r
-int yaffs_FindChunkInFile(yaffs_Object *in,int chunkInInode,yaffs_Tags *tags)\r
-{\r
-       //Get the Tnode, then get the level 0 offset chunk offset\r
-    yaffs_Tnode *tn;     \r
-    int theChunk = -1;\r
-    yaffs_Tags localTags;\r
-    int i;\r
-    int found = 0;\r
-    int chunkDeleted;\r
-    \r
-    yaffs_Device *dev = in->myDev;\r
-    \r
-    \r
-    if(!tags)\r
-    {\r
-       // Passed a NULL, so use our own tags space\r
-       tags = &localTags;\r
-    }\r
-    \r
-    tn = yaffs_FindLevel0Tnode(dev,&in->variant.fileVariant, chunkInInode);\r
-    \r
-    if(tn)\r
-    {\r
-               theChunk = tn->level0[chunkInInode & YAFFS_TNODES_LEVEL0_MASK] << dev->chunkGroupBits;\r
-\r
-               // Now we need to do the shifting etc and search for it\r
-               for(i = 0,found = 0; theChunk && i < dev->chunkGroupSize && !found; i++)\r
-               {\r
-                       yaffs_ReadChunkTagsFromNAND(dev,theChunk,tags,&chunkDeleted);\r
-                       if(yaffs_TagsMatch(tags,in->objectId,chunkInInode,chunkDeleted))\r
-                       {\r
-                               // found it;\r
-                               found = 1;\r
-                       }\r
-                       else\r
-                       {\r
-                               theChunk++;\r
-                       }\r
-               }\r
-    }\r
-    return found ? theChunk : -1;\r
-}\r
-\r
-int yaffs_FindAndDeleteChunkInFile(yaffs_Object *in,int chunkInInode,yaffs_Tags *tags)\r
-{\r
-       //Get the Tnode, then get the level 0 offset chunk offset\r
-    yaffs_Tnode *tn;     \r
-    int theChunk = -1;\r
-    yaffs_Tags localTags;\r
-    int i;\r
-    int found = 0;\r
-    yaffs_Device *dev = in->myDev;\r
-    int chunkDeleted;\r
-    \r
-    if(!tags)\r
-    {\r
-       // Passed a NULL, so use our own tags space\r
-       tags = &localTags;\r
-    }\r
-    \r
-    tn = yaffs_FindLevel0Tnode(dev,&in->variant.fileVariant, chunkInInode);\r
-    \r
-    if(tn)\r
-    {\r
-    \r
-               theChunk = tn->level0[chunkInInode & YAFFS_TNODES_LEVEL0_MASK] << dev->chunkGroupBits;\r
-    \r
-               // Now we need to do the shifting etc and search for it\r
-               for(i = 0,found = 0; theChunk && i < dev->chunkGroupSize && !found; i++)\r
-               {\r
-                       yaffs_ReadChunkTagsFromNAND(dev,theChunk,tags,&chunkDeleted);\r
-                       if(yaffs_TagsMatch(tags,in->objectId,chunkInInode,chunkDeleted))\r
-                       {\r
-                               // found it;\r
-                               found = 1;\r
-                       }\r
-                       else\r
-                       {\r
-                               theChunk++;\r
-                       }\r
-               }\r
-    \r
-               // Delete the entry in the filestructure\r
-               if(found)\r
-               {\r
-                       tn->level0[chunkInInode & YAFFS_TNODES_LEVEL0_MASK] = 0;\r
-               }\r
-    }\r
-    else\r
-    {\r
-       //T(("No level 0 found for %d\n", chunkInInode));\r
-    }\r
-    \r
-    if(!found)\r
-    {\r
-       //T(("Could not find %d to delete\n",chunkInInode));\r
-    }\r
-    return found ? theChunk : -1;\r
-}\r
-\r
-\r
-#ifdef YAFFS_PARANOID\r
-\r
-static int yaffs_CheckFileSanity(yaffs_Object *in)\r
-{\r
-       int chunk;\r
-       int nChunks;\r
-       int fSize;\r
-       int failed = 0;\r
-       int objId;\r
-       yaffs_Tnode *tn;\r
-    yaffs_Tags localTags;\r
-    yaffs_Tags *tags = &localTags;\r
-    int theChunk;\r
-    int chunkDeleted;\r
-    \r
-       \r
-       if(in->variantType != YAFFS_OBJECT_TYPE_FILE)\r
-       {\r
-               //T(("Object not a file\n"));\r
-               return YAFFS_FAIL;\r
-       }\r
-       \r
-       objId = in->objectId;\r
-       fSize  = in->variant.fileVariant.fileSize;\r
-       nChunks = (fSize + YAFFS_BYTES_PER_CHUNK -1)/YAFFS_BYTES_PER_CHUNK;\r
-       \r
-       for(chunk = 1; chunk <= nChunks; chunk++)\r
-       {\r
-               tn = yaffs_FindLevel0Tnode(in->myDev,&in->variant.fileVariant, chunk);\r
-    \r
-               if(tn)\r
-               {\r
-    \r
-                       theChunk = tn->level0[chunk & YAFFS_TNODES_LEVEL0_MASK] << in->myDev->chunkGroupBits;\r
-    \r
-\r
-                               yaffs_ReadChunkTagsFromNAND(in->myDev,theChunk,tags,&chunkDeleted);\r
-                               if(yaffs_TagsMatch(tags,in->objectId,chunk,chunkDeleted))\r
-                               {\r
-                                       // found it;\r
-                               \r
-                               }\r
-                               else\r
-                               {\r
-                                       //T(("File problem file [%d,%d] NAND %d  tags[%d,%d]\n",\r
-                                       //              objId,chunk,theChunk,tags->chunkId,tags->objectId);\r
-                                                       \r
-                                       failed = 1;\r
-                                                               \r
-                               }\r
-    \r
-               }\r
-               else\r
-               {\r
-                       //T(("No level 0 found for %d\n", chunk));\r
-               }\r
-       }\r
-       \r
-       return failed ? YAFFS_FAIL : YAFFS_OK;\r
-}\r
-\r
-#endif\r
-\r
-static int yaffs_PutChunkIntoFile(yaffs_Object *in,int chunkInInode, int chunkInNAND, int inScan)\r
-{\r
-       yaffs_Tnode *tn;\r
-       yaffs_Device *dev = in->myDev;\r
-       int existingChunk;\r
-       yaffs_Tags existingTags;\r
-       yaffs_Tags newTags;\r
-       unsigned existingSerial, newSerial;\r
-       \r
-       int newChunkDeleted;\r
-       \r
-       \r
-       tn = yaffs_AddOrFindLevel0Tnode(dev,&in->variant.fileVariant, chunkInInode);\r
-       if(!tn)\r
-       {\r
-               return YAFFS_FAIL;\r
-       }\r
-\r
-       existingChunk = tn->level0[chunkInInode & YAFFS_TNODES_LEVEL0_MASK];            \r
-       \r
-       if(inScan)\r
-       {\r
-               // If we're scanning then we need to test for duplicates\r
-               // NB This does not need to be efficient since it should only ever \r
-               // happen when the power fails during a write, then only one\r
-               // chunk should ever be affected.\r
-       \r
-               \r
-               if(existingChunk != 0)\r
-               {\r
-                       // NB Right now existing chunk will not be real chunkId if the device >= 32MB\r
-                       //    thus we have to do a FindChunkInFile to get the real chunk id.\r
-                       //\r
-                       // We have a duplicate now we need to decide which one to use\r
-                       // To do this we get both sets of tags and compare serial numbers.\r
-                       yaffs_ReadChunkTagsFromNAND(dev,chunkInNAND, &newTags,&newChunkDeleted);\r
-                       \r
-                       \r
-                       // Do a proper find\r
-                       existingChunk = yaffs_FindChunkInFile(in,chunkInInode, &existingTags);\r
-\r
-                       if(existingChunk <=0)\r
-                       {\r
-                               //Hoosterman - how did this happen?\r
-                               \r
-                               T(YAFFS_TRACE_ERROR, (TSTR("yaffs tradgedy: existing chunk < 0 in scan" TENDSTR)));\r
-\r
-                       }\r
-\r
-                       \r
-                       // NB The deleted flags should be false, otherwise the chunks will \r
-                       // not be loaded during a scan\r
-                       \r
-                       newSerial = newTags.serialNumber;\r
-                       existingSerial = existingTags.serialNumber;\r
-                       \r
-                       if( existingChunk <= 0 ||\r
-                           ((existingSerial+1) & 3) == newSerial)\r
-                       {\r
-                               // Use new\r
-                               // Delete the old one and drop through to update the tnode\r
-                               yaffs_DeleteChunk(dev,existingChunk);\r
-                       }\r
-                       else\r
-                       {\r
-                               // Use existing.\r
-                               // Delete the new one and return early so that the tnode isn't changed\r
-                               yaffs_DeleteChunk(dev,chunkInNAND);\r
-                               return YAFFS_OK;\r
-                       }\r
-               }\r
-\r
-       }\r
-               \r
-       if(existingChunk == 0)\r
-       {\r
-               in->nDataChunks++;\r
-       }\r
-       \r
-       tn->level0[chunkInInode & YAFFS_TNODES_LEVEL0_MASK] = (chunkInNAND >> dev->chunkGroupBits);\r
-       \r
-       return YAFFS_OK;\r
-}\r
-\r
-\r
-\r
-int yaffs_ReadChunkDataFromObject(yaffs_Object *in,int chunkInInode, __u8 *buffer)\r
-{\r
-    int chunkInNAND = yaffs_FindChunkInFile(in,chunkInInode,NULL);\r
-    \r
-    if(chunkInNAND >= 0)\r
-    {\r
-               return yaffs_ReadChunkFromNAND(in->myDev,chunkInNAND,buffer,NULL,1);\r
-       }\r
-       else\r
-       {\r
-               return 0;\r
-       }\r
-\r
-}\r
-\r
-\r
-static void yaffs_DeleteChunk(yaffs_Device *dev,int chunkId)\r
-{\r
-       int block;\r
-       int page;\r
-       yaffs_Spare spare;\r
-       yaffs_BlockInfo *bi;\r
-       \r
-       if(chunkId <= 0) return;        \r
-               \r
-       block = chunkId / YAFFS_CHUNKS_PER_BLOCK;\r
-       page = chunkId % YAFFS_CHUNKS_PER_BLOCK;\r
-       yaffs_SpareInitialise(&spare);\r
-       \r
-       spare.pageStatus = 0; // To mark it as deleted.\r
-\r
-       \r
-       yaffs_WriteChunkToNAND(dev,chunkId,NULL,&spare);\r
-       yaffs_HandleUpdateChunk(dev,chunkId,&spare);\r
-       bi = yaffs_GetBlockInfo(dev,block);\r
-                       \r
-       \r
-       // Pull out of the management area.\r
-       // If the whole block became dirty, this will kick off an erasure.\r
-       if(     bi->blockState == YAFFS_BLOCK_STATE_ALLOCATING ||\r
-           bi->blockState == YAFFS_BLOCK_STATE_FULL)\r
-       {\r
-               dev->nFreeChunks++;\r
-\r
-               bi->pageBits &= ~(1 << page);\r
-               bi->pagesInUse--;\r
-               \r
-               if(bi->pagesInUse == 0 &&\r
-              bi->blockState == YAFFS_BLOCK_STATE_FULL)\r
-           {\r
-               yaffs_BlockBecameDirty(dev,block);\r
-           }\r
-\r
-       }\r
-       else\r
-       {\r
-               // T(("Bad news deleting chunk %d\n",chunkId));\r
-       }\r
-       \r
-}\r
-\r
-\r
-\r
-\r
-int yaffs_WriteChunkDataToObject(yaffs_Object *in,int chunkInInode, const __u8 *buffer,int nBytes,int useReserve)\r
-{\r
-       // Find old chunk Need to do this to get serial number\r
-       // Write new one and patch into tree.\r
-       // Invalidate old tags.\r
-\r
-    int prevChunkId;\r
-    yaffs_Tags prevTags;\r
-    \r
-    int newChunkId;\r
-    yaffs_Tags newTags;\r
-\r
-    yaffs_Device *dev = in->myDev;    \r
-\r
-       yaffs_CheckGarbageCollection(dev);\r
-\r
-       // Get the previous chunk at this location in the file if it exists\r
-    prevChunkId  = yaffs_FindChunkInFile(in,chunkInInode,&prevTags);\r
-    \r
-    // Set up new tags\r
-       newTags.chunkId = chunkInInode;\r
-       newTags.objectId = in->objectId;\r
-       newTags.serialNumber = (prevChunkId >= 0) ? prevTags.serialNumber + 1 : 1;\r
-       newTags.byteCount = nBytes;\r
-       newTags.unusedStuff = 0xFFFFFFFF;\r
-               \r
-       yaffs_CalcTagsECC(&newTags);\r
-\r
-       newChunkId = yaffs_WriteNewChunkWithTagsToNAND(dev,buffer,&newTags,useReserve);\r
-       if(newChunkId >= 0)\r
-       {\r
-               yaffs_PutChunkIntoFile(in,chunkInInode,newChunkId,0);\r
-               \r
-               \r
-               if(prevChunkId >= 0)\r
-               {\r
-                       yaffs_DeleteChunk(dev,prevChunkId);\r
-       \r
-               }\r
-               \r
-               yaffs_CheckFileSanity(in);\r
-       }\r
-       return newChunkId;\r
-\r
-\r
-\r
-\r
-\r
-}\r
-\r
-\r
-// UpdateObjectHeader updates the header on NAND for an object.\r
-// If name is not NULL, then that new name is used.\r
-//\r
-int yaffs_UpdateObjectHeader(yaffs_Object *in,const char *name, int force)\r
-{\r
-\r
-       yaffs_Device *dev = in->myDev;\r
-       \r
-    int prevChunkId;\r
-    \r
-    int newChunkId;\r
-    yaffs_Tags newTags;\r
-    __u8 bufferNew[YAFFS_BYTES_PER_CHUNK];\r
-    __u8 bufferOld[YAFFS_BYTES_PER_CHUNK];\r
-    \r
-    yaffs_ObjectHeader *oh = (yaffs_ObjectHeader *)bufferNew;\r
-    yaffs_ObjectHeader *ohOld = (yaffs_ObjectHeader *)bufferOld;\r
-\r
-    \r
-    if(!in->fake || force)\r
-    {\r
-  \r
-               yaffs_CheckGarbageCollection(dev);              \r
-    \r
-               memset(bufferNew,0xFF,YAFFS_BYTES_PER_CHUNK);\r
-    \r
-               prevChunkId = in->chunkId;\r
-    \r
-               if(prevChunkId >= 0)\r
-               {\r
-                       yaffs_ReadChunkFromNAND(dev,prevChunkId,bufferOld,NULL,1);      \r
-               }\r
-\r
-               // Header data\r
-               oh->type = in->variantType;\r
-               \r
-               oh->st_mode = in->st_mode;\r
-\r
-#ifdef CONFIG_YAFFS_WINCE\r
-               oh->win_atime[0] = in->win_atime[0];\r
-               oh->win_ctime[0] = in->win_ctime[0];\r
-               oh->win_mtime[0] = in->win_mtime[0];\r
-               oh->win_atime[1] = in->win_atime[1];\r
-               oh->win_ctime[1] = in->win_ctime[1];\r
-               oh->win_mtime[1] = in->win_mtime[1];\r
-#else\r
-               oh->st_uid = in->st_uid;\r
-               oh->st_gid = in->st_gid;\r
-               oh->st_atime = in->st_atime;\r
-               oh->st_mtime = in->st_mtime;\r
-               oh->st_ctime = in->st_ctime;\r
-               oh->st_rdev = in->st_rdev;\r
-#endif \r
-               if(in->parent)\r
-               {\r
-                       oh->parentObjectId = in->parent->objectId;\r
-               }\r
-               else\r
-               {\r
-                       oh->parentObjectId = 0;\r
-               }\r
-               \r
-               //oh->sum = in->sum;\r
-               if(name && *name)\r
-               {\r
-                       memset(oh->name,0,YAFFS_MAX_NAME_LENGTH + 1);\r
-                       strncpy(oh->name,name,YAFFS_MAX_NAME_LENGTH);\r
-               }\r
-               else if(prevChunkId)\r
-               {       \r
-                       memcpy(oh->name, ohOld->name,YAFFS_MAX_NAME_LENGTH + 1);\r
-               }\r
-               else\r
-               {\r
-                       memset(oh->name,0,YAFFS_MAX_NAME_LENGTH + 1);   \r
-               }\r
-       \r
-               switch(in->variantType)\r
-               {\r
-                       case YAFFS_OBJECT_TYPE_UNKNOWN:         \r
-                               // Should not happen\r
-                               break;\r
-                       case YAFFS_OBJECT_TYPE_FILE:\r
-                               oh->fileSize = in->variant.fileVariant.fileSize;\r
-                               break;\r
-                       case YAFFS_OBJECT_TYPE_HARDLINK:\r
-                               oh->equivalentObjectId = in->variant.hardLinkVariant.equivalentObjectId;\r
-                               break;\r
-                       case YAFFS_OBJECT_TYPE_SPECIAL: \r
-                               // Do nothing\r
-                               break;\r
-                       case YAFFS_OBJECT_TYPE_DIRECTORY:       \r
-                               // Do nothing\r
-                               break;\r
-                       case YAFFS_OBJECT_TYPE_SYMLINK:\r
-                               strncpy(oh->alias,in->variant.symLinkVariant.alias,YAFFS_MAX_ALIAS_LENGTH);\r
-                               oh->alias[YAFFS_MAX_ALIAS_LENGTH] = 0;\r
-                               break;\r
-               }\r
-\r
-               // Tags\r
-               in->serial++;\r
-               newTags.chunkId = 0;\r
-               newTags.objectId = in->objectId;\r
-               newTags.serialNumber = in->serial;\r
-               newTags.byteCount =   0xFFFFFFFF;\r
-               newTags.unusedStuff = 0xFFFFFFFF;\r
-       \r
-               yaffs_CalcTagsECC(&newTags);\r
-       \r
-\r
-               // Create new chunk in NAND\r
-               newChunkId = yaffs_WriteNewChunkWithTagsToNAND(dev,bufferNew,&newTags,1);\r
-    \r
-               if(newChunkId >= 0)\r
-               {\r
-               \r
-                       in->chunkId = newChunkId;               \r
-               \r
-                       if(prevChunkId >= 0)\r
-                       {\r
-                               yaffs_DeleteChunk(dev,prevChunkId);\r
-                       }\r
-               \r
-                       in->dirty = 0;\r
-               }\r
-               \r
-               return newChunkId;\r
-\r
-    }\r
-    return 0;\r
-}\r
-\r
-\r
-/////////////////////// Short Operations Cache ////////////////////////////////\r
-//     In many siturations where there is no high level buffering (eg WinCE) a lot of\r
-//     reads might be short sequential reads, and a lot of writes may be short \r
-//  sequential writes. eg. scanning/writing a jpeg file.\r
-//     In these cases, a short read/write cache can provide a huge perfomance benefit \r
-//  with dumb-as-a-rock code.\r
-//  There are a limited number (~10) of cache chunks per device so that we don't\r
-//  need a very intelligent search.\r
-\r
-\r
-#ifdef CONFIG_YAFFS_SHORT_OP_CACHE\r
-\r
-\r
-static void yaffs_FlushFilesChunkCache(yaffs_Object *obj)\r
-{\r
-       yaffs_Device *dev = obj->myDev;\r
-       int lowest;\r
-       int i;\r
-       yaffs_ChunkCache *cache;\r
-       int chunkWritten;\r
-       int nBytes;\r
-       \r
-       do{\r
-               cache = NULL;\r
-               \r
-               // Find the dirty cache for this object with the lowest chunk id.\r
-               for(i = 0; i < YAFFS_N_CACHE_CHUNKS; i++)\r
-               {\r
-                       if(dev->srCache[i].object == obj &&\r
-                          dev->srCache[i].dirty)\r
-                       {\r
-                               if(!cache ||  dev->srCache[i].chunkId < lowest)\r
-                               {\r
-                                       cache = &dev->srCache[i];\r
-                                       lowest = cache->chunkId;\r
-                               }\r
-                       }\r
-               }\r
-               \r
-               if(cache)\r
-               {\r
-                       //Write it out\r
-\r
-                       nBytes = cache->object->variant.fileVariant.fileSize - ((cache->chunkId -1) * YAFFS_BYTES_PER_CHUNK);\r
-                       \r
-                       if(nBytes > YAFFS_BYTES_PER_CHUNK)\r
-                       {\r
-                               nBytes= YAFFS_BYTES_PER_CHUNK;\r
-                       }\r
-                       \r
-                       chunkWritten = yaffs_WriteChunkDataToObject(cache->object,\r
-                                                                                                               cache->chunkId,\r
-                                                                                                               cache->data,\r
-                                                                                                               nBytes,1);\r
-\r
-                       cache->dirty = 0;\r
-               }\r
-               \r
-       } while(cache && chunkWritten > 0);\r
-       \r
-       if(cache)\r
-       {\r
-               //Hoosterman, disk full while writing cache out.\r
-               T(YAFFS_TRACE_ERROR, (TSTR("yaffs tradgedy: no space during caceh write" TENDSTR)));\r
-\r
-       }       \r
-               \r
-}\r
-\r
-\r
-// Grab us a chunk for use.\r
-// First look for an empty one. \r
-// Then look for the least recently used non-dirty one.\r
-// Then look for the least recently used dirty one...., flush and look again.\r
-static yaffs_ChunkCache *yaffs_GrabChunkCacheWorker(yaffs_Device *dev)\r
-{\r
-       int i;\r
-       int usage;\r
-       int theOne;\r
-       \r
-       for(i = 0; i < YAFFS_N_CACHE_CHUNKS; i++)\r
-       {\r
-               if(!dev->srCache[i].object)\r
-               {\r
-                       //T(("Grabbing empty %d\n",i));\r
-                       \r
-                       return &dev->srCache[i];\r
-               }\r
-       }\r
-       \r
-       theOne = -1; \r
-       usage = 0; // just to stop the compiler grizzling\r
-       \r
-       for(i = 0; i < YAFFS_N_CACHE_CHUNKS; i++)\r
-       {\r
-               if(!dev->srCache[i].dirty &&\r
-                  ((dev->srCache[i].lastUse < usage  && theOne >= 0)|| \r
-                    theOne < 0))\r
-               {\r
-                       usage = dev->srCache[i].lastUse;\r
-                       theOne = i;\r
-               }\r
-       }\r
-       \r
-       //T(("Grabbing non-empty %d\n",theOne));\r
-       return  theOne >= 0 ?  &dev->srCache[theOne] : NULL;\r
-       \r
-}\r
-\r
-\r
-static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device *dev)\r
-{\r
-       yaffs_ChunkCache *cache;\r
-       yaffs_Object *theObj;\r
-       int usage;\r
-       int i;\r
-       \r
-       // Try find a non-dirty one...\r
-       \r
-       cache = yaffs_GrabChunkCacheWorker(dev);\r
-       \r
-       if(!cache)\r
-       {\r
-               // They were all dirty, find the last recently used object and flush\r
-               // its cache, then  find again.\r
-               // NB what's here is not very accurate, we actually flush the object\r
-               // the last recently used page.\r
-               \r
-               theObj = dev->srCache[0].object;\r
-               usage = dev->srCache[0].lastUse;\r
-       \r
-               for(i = 1; i < YAFFS_N_CACHE_CHUNKS; i++)\r
-               {\r
-                       if( dev->srCache[i].object && \r
-                           dev->srCache[i].lastUse < usage)\r
-                       {\r
-                               usage  = dev->srCache[i].lastUse;\r
-                               theObj = dev->srCache[i].object;\r
-                       }\r
-               }\r
-               \r
-               yaffs_FlushFilesChunkCache(theObj);\r
-               \r
-               // Try again\r
-               cache = yaffs_GrabChunkCacheWorker(dev);\r
-       }\r
-       \r
-       return cache;\r
-\r
-}\r
-\r
-\r
-// Find a cached chunk\r
-static yaffs_ChunkCache *yaffs_FindChunkCache(const yaffs_Object *obj, int chunkId)\r
-{\r
-       yaffs_Device *dev = obj->myDev;\r
-       int i;\r
-       \r
-       for(i = 0; i < YAFFS_N_CACHE_CHUNKS; i++)\r
-       {\r
-               if(dev->srCache[i].object == obj && \r
-                  dev->srCache[i].chunkId == chunkId)\r
-               {\r
-                       dev->cacheHits++;\r
-                       \r
-                       return &dev->srCache[i];\r
-               }\r
-       }\r
-       \r
-       return NULL;\r
-}\r
-\r
-// Mark the chunk for the least recently used algorithym\r
-static void yaffs_UseChunkCache(yaffs_Device *dev, yaffs_ChunkCache *cache, int isAWrite)\r
-{\r
-       if( dev->srLastUse < 0 || \r
-               dev->srLastUse > 100000000)\r
-       {\r
-               // Reset the cache usages\r
-               int i;\r
-               for(i = 1; i < YAFFS_N_CACHE_CHUNKS; i++)\r
-               {\r
-                       dev->srCache[i].lastUse = 0;\r
-               }\r
-               dev->srLastUse = 0;\r
-       }\r
-\r
-       dev->srLastUse++;\r
-       \r
-       cache->lastUse = dev->srLastUse;\r
-\r
-       if(isAWrite)\r
-       {\r
-               cache->dirty = 1;\r
-       }\r
-}\r
-\r
-// Invalidate a single cache page.\r
-// Do this when a whole page gets written,\r
-// ie the short cache for this page is no longer valid.\r
-static void yaffs_InvalidateChunkCache(yaffs_Object *object, int chunkId)\r
-{\r
-       yaffs_ChunkCache *cache = yaffs_FindChunkCache(object,chunkId);\r
-\r
-       if(cache)\r
-       {\r
-               cache->object = NULL;\r
-       }\r
-}\r
-\r
-\r
-// Invalidate all the cache pages associated with this object\r
-// Do this whenever ther file is deleted or resized.\r
-static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in)\r
-{\r
-       int i;\r
-       yaffs_Device *dev = in->myDev;\r
-       \r
-       // Now invalidate it.\r
-       for(i = 0; i < YAFFS_N_CACHE_CHUNKS; i++)\r
-       {\r
-               if(dev->srCache[i].object == in)\r
-               {\r
-                       dev->srCache[i].object = NULL;\r
-               }\r
-       }\r
-}\r
-\r
-\r
-#else\r
-\r
-static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device *dev)\r
-{\r
-       return NULL;    \r
-}\r
-\r
-\r
-static yaffs_ChunkCache *yaffs_FindChunkCache(yaffs_Device *dev, int objectId, int chunkId)\r
-{\r
-       return NULL;\r
-}\r
-\r
-static void yaffs_UseChunkCache(yaffs_Device *dev, yaffs_ChunkCache *cache)\r
-{\r
-}\r
-\r
-static void yaffs_InvalidateChunkCache(yaffs_Object *obj, int chunkId)\r
-{\r
-}\r
-\r
-static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in)\r
-{\r
-}\r
-\r
-\r
-\r
-#endif\r
-\r
-\r
-\r
-///////////////////////// File read/write ///////////////////////////////\r
-// Read and write have very similar structures.\r
-// In general the read/write has three parts to it\r
-// * An incomplete chunk to start with (if the read/write is not chunk-aligned)\r
-// * Some complete chunks\r
-// * An incomplete chunk to end off with\r
-//\r
-// Curve-balls: the first chunk might also be the last chunk.\r
-\r
-int yaffs_ReadDataFromFile(yaffs_Object *in, __u8 * buffer, __u32 offset, int nBytes)\r
-{\r
-       \r
-       \r
-       int chunk;\r
-       int start;\r
-       int nToCopy;\r
-       int n = nBytes;\r
-       int nDone = 0;\r
-       \r
-       while(n > 0)\r
-       {\r
-               chunk = offset / YAFFS_BYTES_PER_CHUNK + 1; // The first chunk is 1\r
-               start = offset % YAFFS_BYTES_PER_CHUNK;\r
-\r
-               // OK now check for the curveball where the start and end are in\r
-               // the same chunk.      \r
-               if(     (start + n) < YAFFS_BYTES_PER_CHUNK)\r
-               {\r
-                       nToCopy = n;\r
-               }\r
-               else\r
-               {\r
-                       nToCopy = YAFFS_BYTES_PER_CHUNK - start;\r
-               }\r
-       \r
-               if(nToCopy != YAFFS_BYTES_PER_CHUNK)\r
-               {\r
-                       // An incomplete start or end chunk (or maybe both start and end chunk)\r
-#ifdef CONFIG_YAFFS_SHORT_OP_CACHE\r
-                       yaffs_ChunkCache *cache;\r
-                       // If we can't find the data in the cache, then load it up.\r
-                       cache = yaffs_FindChunkCache(in,chunk);\r
-                       if(!cache)\r
-                       {\r
-                               cache = yaffs_GrabChunkCache(in->myDev);\r
-                               cache->object = in;\r
-                               cache->chunkId = chunk;\r
-                               cache->dirty = 0;\r
-                               yaffs_ReadChunkDataFromObject(in,chunk,cache->data);            \r
-                       }\r
-                       \r
-                       yaffs_UseChunkCache(in->myDev,cache,0);\r
-\r
-                       memcpy(buffer,&cache->data[start],nToCopy);\r
-#else\r
-                       __u8 localBuffer[YAFFS_BYTES_PER_CHUNK];\r
-                       // Read into the local buffer then copy...\r
-                       yaffs_ReadChunkDataFromObject(in,chunk,localBuffer);            \r
-                       memcpy(buffer,&localBuffer[start],nToCopy);\r
-#endif\r
-               }\r
-               else\r
-               {\r
-#ifdef CONFIG_YAFFS_WINCE\r
-                       __u8 localBuffer[YAFFS_BYTES_PER_CHUNK];\r
-                       \r
-                       // Under WinCE can't do direct transfer. Need to use a local buffer.\r
-                       // This is because we otherwise screw up WinCE's memory mapper\r
-                       yaffs_ReadChunkDataFromObject(in,chunk,localBuffer);\r
-                       memcpy(buffer,localBuffer,YAFFS_BYTES_PER_CHUNK);\r
-#else\r
-                       // A full chunk. Read directly into the supplied buffer.\r
-                       yaffs_ReadChunkDataFromObject(in,chunk,buffer);\r
-#endif\r
-               }\r
-               \r
-               n -= nToCopy;\r
-               offset += nToCopy;\r
-               buffer += nToCopy;\r
-               nDone += nToCopy;\r
-               \r
-       }\r
-       \r
-       return nDone;\r
-}\r
-\r
-\r
-\r
-int yaffs_WriteDataToFile(yaffs_Object *in,const __u8 * buffer, __u32 offset, int nBytes)\r
-{      \r
-       \r
-       int chunk;\r
-       int start;\r
-       int nToCopy;\r
-       int n = nBytes;\r
-       int nDone = 0;\r
-       int nToWriteBack;\r
-       int startOfWrite = offset;\r
-       int chunkWritten = 0;\r
-       int nBytesRead;\r
-       \r
-       \r
-       \r
-       while(n > 0 && chunkWritten >= 0)\r
-       {\r
-               chunk = offset / YAFFS_BYTES_PER_CHUNK + 1;\r
-               start = offset % YAFFS_BYTES_PER_CHUNK;\r
-               \r
-\r
-               // OK now check for the curveball where the start and end are in\r
-               // the same chunk.\r
-               \r
-               if(     (start + n) < YAFFS_BYTES_PER_CHUNK)\r
-               {\r
-                       nToCopy = n;\r
-                       \r
-                       // Now folks, to calculate how many bytes to write back....\r
-                       // If we're overwriting and not writing to then end of file then\r
-                       // we need to write back as much as was there before.\r
-                       \r
-                       nBytesRead = in->variant.fileVariant.fileSize - ((chunk -1) * YAFFS_BYTES_PER_CHUNK);\r
-                       \r
-                       if(nBytesRead > YAFFS_BYTES_PER_CHUNK)\r
-                       {\r
-                               nBytesRead = YAFFS_BYTES_PER_CHUNK;\r
-                       }\r
-                       \r
-                       nToWriteBack = (nBytesRead > (start + n)) ? nBytesRead : (start +n);\r
-                       \r
-               }\r
-               else\r
-               {\r
-                       nToCopy = YAFFS_BYTES_PER_CHUNK - start;\r
-                       nToWriteBack = YAFFS_BYTES_PER_CHUNK;\r
-               }\r
-       \r
-               if(nToCopy != YAFFS_BYTES_PER_CHUNK)\r
-               {\r
-                       // An incomplete start or end chunk (or maybe both start and end chunk)\r
-#ifdef CONFIG_YAFFS_SHORT_OP_CACHE\r
-                       yaffs_ChunkCache *cache;\r
-                       // If we can't find the data in the cache, then load it up.\r
-                       cache = yaffs_FindChunkCache(in,chunk);\r
-                       if(!cache && yaffs_CheckSpaceForChunkCache(in->myDev))\r
-                       {\r
-                               cache = yaffs_GrabChunkCache(in->myDev);\r
-                               cache->object = in;\r
-                               cache->chunkId = chunk;\r
-                               cache->dirty = 0;\r
-                               yaffs_ReadChunkDataFromObject(in,chunk,cache->data);            \r
-                       }\r
-                       \r
-                       if(cache)\r
-                       {       \r
-                               yaffs_UseChunkCache(in->myDev,cache,1);\r
-                               memcpy(&cache->data[start],buffer,nToCopy);\r
-                       }\r
-                       else\r
-                       {\r
-                               chunkWritten = -1; // fail the write\r
-                       }\r
-#else\r
-                       __u8 localBuffer[YAFFS_BYTES_PER_CHUNK];\r
-\r
-                       // An incomplete start or end chunk (or maybe both start and end chunk)\r
-                       // Read into the local buffer then copy, then copy over and write back.\r
-               \r
-                       yaffs_ReadChunkDataFromObject(in,chunk,localBuffer);\r
-                               \r
-                       memcpy(&localBuffer[start],buffer,nToCopy);\r
-                       \r
-                       chunkWritten = yaffs_WriteChunkDataToObject(in,chunk,localBuffer,nToWriteBack,0);\r
-                       \r
-                       //T(("Write with readback to chunk %d %d  start %d  copied %d wrote back %d\n",chunk,chunkWritten,start, nToCopy, nToWriteBack));\r
-#endif\r
-                       \r
-               }\r
-               else\r
-               {\r
-                       \r
-#ifdef CONFIG_YAFFS_WINCE\r
-                       __u8 localBuffer[YAFFS_BYTES_PER_CHUNK];\r
-                       // Under WinCE can't do direct transfer. Need to use a local buffer.\r
-                       // This is because we otherwise screw up WinCE's memory mapper\r
-                       memcpy(localBuffer,buffer,YAFFS_BYTES_PER_CHUNK);\r
-                       chunkWritten = yaffs_WriteChunkDataToObject(in,chunk,localBuffer,YAFFS_BYTES_PER_CHUNK,0);\r
-#else\r
-                       // A full chunk. Write directly from the supplied buffer.\r
-                       chunkWritten = yaffs_WriteChunkDataToObject(in,chunk,buffer,YAFFS_BYTES_PER_CHUNK,0);\r
-#endif\r
-                       // Since we've overwritten the cached data, we better invalidate it.\r
-                       yaffs_InvalidateChunkCache(in,chunk);\r
-                       //T(("Write to chunk %d %d\n",chunk,chunkWritten));\r
-               }\r
-               \r
-               if(chunkWritten >= 0)\r
-               {\r
-                       n -= nToCopy;\r
-                       offset += nToCopy;\r
-                       buffer += nToCopy;\r
-                       nDone += nToCopy;\r
-               }\r
-               \r
-       }\r
-       \r
-       // Update file object\r
-       \r
-       if((startOfWrite + nDone) > in->variant.fileVariant.fileSize)\r
-       {\r
-               in->variant.fileVariant.fileSize = (startOfWrite + nDone);\r
-       }\r
-       \r
-       in->dirty = 1;\r
-       \r
-       return nDone;\r
-}\r
-\r
-\r
-int yaffs_ResizeFile(yaffs_Object *in, int newSize)\r
-{\r
-       int i;\r
-       int chunkId;\r
-       int oldFileSize = in->variant.fileVariant.fileSize;\r
-       int sizeOfPartialChunk = newSize % YAFFS_BYTES_PER_CHUNK;\r
-       \r
-       yaffs_Device *dev = in->myDev;\r
-       \r
-       __u8 localBuffer[YAFFS_BYTES_PER_CHUNK];\r
-\r
-       yaffs_FlushFilesChunkCache(in); \r
-       yaffs_InvalidateWholeChunkCache(in);\r
-       \r
-       if(in->variantType != YAFFS_OBJECT_TYPE_FILE)\r
-       {\r
-               return yaffs_GetFileSize(in);\r
-       }\r
-       \r
-       if(newSize < oldFileSize)\r
-       {\r
-               \r
-               int lastDel = 1 + (oldFileSize-1)/YAFFS_BYTES_PER_CHUNK;\r
-               \r
-               int startDel = 1 + (newSize + YAFFS_BYTES_PER_CHUNK - 1)/\r
-                                                       YAFFS_BYTES_PER_CHUNK;\r
-\r
-               // Delete backwards so that we don't end up with holes if\r
-               // power is lost part-way through the operation.\r
-               for(i = lastDel; i >= startDel; i--)\r
-               {\r
-                       // NB this could be optimised somewhat,\r
-                       // eg. could retrieve the tags and write them without\r
-                       // using yaffs_DeleteChunk\r
-\r
-                       chunkId = yaffs_FindAndDeleteChunkInFile(in,i,NULL);\r
-                       if(chunkId <= 0 || chunkId >= (dev->endBlock * 32))\r
-                       {\r
-                               //T(("Found daft chunkId %d for %d\n",chunkId,i));\r
-                       }\r
-                       else\r
-                       {\r
-                               in->nDataChunks--;\r
-                               yaffs_DeleteChunk(dev,chunkId);\r
-                       }\r
-               }\r
-               \r
-               \r
-               if(sizeOfPartialChunk != 0)\r
-               {\r
-                       int lastChunk = 1+ newSize/YAFFS_BYTES_PER_CHUNK;\r
-                       \r
-                       // Got to read and rewrite the last chunk with its new size.\r
-                       yaffs_ReadChunkDataFromObject(in,lastChunk,localBuffer);\r
-                       \r
-                       yaffs_WriteChunkDataToObject(in,lastChunk,localBuffer,sizeOfPartialChunk,1);\r
-                               \r
-               }\r
-               \r
-               in->variant.fileVariant.fileSize = newSize;\r
-               \r
-               yaffs_PruneFileStructure(dev,&in->variant.fileVariant);\r
-               \r
-               return newSize;\r
-               \r
-       }\r
-       else\r
-       {\r
-               return oldFileSize;\r
-       }\r
-}\r
-\r
-\r
-loff_t yaffs_GetFileSize(yaffs_Object *obj)\r
-{\r
-       obj = yaffs_GetEquivalentObject(obj);\r
-       \r
-       switch(obj->variantType)\r
-       {\r
-               case YAFFS_OBJECT_TYPE_FILE: \r
-                       return obj->variant.fileVariant.fileSize;\r
-               case YAFFS_OBJECT_TYPE_SYMLINK:\r
-                       return strlen(obj->variant.symLinkVariant.alias);\r
-               default:\r
-                       return 0;\r
-       }\r
-}\r
-\r
-\r
-\r
-// yaffs_FlushFile() updates the file's\r
-// objectId in NAND\r
-\r
-int yaffs_FlushFile(yaffs_Object *in)\r
-{\r
-       int retVal;\r
-       if(in->dirty)\r
-       {\r
-               //T(("flushing object header\n"));\r
-               \r
-               yaffs_FlushFilesChunkCache(in);\r
-       \r
-#ifdef CONFIG_YAFFS_WINCE\r
-               yfsd_WinFileTimeNow(in->win_mtime);\r
-#else\r
-               in->st_mtime = CURRENT_TIME;\r
-#endif\r
-\r
-               retVal = yaffs_UpdateObjectHeader(in,NULL,0);\r
-       }\r
-       else\r
-       {\r
-               retVal = YAFFS_OK;\r
-       }\r
-       \r
-       return retVal;\r
-       \r
-}\r
-\r
-\r
-static int yaffs_DoGenericObjectDeletion(yaffs_Object *in)\r
-{\r
-\r
-       // First off, invalidate the file's data in the cache, without flushing.\r
-       yaffs_InvalidateWholeChunkCache(in);\r
-       \r
-       yaffs_RemoveObjectFromDirectory(in);\r
-       yaffs_DeleteChunk(in->myDev,in->chunkId);\r
-#ifdef __KERNEL__\r
-       if(in->myInode)\r
-       {\r
-               in->myInode->u.generic_ip = NULL;\r
-               in->myInode = 0;\r
-       }\r
-#endif\r
-       yaffs_FreeObject(in);\r
-       return YAFFS_OK;\r
-\r
-}\r
-\r
-// yaffs_DeleteFile deletes the whole file data\r
-// and the inode associated with the file.\r
-// It does not delete the links associated with the file.\r
-static int yaffs_UnlinkFile(yaffs_Object *in)\r
-{\r
-\r
-#ifdef CONFIG_YAFFS_DISABLE_BACKGROUND_DELETION\r
-       // Delete the file data & tnodes\r
-\r
-        yaffs_DeleteWorker(in, in->variant.fileVariant.top, in->variant.fileVariant.topLevel, 0,NULL);\r
-        \r
-\r
-       yaffs_FreeTnode(in->myDev,in->variant.fileVariant.top);\r
-       \r
-       return  yaffs_DoGenericObjectDeletion(in);\r
-#else\r
-       int retVal;\r
-       int immediateDeletion=0;\r
-       retVal = yaffs_ChangeObjectName(in, in->myDev->unlinkedDir,NULL,0);\r
-       if(retVal == YAFFS_OK)\r
-       {\r
-               //in->unlinked = 1;\r
-               //in->myDev->nUnlinkedFiles++;\r
-               //in->renameAllowed = 0;\r
-#ifdef __KERNEL__\r
-               if(in->myInode)\r
-               {\r
-                       immediateDeletion = 1;\r
-\r
-               }\r
-#endif\r
-#ifdef CONFIG_YAFFS_WINCE\r
-               if(in->inUse <= 0)\r
-               {\r
-                       immediateDeletion = 1;\r
-\r
-               }\r
-#endif\r
-               \r
-               if(immediateDeletion)\r
-               {\r
-                       T(YAFFS_TRACE_TRACING,(TSTR("yaffs: immediate deletion of file %d" TENDSTR),in->objectId));\r
-                       in->deleted=1;\r
-                       in->myDev->nDeletedFiles++;\r
-               }\r
-       \r
-       }\r
-       return retVal;\r
-\r
-       \r
-#endif\r
-}\r
-\r
-int yaffs_DeleteFile(yaffs_Object *in)\r
-{\r
-       int retVal = YAFFS_OK;\r
-       if(!in->unlinked)\r
-       {\r
-               retVal = yaffs_UnlinkFile(in);\r
-       }\r
-       if(retVal == YAFFS_OK && \r
-          in->unlinked &&\r
-          !in->deleted)\r
-       {\r
-               in->deleted = 1;\r
-               in->myDev->nDeletedFiles++;\r
-       }\r
-       return in->deleted ? YAFFS_OK : YAFFS_FAIL;     \r
-}\r
-\r
-static int yaffs_DeleteDirectory(yaffs_Object *in)\r
-{\r
-       //First check that the directory is empty.\r
-       if(list_empty(&in->variant.directoryVariant.children))\r
-       {\r
-               return  yaffs_DoGenericObjectDeletion(in);\r
-       }\r
-       \r
-       return YAFFS_FAIL;\r
-       \r
-}\r
-\r
-static int yaffs_DeleteSymLink(yaffs_Object *in)\r
-{\r
-       YFREE(in->variant.symLinkVariant.alias);\r
-\r
-       return  yaffs_DoGenericObjectDeletion(in);\r
-}\r
-\r
-static int yaffs_DeleteHardLink(yaffs_Object *in)\r
-{\r
-       // remove this hardlink from the list assocaited with the equivalent\r
-       // object\r
-       list_del(&in->hardLinks);\r
-       return  yaffs_DoGenericObjectDeletion(in);      \r
-}\r
-\r
-\r
-static int yaffs_UnlinkWorker(yaffs_Object *obj)\r
-{\r
-\r
-       \r
-       if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)\r
-       {\r
-               return  yaffs_DeleteHardLink(obj);\r
-       }\r
-       else if(!list_empty(&obj->hardLinks))\r
-       {       \r
-               // Curve ball: We're unlinking an object that has a hardlink.\r
-               //\r
-               //      This problem arises because we are not strictly following\r
-               //  The Linux link/inode model.\r
-               //\r
-               // We can't really delete the object.\r
-               // Instead, we do the following:\r
-               // - Select a hardlink.\r
-               // - Unhook it from the hard links\r
-               // - Unhook it from its parent directory (so that the rename can work)\r
-               // - Rename the object to the hardlink's name.\r
-               // - Delete the hardlink\r
-               \r
-               \r
-               yaffs_Object *hl;\r
-               int retVal;\r
-               char name[YAFFS_MAX_NAME_LENGTH+1];\r
-               \r
-               hl = list_entry(obj->hardLinks.next,yaffs_Object,hardLinks);\r
-               \r
-               list_del_init(&hl->hardLinks);\r
-               list_del_init(&hl->siblings);\r
-               \r
-               yaffs_GetObjectName(hl,name,YAFFS_MAX_NAME_LENGTH+1);\r
-               \r
-               retVal = yaffs_ChangeObjectName(obj, hl->parent, name,0);\r
-               \r
-               if(retVal == YAFFS_OK)\r
-               {\r
-                       retVal = yaffs_DoGenericObjectDeletion(hl);\r
-               }\r
-               return retVal;\r
-                               \r
-       }\r
-       else\r
-       {\r
-               switch(obj->variantType)\r
-               {\r
-                       case YAFFS_OBJECT_TYPE_FILE:\r
-                               return yaffs_UnlinkFile(obj);\r
-                               break;\r
-                       case YAFFS_OBJECT_TYPE_DIRECTORY:\r
-                               return yaffs_DeleteDirectory(obj);\r
-                               break;\r
-                       case YAFFS_OBJECT_TYPE_SYMLINK:\r
-                               return yaffs_DeleteSymLink(obj);\r
-                               break;\r
-                       case YAFFS_OBJECT_TYPE_HARDLINK:\r
-                       case YAFFS_OBJECT_TYPE_UNKNOWN:\r
-                       default:\r
-                               return YAFFS_FAIL;\r
-               }\r
-       }\r
-}\r
-\r
-int yaffs_Unlink(yaffs_Object *dir, const char *name)\r
-{\r
-       yaffs_Object *obj;\r
-       \r
-        obj = yaffs_FindObjectByName(dir,name);\r
-        \r
-        if(obj && obj->unlinkAllowed)\r
-        {\r
-               return yaffs_UnlinkWorker(obj);\r
-        }\r
-        \r
-        return YAFFS_FAIL;\r
-       \r
-}\r
-\r
-//////////////// Initialisation Scanning /////////////////\r
-\r
-\r
-\r
-// For now we use the SmartMedia check.\r
-// We look at the blockStatus byte in the first two chunks\r
-// These must be 0xFF to pass as OK.\r
-// todo: this function needs to be modifyable foir different NAND types\r
-// and different chunk sizes.  Suggest make this into a per-device configurable\r
-// function.\r
-static int yaffs_IsBlockBad(yaffs_Device *dev, int blk)\r
-{\r
-       yaffs_Spare spare;\r
-       \r
-       yaffs_ReadChunkFromNAND(dev,blk * YAFFS_CHUNKS_PER_BLOCK,NULL,&spare,1);\r
-#if 1\r
-       if(yaffs_CountBits(spare.blockStatus) < 7)\r
-       {\r
-               return 1;\r
-       }\r
-#else\r
-       if(spare.blockStatus != 0xFF)\r
-       {\r
-               return 1;\r
-       }\r
-#endif\r
-       yaffs_ReadChunkFromNAND(dev,blk * YAFFS_CHUNKS_PER_BLOCK + 1,NULL,&spare,1);\r
-\r
-#if 1\r
-       if(yaffs_CountBits(spare.blockStatus) < 7)\r
-       {\r
-               return 1;\r
-       }\r
-#else\r
-       if(spare.blockStatus != 0xFF)\r
-       {\r
-               return 1;\r
-       }\r
-#endif\r
-       \r
-       return 0;\r
-       \r
-}\r
-\r
-static int yaffs_Scan(yaffs_Device *dev)\r
-{\r
-       yaffs_Spare spare;\r
-       yaffs_Tags tags;\r
-       int blk;\r
-       int chunk;\r
-       int c;\r
-       int deleted;\r
-       yaffs_BlockState state;\r
-       yaffs_Object *hardList = NULL;\r
-       yaffs_Object *hl;\r
-       yaffs_BlockInfo *bi;\r
-\r
-       \r
-       yaffs_ObjectHeader *oh;\r
-       yaffs_Object *in;\r
-       yaffs_Object *parent;\r
-       \r
-       __u8 chunkData[YAFFS_BYTES_PER_CHUNK];\r
-       \r
-       \r
-       // Scan all the blocks...\r
-       \r
-       for(blk = dev->startBlock; blk <= dev->endBlock; blk++)\r
-       {\r
-               deleted = 0;\r
-               bi = yaffs_GetBlockInfo(dev,blk);\r
-               bi->pageBits = 0;\r
-               bi->pagesInUse = 0;\r
-               state = YAFFS_BLOCK_STATE_SCANNING;\r
-               \r
-               \r
-               if(yaffs_IsBlockBad(dev,blk))\r
-               {\r
-                       state = YAFFS_BLOCK_STATE_DEAD;\r
-                       T(YAFFS_TRACE_BAD_BLOCKS,(TSTR("block %d is bad" TENDSTR),blk));\r
-               }\r
-               \r
-               // Read each chunk in the block.\r
-               \r
-               for(c = 0; c < YAFFS_CHUNKS_PER_BLOCK && \r
-                                  state == YAFFS_BLOCK_STATE_SCANNING; c++)\r
-               {\r
-                       // Read the spare area and decide what to do\r
-                       chunk = blk * YAFFS_CHUNKS_PER_BLOCK + c;\r
-                       \r
-                       yaffs_ReadChunkFromNAND(dev,chunk,NULL,&spare,1);\r
-\r
-                       \r
-                       // This block looks ok, now what's in this chunk?\r
-                       yaffs_GetTagsFromSpare(dev,&spare,&tags);\r
-                       \r
-                       if(yaffs_CountBits(spare.pageStatus) < 6)\r
-                       {\r
-                               // A deleted chunk\r
-                               deleted++;\r
-                               dev->nFreeChunks ++;\r
-                               //T((" %d %d deleted\n",blk,c));\r
-                       }\r
-                       else if(tags.objectId == YAFFS_UNUSED_OBJECT_ID)\r
-                       {\r
-                               // An unassigned chunk in the block\r
-                               // This means that either the block is empty or \r
-                               // this is the one being allocated from\r
-                               \r
-                               if(c == 0)\r
-                               {\r
-                                       // the block is unused\r
-                                       state = YAFFS_BLOCK_STATE_EMPTY;\r
-                                       dev->nErasedBlocks++;\r
-                               }\r
-                               else\r
-                               {\r
-                                       // this is the block being allocated from\r
-                                       T(YAFFS_TRACE_SCAN,(TSTR(" Allocating from %d %d" TENDSTR),blk,c));\r
-                                       state = YAFFS_BLOCK_STATE_ALLOCATING;\r
-                                       dev->allocationBlock = blk;\r
-                                       dev->allocationPage = c;\r
-                               }\r
-\r
-                               dev->nFreeChunks += (YAFFS_CHUNKS_PER_BLOCK - c);\r
-                       }\r
-                       else if(tags.chunkId > 0)\r
-                       {\r
-                               int endpos;\r
-                               // A data chunk.\r
-                               bi->pageBits |= (1 << c);\r
-                               bi->pagesInUse++;\r
-                                                               \r
-                               in = yaffs_FindOrCreateObjectByNumber(dev,tags.objectId,YAFFS_OBJECT_TYPE_FILE);\r
-                               // PutChunkIntoFIle checks for a clash (two data chunks with\r
-                               // the same chunkId).\r
-                               yaffs_PutChunkIntoFile(in,tags.chunkId,chunk,1);\r
-                               endpos = (tags.chunkId - 1)* YAFFS_BYTES_PER_CHUNK + tags.byteCount;\r
-                               if(in->variant.fileVariant.scannedFileSize <endpos)\r
-                               {\r
-                                       in->variant.fileVariant.scannedFileSize = endpos;\r
-#ifndef CONFIG_YAFFS_USE_HEADER_FILE_SIZE\r
-                                               in->variant.fileVariant.fileSize =      \r
-                                                       in->variant.fileVariant.scannedFileSize;\r
-#endif\r
-\r
-                               }\r
-                               //T((" %d %d data %d %d\n",blk,c,tags.objectId,tags.chunkId));  \r
-                       }\r
-                       else\r
-                       {\r
-                               // chunkId == 0, so it is an ObjectHeader.\r
-                               // Thus, we read in the object header and make the object\r
-                               bi->pageBits |= (1 << c);\r
-                               bi->pagesInUse++;\r
-                                                       \r
-                               yaffs_ReadChunkFromNAND(dev,chunk,chunkData,NULL,1);\r
-                               \r
-                               oh = (yaffs_ObjectHeader *)chunkData;\r
-                               \r
-                               in = yaffs_FindOrCreateObjectByNumber(dev,tags.objectId,oh->type);\r
-                               \r
-                               if(in->valid)\r
-                               {\r
-                                       // We have already filled this one. We have a duplicate and need to resolve it.\r
-                                       \r
-                                       unsigned existingSerial = in->serial;\r
-                                       unsigned newSerial = tags.serialNumber;\r
-                                       \r
-                                       if(((existingSerial+1) & 3) == newSerial)\r
-                                       {\r
-                                               // Use new one - destroy the exisiting one\r
-                                               yaffs_DeleteChunk(dev,in->chunkId);\r
-                                               in->valid = 0;\r
-                                       }\r
-                                       else\r
-                                       {\r
-                                               // Use existing - destroy this one.\r
-                                               yaffs_DeleteChunk(dev,chunk);\r
-                                       }\r
-                               }\r
-                               \r
-                               if(!in->valid &&\r
-                                  (tags.objectId == YAFFS_OBJECTID_ROOT ||\r
-                                   tags.objectId == YAFFS_OBJECTID_LOSTNFOUND))\r
-                               {\r
-                                       // We only load some info, don't fiddle with directory structure\r
-                                       in->valid = 1;\r
-                                       in->variantType = oh->type;\r
-       \r
-                                       in->st_mode  = oh->st_mode;\r
-#ifdef CONFIG_YAFFS_WINCE\r
-                                       in->win_atime[0] = oh->win_atime[0];\r
-                                       in->win_ctime[0] = oh->win_ctime[0];\r
-                                       in->win_mtime[0] = oh->win_mtime[0];\r
-                                       in->win_atime[1] = oh->win_atime[1];\r
-                                       in->win_ctime[1] = oh->win_ctime[1];\r
-                                       in->win_mtime[1] = oh->win_mtime[1];\r
-#else\r
-                                       in->st_uid   = oh->st_uid;\r
-                                       in->st_gid   = oh->st_gid;\r
-                                       in->st_atime = oh->st_atime;\r
-                                       in->st_mtime = oh->st_mtime;\r
-                                       in->st_ctime = oh->st_ctime;\r
-                                       in->st_rdev = oh->st_rdev;\r
-#endif\r
-                                       in->chunkId  = chunk;\r
-\r
-                               }\r
-                               else if(!in->valid)\r
-                               {\r
-                                       // we need to load this info\r
-                               \r
-                                       in->valid = 1;\r
-                                       in->variantType = oh->type;\r
-       \r
-                                       in->st_mode  = oh->st_mode;\r
-#ifdef CONFIG_YAFFS_WINCE\r
-                                       in->win_atime[0] = oh->win_atime[0];\r
-                                       in->win_ctime[0] = oh->win_ctime[0];\r
-                                       in->win_mtime[0] = oh->win_mtime[0];\r
-                                       in->win_atime[1] = oh->win_atime[1];\r
-                                       in->win_ctime[1] = oh->win_ctime[1];\r
-                                       in->win_mtime[1] = oh->win_mtime[1];\r
-#else\r
-                                       in->st_uid   = oh->st_uid;\r
-                                       in->st_gid   = oh->st_gid;\r
-                                       in->st_atime = oh->st_atime;\r
-                                       in->st_mtime = oh->st_mtime;\r
-                                       in->st_ctime = oh->st_ctime;\r
-                                       in->st_rdev = oh->st_rdev;\r
-#endif\r
-                                       in->chunkId  = chunk;\r
-\r
-                                       yaffs_SetObjectName(in,oh->name);\r
-                                       in->dirty = 0;\r
-                                                       \r
-                                       // directory stuff...\r
-                                       // hook up to parent\r
-       \r
-                                       parent = yaffs_FindOrCreateObjectByNumber(dev,oh->parentObjectId,YAFFS_OBJECT_TYPE_DIRECTORY);\r
-                                       if(parent->variantType == YAFFS_OBJECT_TYPE_UNKNOWN)\r
-                                       {\r
-                                               // Set up as a directory\r
-                                               parent->variantType = YAFFS_OBJECT_TYPE_DIRECTORY;\r
-                                               INIT_LIST_HEAD(&parent->variant.directoryVariant.children);\r
-                                       }\r
-                                       else if(parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)\r
-                                       {\r
-                                               // Hoosterman, another problem....\r
-                                               // We're trying to use a non-directory as a directory\r
-                                               // Todo ... handle\r
-                                               T(YAFFS_TRACE_ERROR, (TSTR("yaffs tradgedy: attempting to use non-directory as a directory in scan" TENDSTR)));\r
-\r
-                                       }\r
-                               \r
-                                       yaffs_AddObjectToDirectory(parent,in);\r
-                                       if(parent == dev->unlinkedDir)\r
-                                       {\r
-                                               in->deleted = 1; // If it is unlinked at start up then it wants deleting\r
-                                               dev->nDeletedFiles++;\r
-                                       }\r
-                               \r
-                                       // Note re hardlinks.\r
-                                       // Since we might scan a hardlink before its equivalent object is scanned\r
-                                       // we put them all in a list.\r
-                                       // After scanning is complete, we should have all the objects, so we run through this\r
-                                       // list and fix up all the chains.              \r
-       \r
-                                       switch(in->variantType)\r
-                                       {\r
-                                               case YAFFS_OBJECT_TYPE_UNKNOWN:         // Todo got a problem\r
-                                                       break;\r
-                                               case YAFFS_OBJECT_TYPE_FILE:\r
-#ifdef CONFIG_YAFFS_USE_HEADER_FILE_SIZE\r
-                                                       in->variant.fileVariant.fileSize = oh->fileSize;\r
-#endif\r
-                                                       break;\r
-                                               case YAFFS_OBJECT_TYPE_HARDLINK:\r
-                                                       in->variant.hardLinkVariant.equivalentObjectId = oh->equivalentObjectId;\r
-                                                       (yaffs_Object *)(in->hardLinks.next) = hardList;\r
-                                                       hardList = in;\r
-                                                       break;\r
-                                               case YAFFS_OBJECT_TYPE_DIRECTORY:       // Do nothing\r
-                                                       break;\r
-                                               case YAFFS_OBJECT_TYPE_SPECIAL: // Do nothing\r
-                                                       break;\r
-                                               case YAFFS_OBJECT_TYPE_SYMLINK:         // Do nothing\r
-                                                       in->variant.symLinkVariant.alias = yaffs_CloneString(oh->alias);\r
-                                                       break;\r
-                                       }\r
-                                       //T((" %d %d header %d \"%s\" type %d\n",blk,c,tags.objectId,oh->name,in->variantType));        \r
-                               }\r
-                       }\r
-               }\r
-               \r
-               if(state == YAFFS_BLOCK_STATE_SCANNING)\r
-               {\r
-                       // If we got this far while scanning, then the block is fully allocated.\r
-                       state = YAFFS_BLOCK_STATE_FULL; \r
-               }\r
-               \r
-               bi->blockState = state;\r
-               \r
-               // Now let's see if it was dirty\r
-               if(     bi->pagesInUse == 0 &&\r
-               bi->blockState == YAFFS_BLOCK_STATE_FULL)\r
-           {\r
-               yaffs_BlockBecameDirty(dev,blk);\r
-           }\r
-\r
-       }\r
-       \r
-       // Fix up the hard link chains.\r
-       // We should now have scanned all the objects, now it's time to add these \r
-       // hardlinks.\r
-       while(hardList)\r
-       {\r
-               hl = hardList;\r
-               hardList = (yaffs_Object *)(hardList->hardLinks.next);\r
-               \r
-               in = yaffs_FindObjectByNumber(dev,hl->variant.hardLinkVariant.equivalentObjectId);\r
-               \r
-               if(in)\r
-               {\r
-                       // Add the hardlink pointers\r
-                       hl->variant.hardLinkVariant.equivalentObject=in;\r
-                       list_add(&hl->hardLinks,&in->hardLinks);\r
-               }\r
-               else\r
-               {\r
-                       //Todo Need to report/handle this better.\r
-                       // Got a problem... hardlink to a non-existant object\r
-                       hl->variant.hardLinkVariant.equivalentObject=NULL;\r
-                       INIT_LIST_HEAD(&hl->hardLinks);\r
-                       \r
-               }\r
-               \r
-       }\r
-       \r
-       \r
-       \r
-       return YAFFS_OK;\r
-}\r
-\r
-\r
-////////////////////////// Directory Functions /////////////////////////\r
-\r
-\r
-static void yaffs_AddObjectToDirectory(yaffs_Object *directory, yaffs_Object *obj)\r
-{\r
-\r
-       if(obj->siblings.prev == NULL)\r
-       {\r
-               // Not initialised\r
-               INIT_LIST_HEAD(&obj->siblings);\r
-               \r
-       }\r
-       else if(!list_empty(&obj->siblings))\r
-       {\r
-               // If it is holed up somewhere else, un hook it\r
-               list_del_init(&obj->siblings);\r
-       }\r
-       // Now add it\r
-       list_add(&obj->siblings,&directory->variant.directoryVariant.children);\r
-       obj->parent = directory;\r
-       \r
-       if(directory == obj->myDev->unlinkedDir)\r
-       {\r
-               obj->unlinked = 1;\r
-               obj->myDev->nUnlinkedFiles++;\r
-               obj->renameAllowed = 0;\r
-       }\r
-}\r
-\r
-static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj)\r
-{\r
-       list_del_init(&obj->siblings);\r
-       obj->parent = NULL;\r
-}\r
-\r
-yaffs_Object *yaffs_FindObjectByName(yaffs_Object *directory,const char *name)\r
-{\r
-       int sum;\r
-       \r
-       struct list_head *i;\r
-       char buffer[YAFFS_MAX_NAME_LENGTH+1];\r
-       \r
-       yaffs_Object *l;\r
-       \r
-       sum = yaffs_CalcNameSum(name);\r
-       \r
-       list_for_each(i,&directory->variant.directoryVariant.children)\r
-       {\r
-               l = list_entry(i, yaffs_Object,siblings);\r
-               \r
-               // Special case for lost-n-found\r
-               if(l->objectId == YAFFS_OBJECTID_LOSTNFOUND)\r
-               {\r
-                       if(yaffs_strcmp(name,YAFFS_LOSTNFOUND_NAME) == 0)\r
-                       {\r
-                               return l;\r
-                       }\r
-               }\r
-               else if(yaffs_SumCompare(l->sum, sum))\r
-               {\r
-                       // Do a real check\r
-                       yaffs_GetObjectName(l,buffer,YAFFS_MAX_NAME_LENGTH);\r
-                       if(yaffs_strcmp(name,buffer) == 0)\r
-                       {\r
-                               return l;\r
-                       }\r
-                       \r
-                       \r
-               }\r
-       }\r
-       \r
-       return NULL;\r
-}\r
-\r
-\r
-int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir,int (*fn)(yaffs_Object *))\r
-{\r
-       struct list_head *i;    \r
-       yaffs_Object *l;\r
-       \r
-       \r
-       list_for_each(i,&theDir->variant.directoryVariant.children)\r
-       {\r
-               l = list_entry(i, yaffs_Object,siblings);\r
-               if(!fn(l))\r
-               {\r
-                       return YAFFS_FAIL;\r
-               }\r
-       }\r
-       \r
-       return YAFFS_OK;\r
-\r
-}\r
-\r
-\r
-// GetEquivalentObject dereferences any hard links to get to the\r
-// actual object.\r
-\r
-yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object *obj)\r
-{\r
-       if(obj && obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)\r
-       {\r
-               // We want the object id of the equivalent object, not this one\r
-               obj = obj->variant.hardLinkVariant.equivalentObject;\r
-       }\r
-       return obj;\r
-\r
-}\r
-\r
-int yaffs_GetObjectName(yaffs_Object *obj,char *name,int buffSize)\r
-{\r
-       memset(name,0,buffSize);\r
-       \r
-       if(obj->objectId == YAFFS_OBJECTID_LOSTNFOUND)\r
-       {\r
-               strncpy(name,YAFFS_LOSTNFOUND_NAME,buffSize - 1);\r
-       }\r
-       else if(obj->chunkId <= 0)\r
-       {\r
-               char locName[20];\r
-               // make up a name\r
-               sprintf(locName,"%s%d",YAFFS_LOSTNFOUND_PREFIX,obj->objectId);\r
-               strncpy(name,locName,buffSize - 1);\r
-\r
-       }\r
-#ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM\r
-       else if(obj->shortName[0])\r
-       {\r
-               strcpy(name,obj->shortName);\r
-       }\r
-#endif\r
-       else\r
-       {\r
-               __u8 buffer[YAFFS_BYTES_PER_CHUNK];\r
-               yaffs_ObjectHeader *oh = (yaffs_ObjectHeader *)buffer;\r
-\r
-               memset(buffer,0,YAFFS_BYTES_PER_CHUNK);\r
-       \r
-               if(obj->chunkId >= 0)\r
-               {\r
-                       yaffs_ReadChunkFromNAND(obj->myDev,obj->chunkId,buffer,NULL,1);\r
-               }\r
-               strncpy(name,oh->name,buffSize - 1);\r
-       }\r
-       \r
-       return strlen(name);\r
-}\r
-\r
-int yaffs_GetObjectFileLength(yaffs_Object *obj)\r
-{\r
-       \r
-       // Dereference any hard linking\r
-       obj = yaffs_GetEquivalentObject(obj);\r
-       \r
-       if(obj->variantType == YAFFS_OBJECT_TYPE_FILE)\r
-       {\r
-               return obj->variant.fileVariant.fileSize;\r
-       }\r
-       if(obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)\r
-       {\r
-               return strlen(obj->variant.symLinkVariant.alias);\r
-       }\r
-       else\r
-       {\r
-               // Only a directory should drop through to here\r
-               return YAFFS_BYTES_PER_CHUNK;\r
-       }       \r
-}\r
-\r
-int yaffs_GetObjectLinkCount(yaffs_Object *obj)\r
-{\r
-       int count = 0; \r
-       struct list_head *i;\r
-       \r
-       if(!obj->unlinked)\r
-       {\r
-               count++;        // the object itself\r
-       }\r
-       list_for_each(i,&obj->hardLinks)\r
-       {\r
-               count++;        // add the hard links;\r
-       }\r
-       return count;\r
-       \r
-}\r
-\r
-\r
-int yaffs_GetObjectInode(yaffs_Object *obj)\r
-{\r
-       obj = yaffs_GetEquivalentObject(obj);\r
-       \r
-       return obj->objectId;\r
-}\r
-\r
-unsigned yaffs_GetObjectType(yaffs_Object *obj)\r
-{\r
-       obj = yaffs_GetEquivalentObject(obj);\r
-       \r
-       switch(obj->variantType)\r
-       {\r
-               case YAFFS_OBJECT_TYPE_FILE:            return DT_REG; break;\r
-               case YAFFS_OBJECT_TYPE_DIRECTORY:       return DT_DIR; break;\r
-               case YAFFS_OBJECT_TYPE_SYMLINK:         return DT_LNK; break;\r
-               case YAFFS_OBJECT_TYPE_HARDLINK:        return DT_REG; break;\r
-               case YAFFS_OBJECT_TYPE_SPECIAL:         \r
-                       if(S_ISFIFO(obj->st_mode)) return DT_FIFO;\r
-                       if(S_ISCHR(obj->st_mode)) return DT_CHR;\r
-                       if(S_ISBLK(obj->st_mode)) return DT_BLK;\r
-                       if(S_ISSOCK(obj->st_mode)) return DT_SOCK;\r
-               default: return DT_REG; break;\r
-       }\r
-}\r
-\r
-char *yaffs_GetSymlinkAlias(yaffs_Object *obj)\r
-{\r
-       obj = yaffs_GetEquivalentObject(obj);\r
-       if(obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)\r
-       {\r
-               return yaffs_CloneString(obj->variant.symLinkVariant.alias);\r
-       }\r
-       else\r
-       {\r
-               return yaffs_CloneString("");\r
-       }\r
-}\r
-\r
-#ifndef CONFIG_YAFFS_WINCE\r
-\r
-int yaffs_SetAttributes(yaffs_Object *obj, struct iattr *attr)\r
-{\r
-       unsigned int valid = attr->ia_valid;\r
-       \r
-       if(valid & ATTR_MODE) obj->st_mode = attr->ia_mode;\r
-       if(valid & ATTR_UID) obj->st_uid = attr->ia_uid;\r
-       if(valid & ATTR_GID) obj->st_gid = attr->ia_gid;\r
-       \r
-       if(valid & ATTR_ATIME) obj->st_atime = attr->ia_atime;\r
-       if(valid & ATTR_CTIME) obj->st_ctime = attr->ia_ctime;\r
-       if(valid & ATTR_MTIME) obj->st_mtime = attr->ia_mtime;\r
-       \r
-       if(valid & ATTR_SIZE) yaffs_ResizeFile(obj,attr->ia_size);\r
-       \r
-       yaffs_UpdateObjectHeader(obj,NULL,1);\r
-       \r
-       return YAFFS_OK;\r
-       \r
-}\r
-int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr)\r
-{\r
-       unsigned int valid = 0;\r
-       \r
-       attr->ia_mode = obj->st_mode;   valid |= ATTR_MODE;\r
-       attr->ia_uid = obj->st_uid;             valid |= ATTR_UID;\r
-       attr->ia_gid = obj->st_gid;             valid |= ATTR_GID;\r
-       \r
-       attr->ia_atime = obj->st_atime; valid |= ATTR_ATIME;\r
-       attr->ia_ctime = obj->st_ctime; valid |= ATTR_CTIME;\r
-       attr->ia_mtime = obj->st_mtime; valid |= ATTR_MTIME;\r
-       \r
-       attr->ia_size = yaffs_GetFileSize(obj); valid |= ATTR_SIZE;\r
-       \r
-       attr->ia_valid = valid;\r
-       \r
-       return YAFFS_OK;\r
-       \r
-}\r
-\r
-#endif\r
-\r
-int yaffs_DumpObject(yaffs_Object *obj)\r
-{\r
-//     __u8 buffer[YAFFS_BYTES_PER_CHUNK];\r
-       char name[257];\r
-//     yaffs_ObjectHeader *oh = (yaffs_ObjectHeader *)buffer;\r
-\r
-//     memset(buffer,0,YAFFS_BYTES_PER_CHUNK);\r
-       \r
-//     if(obj->chunkId >= 0)\r
-//     {\r
-//             yaffs_ReadChunkFromNAND(obj->myDev,obj->chunkId,buffer,NULL);\r
-//     }\r
-       \r
-       yaffs_GetObjectName(obj,name,256);\r
-       \r
-       T(YAFFS_TRACE_ALWAYS,(TSTR("Object %d, inode %d \"%s\"\n dirty %d valid %d serial %d sum %d chunk %d type %d size %d\n" TENDSTR),\r
-                       obj->objectId,yaffs_GetObjectInode(obj), name, obj->dirty, obj->valid, obj->serial, \r
-                       obj->sum, obj->chunkId, yaffs_GetObjectType(obj), yaffs_GetObjectFileLength(obj)));\r
-\r
-#if 0\r
-       YPRINTF(("Object %d \"%s\"\n dirty %d valid %d serial %d sum %d chunk %d\n",\r
-                       obj->objectId, oh->name, obj->dirty, obj->valid, obj->serial, \r
-                       obj->sum, obj->chunkId));\r
-               switch(obj->variantType)\r
-       {\r
-               case YAFFS_OBJECT_TYPE_FILE: \r
-                       YPRINTF((" FILE length %d\n",obj->variant.fileVariant.fileSize));\r
-                       break;\r
-               case YAFFS_OBJECT_TYPE_DIRECTORY:\r
-                       YPRINTF((" DIRECTORY\n"));\r
-                       break;\r
-               case YAFFS_OBJECT_TYPE_HARDLINK: //todo\r
-               case YAFFS_OBJECT_TYPE_SYMLINK:\r
-               case YAFFS_OBJECT_TYPE_UNKNOWN:\r
-               default:\r
-       }\r
-#endif\r
-       \r
-       return YAFFS_OK;\r
-}\r
-\r
-\r
-///////////////////////// Initialisation code ///////////////////////////\r
-\r
-\r
-\r
-int yaffs_GutsInitialise(yaffs_Device *dev)\r
-{\r
-       unsigned x;\r
-       int bits;\r
-       int extraBits;\r
-       int nBlocks;\r
-\r
-\r
-       \r
-       if(!yaffs_CheckStructures())\r
-       {\r
-               T(YAFFS_TRACE_ALWAYS,(TSTR("yaffs_CheckStructures failed\n" TENDSTR)));\r
-               return YAFFS_FAIL;\r
-       }\r
-       \r
-       if(dev->startBlock <= 0 ||\r
-          (dev->endBlock - dev->startBlock) < 10)\r
-       {\r
-               T(YAFFS_TRACE_ALWAYS,(TSTR("startBlock %d or endBlock %d invalid\n" TENDSTR),\r
-                               dev->startBlock, dev->endBlock));\r
-               return YAFFS_FAIL;\r
-       }\r
-       \r
-       nBlocks = dev->endBlock - dev->startBlock + 1;\r
-       \r
-\r
-               \r
-       // OK now calculate a few things for the device\r
-       // Calculate chunkGroupBits. \r
-       // We need to find the next power of 2 > than endBlock\r
-       \r
-       x = YAFFS_CHUNKS_PER_BLOCK * (dev->endBlock+1);\r
-       \r
-       for(bits = extraBits = 0; x > 1; bits++)\r
-       {\r
-               if(x & 1) extraBits++;\r
-               x >>= 1;\r
-       }\r
-\r
-       if(extraBits > 0) bits++;\r
-       \r
-       \r
-       // Level0 Tnodes are 16 bits, so if the bitwidth of the\r
-       // chunk range we're using is greater than 16 we need \r
-       // to figure out chunk shift and chunkGroupSize\r
-       if(bits <= 16) \r
-       {\r
-               dev->chunkGroupBits = 0;\r
-       }\r
-       else\r
-       {\r
-               dev->chunkGroupBits = bits - 16;\r
-       }\r
-       dev->chunkGroupSize = 1 << dev->chunkGroupBits;\r
-       \r
-       \r
-       // More device initialisation\r
-       dev->garbageCollectionRequired  = 0;\r
-       dev->garbageCollections = 0;\r
-       dev->currentDirtyChecker = 0;\r
-       dev->bufferedBlock = -1;\r
-       dev->doingBufferedBlockRewrite = 0;\r
-       dev->blockSelectedForGC = -1;\r
-       dev->nDeletedFiles = 0;\r
-       dev->nBackgroundDeletions=0;\r
-       dev->nUnlinkedFiles = 0;\r
-       dev->eccFixed=0;\r
-       dev->eccUnfixed=0;\r
-       dev->tagsEccFixed=0;\r
-       dev->tagsEccUnfixed=0;\r
-       \r
-       yaffs_InitialiseBlocks(dev,nBlocks);\r
-       \r
-       yaffs_InitialiseTnodes(dev);\r
-\r
-       yaffs_InitialiseObjects(dev);\r
-       \r
-#ifdef CONFIG_YAFFS_SHORT_OP_CACHE\r
-       { \r
-               int i;\r
-               for(i=0; i < YAFFS_N_CACHE_CHUNKS; i++)\r
-               {\r
-                       dev->srCache[i].object = NULL;\r
-                       dev->srCache[i].lastUse = 0;\r
-                       dev->srCache[i].dirty = 0;\r
-               }\r
-               dev->srLastUse = 0;\r
-       }\r
-#endif\r
-\r
-       dev->cacheHits = 0;\r
-       \r
-       \r
-       // Initialise the unlinked, root and lost and found directories\r
-       dev->lostNFoundDir = dev->rootDir = dev->unlinkedDir = NULL;\r
-       \r
-       dev->unlinkedDir = yaffs_CreateFakeDirectory(dev,YAFFS_OBJECTID_UNLINKED, S_IFDIR);\r
-\r
-       dev->rootDir = yaffs_CreateFakeDirectory(dev,YAFFS_OBJECTID_ROOT,YAFFS_ROOT_MODE | S_IFDIR);\r
-       dev->lostNFoundDir = yaffs_CreateFakeDirectory(dev,YAFFS_OBJECTID_LOSTNFOUND,YAFFS_LOSTNFOUND_MODE | S_IFDIR);\r
-       yaffs_AddObjectToDirectory(dev->rootDir,dev->lostNFoundDir);\r
-       \r
-               \r
-       // Now scan the flash.  \r
-       yaffs_Scan(dev);\r
-       \r
-       // Zero out stats\r
-       dev->nPageReads = 0;\r
-    dev->nPageWrites =  0;\r
-       dev->nBlockErasures = 0;\r
-       dev->nGCCopies = 0;\r
-       dev->nRetriedWrites = 0;\r
-       dev->nRetiredBlocks = 0;\r
-\r
-       \r
-       return YAFFS_OK;\r
-               \r
-}\r
-\r
-void yaffs_Deinitialise(yaffs_Device *dev)\r
-{\r
-       yaffs_DeinitialiseBlocks(dev);\r
-       yaffs_DeinitialiseTnodes(dev);\r
-       yaffs_DeinitialiseObjects(dev);\r
-       \r
-}\r
-\r
-int  yaffs_GetNumberOfFreeChunks(yaffs_Device *dev)\r
-{\r
-       int nFree = dev->nFreeChunks - (YAFFS_CHUNKS_PER_BLOCK * YAFFS_RESERVED_BLOCKS);\r
-       \r
-       struct list_head *i;    \r
-       yaffs_Object *l;\r
-       \r
-       \r
-       // To the free chunks add the chunks that are in the deleted unlinked files.\r
-       list_for_each(i,&dev->unlinkedDir->variant.directoryVariant.children)\r
-       {\r
-               l = list_entry(i, yaffs_Object,siblings);\r
-               if(l->deleted)\r
-               {\r
-                       nFree++;\r
-                       nFree += l->nDataChunks;\r
-               }\r
-       }\r
-\r
-\r
-       return (nFree < 0) ? 0 : nFree; \r
-       \r
-}\r
-\r
-\r
-/////////////////// YAFFS test code //////////////////////////////////\r
-\r
-#define yaffs_CheckStruct(structure,syze, name) \\r
-           if(sizeof(structure) != syze) \\r
-              { \\r
-                T(YAFFS_TRACE_ALWAYS,(TSTR("%s should be %d but is %d\n" TENDSTR),name,syze,sizeof(structure))); \\r
-                return YAFFS_FAIL; \\r
-                  }\r
-                \r
-                \r
-static int yaffs_CheckStructures(void)\r
-{\r
-       yaffs_CheckStruct(yaffs_Tags,8,"yaffs_Tags")\r
-       yaffs_CheckStruct(yaffs_TagsUnion,8,"yaffs_TagsUnion")\r
-       yaffs_CheckStruct(yaffs_Spare,16,"yaffs_Spare")\r
-       yaffs_CheckStruct(yaffs_Tnode,2* YAFFS_NTNODES_LEVEL0,"yaffs_Tnode")\r
-       yaffs_CheckStruct(yaffs_ObjectHeader,512,"yaffs_ObjectHeader")\r
-       \r
-       \r
-       return YAFFS_OK;\r
-}\r
-\r
-#if 0\r
-void yaffs_GutsTest(yaffs_Device *dev)\r
-{\r
-       \r
-       if(yaffs_CheckStructures() != YAFFS_OK)\r
-       {\r
-               T(YAFFS_TRACE_ALWAYS,(TSTR("One or more structures malformed-- aborting\n" TENDSTR)));\r
-               return;\r
-       }\r
-       \r
-       yaffs_TnodeTest(dev);\r
-       yaffs_ObjectTest(dev);  \r
-}\r
-#endif\r
-\r
-\r
-\r
+/*
+ * YAFFS: Yet another FFS. A NAND-flash specific file system.
+ * yaffs_guts.c  The main guts of YAFFS
+ *
+ * Copyright (C) 2002 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+ //yaffs_guts.c
+
+const char *yaffs_guts_c_version="$Id: yaffs_guts.c,v 1.13 2002-11-26 01:15:37 charles Exp $";
+
+#include "yportenv.h"
+
+#include "yaffsinterface.h"
+#include "yaffs_guts.h"
+
+
+#define YAFFS_GARBAGE_COLLECT_LOW_WATER 2
+
+
+
+// External functions for ECC on data
+void nand_calculate_ecc (const u_char *dat, u_char *ecc_code);
+int nand_correct_data (u_char *dat, u_char *read_ecc, u_char *calc_ecc);
+
+
+// countBits is a quick way of counting the number of bits in a byte.
+// ie. countBits[n] holds the number of 1 bits in a byte with the value n.
+
+static const char yaffs_countBitsTable[256] =
+{
+0,1,1,2,1,2,2,3,1,2,2,3,2,3,3,4,
+1,2,2,3,2,3,3,4,2,3,3,4,3,4,4,5,
+1,2,2,3,2,3,3,4,2,3,3,4,3,4,4,5,
+2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,
+1,2,2,3,2,3,3,4,2,3,3,4,3,4,4,5,
+2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,
+2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,
+3,4,4,5,4,5,5,6,4,5,5,6,5,6,6,7,
+1,2,2,3,2,3,3,4,2,3,3,4,3,4,4,5,
+2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,
+2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,
+3,4,4,5,4,5,5,6,4,5,5,6,5,6,6,7,
+2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,
+3,4,4,5,4,5,5,6,4,5,5,6,5,6,6,7,
+3,4,4,5,4,5,5,6,4,5,5,6,5,6,6,7,
+4,5,5,6,5,6,6,7,5,6,6,7,6,7,7,8
+};
+
+static int yaffs_CountBits(__u8 x)
+{
+       int retVal;
+       retVal = yaffs_countBitsTable[x];
+       return retVal;
+}
+
+
+
+// Local prototypes
+static int yaffs_CheckObjectHashSanity(yaffs_Device *dev);
+static void yaffs_LoadTagsIntoSpare(yaffs_Spare *sparePtr, yaffs_Tags *tagsPtr);
+static void yaffs_GetTagsFromSpare(yaffs_Device *dev, yaffs_Spare *sparePtr,yaffs_Tags *tagsPtr);
+static int yaffs_PutChunkIntoFile(yaffs_Object *in,int chunkInInode, int chunkInNAND, int inScan);
+
+static yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev,int number,yaffs_ObjectType type);
+static void yaffs_AddObjectToDirectory(yaffs_Object *directory, yaffs_Object *obj);
+static int yaffs_UpdateObjectHeader(yaffs_Object *in,const char *name, int force);
+static void yaffs_DeleteChunk(yaffs_Device *dev,int chunkId);
+static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj);
+static int yaffs_CheckStructures(void);
+static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level, int chunkOffset,int *limit);
+static int yaffs_DoGenericObjectDeletion(yaffs_Object *in);
+
+static yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device *dev,int blockNo);
+
+// Robustification
+static void yaffs_RetireBlock(yaffs_Device *dev,int blockInNAND);
+static void yaffs_HandleReadDataError(yaffs_Device *dev,int chunkInNAND);
+static void yaffs_HandleWriteChunkError(yaffs_Device *dev,int chunkInNAND);
+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev,int chunkInNAND,const __u8 *data, const yaffs_Spare *spare);
+static void yaffs_HandleUpdateChunk(yaffs_Device *dev,int chunkInNAND, const yaffs_Spare *spare);
+
+static int  yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,int chunkInNAND);
+
+static int yaffs_UnlinkWorker(yaffs_Object *obj);
+
+
+static int yaffs_VerifyCompare(const __u8 *d0, const __u8 * d1, const yaffs_Spare *s0, const yaffs_Spare *s1);
+
+
+
+loff_t yaffs_GetFileSize(yaffs_Object *obj);
+
+static int yaffs_ReadChunkTagsFromNAND(yaffs_Device *dev,int chunkInNAND, yaffs_Tags *tags, int *chunkDeleted);
+static int yaffs_TagsMatch(const yaffs_Tags *tags, int objectId, int chunkInObject, int chunkDeleted);
+
+
+static int yaffs_AllocateChunk(yaffs_Device *dev,int useReserve);
+
+#ifdef YAFFS_PARANOID
+static int yaffs_CheckFileSanity(yaffs_Object *in);
+#else
+#define yaffs_CheckFileSanity(in)
+#endif
+
+static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in);
+static void yaffs_InvalidateChunkCache(yaffs_Object *object, int chunkId);
+
+
+static  __inline__ yaffs_BlockInfo* yaffs_GetBlockInfo(yaffs_Device *dev, int blk)
+{
+       if(blk < dev->startBlock || blk > dev->endBlock)
+       {
+               T(YAFFS_TRACE_ERROR,(TSTR("**>> yaffs: block %d is not valid" TENDSTR),blk));
+               YBUG();
+       }
+       return &dev->blockInfo[blk - dev->startBlock];
+}
+
+
+static  __inline__ int yaffs_HashFunction(int n)
+{
+       return (n % YAFFS_NOBJECT_BUCKETS);
+}
+
+
+yaffs_Object *yaffs_Root(yaffs_Device *dev)
+{
+       return dev->rootDir;
+}
+
+yaffs_Object *yaffs_LostNFound(yaffs_Device *dev)
+{
+       return dev->lostNFoundDir;
+}
+
+
+static int yaffs_WriteChunkToNAND(struct yaffs_DeviceStruct *dev,int chunkInNAND, const __u8 *data, yaffs_Spare *spare)
+{
+       if(chunkInNAND < dev->startBlock * YAFFS_CHUNKS_PER_BLOCK)
+       {
+               T(YAFFS_TRACE_ERROR,(TSTR("**>> yaffs chunk %d is not valid" TENDSTR),chunkInNAND));
+               return YAFFS_FAIL;
+       }
+
+       dev->nPageWrites++;
+       return dev->writeChunkToNAND(dev,chunkInNAND,data,spare);
+}
+
+struct nandspare {
+       yaffs_Spare     spare;
+       int             eccres1;
+       int             eccres2;
+};
+
+int yaffs_ReadChunkFromNAND(struct yaffs_DeviceStruct *dev,
+                                                       int chunkInNAND, 
+                                                       __u8 *data, 
+                                                       yaffs_Spare *spare, 
+                                                       int doErrorCorrection)
+{
+       int retVal;
+       yaffs_Spare localSpare;
+
+#ifndef CONFIG_YAFFS_USE_NANDECC
+       __u8 calcEcc[3];
+       int eccResult1,eccResult2;
+#else
+       struct nandspare nspare;
+#endif 
+
+       dev->nPageReads++;
+       
+       
+
+       
+       if(!spare && data)
+       {
+               // If we don't have a real spare, then we use a local one.
+               // Need this for the calculation of the ecc
+               spare = &localSpare;
+       }
+       
+
+#ifndef CONFIG_YAFFS_USE_NANDECC
+       retVal  = dev->readChunkFromNAND(dev,chunkInNAND,data,spare);
+       if(data && doErrorCorrection)
+       {
+                       // Hoosterman, we had a data problem on this page
+                       yaffs_HandleReadDataError(dev,chunkInNAND);
+       }
+#else
+       retVal  = dev->readChunkFromNAND(dev,chunkInNAND,data,(yaffs_Spare*)&nspare);
+       memcpy (spare, &nspare, sizeof(yaffs_Spare));
+       if(data && doErrorCorrection)
+       {
+                if(nspare.eccres1>0)
+                {
+                       T(YAFFS_TRACE_ERROR,(TSTR("**>>ecc error fix performed on chunk %d:0" TENDSTR),chunkInNAND));
+                }
+                else if(nspare.eccres1<0)
+                {
+                       T(YAFFS_TRACE_ERROR,(TSTR("**>>ecc error unfixed on chunk %d:0" TENDSTR),chunkInNAND));
+                }
+
+                if(nspare.eccres2>0)
+                {
+                       T(YAFFS_TRACE_ERROR,(TSTR("**>>ecc error fix performed on chunk %d:1" TENDSTR),chunkInNAND));
+                }
+                else if(nspare.eccres2<0)
+                {
+                       T(YAFFS_TRACE_ERROR,(TSTR("**>>ecc error unfixed on chunk %d:1" TENDSTR),chunkInNAND));
+                }
+
+                if(nspare.eccres2 || nspare.eccres2)
+                {
+                       // Hoosterman, we had a data problem on this page
+                       yaffs_HandleReadDataError(dev,chunkInNAND);
+                }
+
+       }
+#endif
+       return retVal;
+}
+
+
+static int yaffs_CheckChunkErased(struct yaffs_DeviceStruct *dev,int chunkInNAND)
+{
+
+       static int init = 0;
+       static __u8 cmpbuf[YAFFS_BYTES_PER_CHUNK];
+       static __u8 data[YAFFS_BYTES_PER_CHUNK];
+       static __u8 spare[16];
+       
+       
+       dev->readChunkFromNAND(dev,chunkInNAND,data,(yaffs_Spare *)spare);
+       
+       
+       
+       if(!init)
+       {
+               memset(cmpbuf,0xff,YAFFS_BYTES_PER_CHUNK);
+               init = 1;
+       }
+       
+       if(memcmp(cmpbuf,data,YAFFS_BYTES_PER_CHUNK)) return  YAFFS_FAIL;
+       if(memcmp(cmpbuf,spare,16)) return YAFFS_FAIL;
+
+       
+       return YAFFS_OK;
+       
+}
+
+
+
+int yaffs_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,int blockInNAND)
+{
+       dev->nBlockErasures++;
+       return dev->eraseBlockInNAND(dev,blockInNAND);
+}
+
+int yaffs_InitialiseNAND(struct yaffs_DeviceStruct *dev)
+{
+       return dev->initialiseNAND(dev);
+}
+
+static int yaffs_WriteNewChunkToNAND(struct yaffs_DeviceStruct *dev, const __u8 *data, yaffs_Spare *spare,int useReserve)
+{
+       int chunk;
+       
+       int writeOk = 1;
+       int attempts = 0;
+       
+       unsigned char rbData[YAFFS_BYTES_PER_CHUNK];
+       yaffs_Spare rbSpare;
+       
+       do{
+               chunk = yaffs_AllocateChunk(dev,useReserve);
+       
+               if(chunk >= 0)
+               {
+
+                       // First check this chunk is erased...
+#ifndef CONFIG_YAFFS_DISABLE_CHUNK_ERASED_CHECK
+                       writeOk = yaffs_CheckChunkErased(dev,chunk);
+#endif         
+                       if(!writeOk)
+                       {
+                               T(YAFFS_TRACE_ERROR,(TSTR("**>> yaffs chunk %d was not erased" TENDSTR),chunk));
+                       }
+                       else
+                       {
+                               writeOk =  yaffs_WriteChunkToNAND(dev,chunk,data,spare);
+                       }
+                       attempts++;
+                       if(writeOk)
+                       {
+                               // Readback & verify
+                               // If verify fails, then delete this chunk and try again
+                               // To verify we compare everything except the block and 
+                               // page status bytes.
+                               // NB We check a raw read without ECC correction applied
+                               yaffs_ReadChunkFromNAND(dev,chunk,rbData,&rbSpare,0);
+                               
+#ifndef CONFIG_YAFFS_DISABLE_WRITE_VERIFY
+                               if(!yaffs_VerifyCompare(data,rbData,spare,&rbSpare))
+                               {
+                                       // Didn't verify
+                                       T(YAFFS_TRACE_ERROR,(TSTR("**>> yaffs write verify failed on chunk %d" TENDSTR), chunk));
+
+                                       writeOk = 0;
+                               }       
+#endif                         
+                               
+                       }
+                       if(writeOk)
+                       {
+                               // Copy the data into the write buffer.
+                               // NB We do this at the end to prevent duplicates in the case of a write error.
+                               //Todo
+                               yaffs_HandleWriteChunkOk(dev,chunk,data,spare);
+                       }
+                       else
+                       {
+                               yaffs_HandleWriteChunkError(dev,chunk);
+                       }
+               }
+               
+       } while(chunk >= 0 && ! writeOk);
+       
+       if(attempts > 1)
+       {
+               T(YAFFS_TRACE_ERROR,(TSTR("**>> yaffs write required %d attempts" TENDSTR),attempts));
+               dev->nRetriedWrites+= (attempts - 1);   
+       }
+       
+       return chunk;
+}
+
+///
+// Functions for robustisizing
+//
+//
+
+static void yaffs_RetireBlock(yaffs_Device *dev,int blockInNAND)
+{
+       // Ding the blockStatus in the first two pages of the block.
+       
+       yaffs_Spare spare;
+
+       memset(&spare, 0xff,sizeof(yaffs_Spare));
+
+       spare.blockStatus = 0;
+       
+       yaffs_WriteChunkToNAND(dev, blockInNAND * YAFFS_CHUNKS_PER_BLOCK, NULL , &spare);
+       yaffs_WriteChunkToNAND(dev, blockInNAND * YAFFS_CHUNKS_PER_BLOCK + 1, NULL , &spare);
+       
+       yaffs_GetBlockInfo(dev,blockInNAND)->blockState = YAFFS_BLOCK_STATE_DEAD;
+       dev->nRetiredBlocks++;
+}
+
+
+
+static int yaffs_RewriteBufferedBlock(yaffs_Device *dev)
+{
+       dev->doingBufferedBlockRewrite = 1;
+       //
+       //      Remove erased chunks
+       //  Rewrite existing chunks to a new block
+       //      Set current write block to the new block
+       
+       dev->doingBufferedBlockRewrite = 0;
+       
+       return 1;
+}
+
+
+static void yaffs_HandleReadDataError(yaffs_Device *dev,int chunkInNAND)
+{
+       int blockInNAND = chunkInNAND/YAFFS_CHUNKS_PER_BLOCK;
+
+       // Mark the block for retirement
+       yaffs_GetBlockInfo(dev,blockInNAND)->needsRetiring = 1;
+       T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,(TSTR("**>>Block %d marked for retirement" TENDSTR),blockInNAND));
+
+
+       //TODO  
+       // Just do a garbage collection on the affected block then retire the block
+       // NB recursion
+}
+
+
+static void yaffs_CheckWrittenBlock(yaffs_Device *dev,int chunkInNAND)
+{
+}
+
+static void yaffs_HandleWriteChunkOk(yaffs_Device *dev,int chunkInNAND,const __u8 *data, const yaffs_Spare *spare)
+{
+}
+
+static void yaffs_HandleUpdateChunk(yaffs_Device *dev,int chunkInNAND, const yaffs_Spare *spare)
+{
+}
+
+static void yaffs_HandleWriteChunkError(yaffs_Device *dev,int chunkInNAND)
+{
+       int blockInNAND = chunkInNAND/YAFFS_CHUNKS_PER_BLOCK;
+
+       // Mark the block for retirement
+       yaffs_GetBlockInfo(dev,blockInNAND)->needsRetiring = 1;
+       // Delete the chunk
+       yaffs_DeleteChunk(dev,chunkInNAND);
+}
+
+
+
+
+static int yaffs_VerifyCompare(const __u8 *d0, const __u8 * d1, const yaffs_Spare *s0, const yaffs_Spare *s1)
+{
+
+
+       if( memcmp(d0,d1,YAFFS_BYTES_PER_CHUNK) != 0 ||
+               s0->tagByte0 != s1->tagByte0 ||
+               s0->tagByte1 != s1->tagByte1 ||
+               s0->tagByte2 != s1->tagByte2 ||
+               s0->tagByte3 != s1->tagByte3 ||
+               s0->tagByte4 != s1->tagByte4 ||
+               s0->tagByte5 != s1->tagByte5 ||
+               s0->tagByte6 != s1->tagByte6 ||
+               s0->tagByte7 != s1->tagByte7 ||
+               s0->ecc1[0]  != s1->ecc1[0]  ||
+               s0->ecc1[1]  != s1->ecc1[1]  ||
+               s0->ecc1[2]  != s1->ecc1[2]  ||
+               s0->ecc2[0]  != s1->ecc2[0]  ||
+               s0->ecc2[1]  != s1->ecc2[1]  ||
+               s0->ecc2[2]  != s1->ecc2[2] )
+               {
+                       return 0;
+               }
+       
+       return 1;
+}
+
+
+///////////////////////// Object management //////////////////
+// List of spare objects
+// The list is hooked together using the first pointer
+// in the object
+
+// static yaffs_Object *yaffs_freeObjects = NULL;
+
+// static int yaffs_nFreeObjects;
+
+// static yaffs_ObjectList *yaffs_allocatedObjectList = NULL;
+
+// static yaffs_ObjectBucket yaffs_objectBucket[YAFFS_NOBJECT_BUCKETS];
+
+
+static __u16 yaffs_CalcNameSum(const char *name)
+{
+       __u16 sum = 0;
+       __u16 i = 1;
+       
+       __u8 *bname = (__u8 *)name;
+       if(bname)
+       {
+               while ((*bname) && (i <=YAFFS_MAX_NAME_LENGTH))
+               {
+#ifdef CONFIG_YAFFS_WINCE
+                       sum += toupper(*bname) * i;
+#else
+                       sum += (*bname) * i;
+#endif
+                       i++;
+                       bname++;
+               }
+       }
+       return sum;
+}
+
+void yaffs_SetObjectName(yaffs_Object *obj, const char *name)
+{
+#ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM
+                                       if(name && strlen(name) <= YAFFS_SHORT_NAME_LENGTH)
+                                       {
+                                               strcpy(obj->shortName,name);
+                                       }
+                                       else
+                                       {
+                                               obj->shortName[0]='\0';
+                                       }
+#endif
+                                       obj->sum = yaffs_CalcNameSum(name);
+}
+
+void yaffs_CalcECC(const __u8 *data, yaffs_Spare *spare)
+{
+       nand_calculate_ecc (data , spare->ecc1);
+       nand_calculate_ecc (&data[256] , spare->ecc2);
+}
+
+void yaffs_CalcTagsECC(yaffs_Tags *tags)
+{
+       // Calculate an ecc
+       
+       unsigned char *b = ((yaffs_TagsUnion *)tags)->asBytes;
+       unsigned  i,j;
+       unsigned  ecc = 0;
+       unsigned bit = 0;
+
+       tags->ecc = 0;
+       
+       for(i = 0; i < 8; i++)
+       {
+               for(j = 1; j &0xff; j<<=1)
+               {
+                       bit++;
+                       if(b[i] & j)
+                       {
+                               ecc ^= bit;
+                       }
+               }
+       }
+       
+       tags->ecc = ecc;
+       
+       
+}
+
+int  yaffs_CheckECCOnTags(yaffs_Tags *tags)
+{
+       unsigned ecc = tags->ecc;
+       
+       yaffs_CalcTagsECC(tags);
+       
+       ecc ^= tags->ecc;
+       
+       if(ecc && ecc <= 64)
+       {
+               // TODO: Handle the failure better. Retire?
+               unsigned char *b = ((yaffs_TagsUnion *)tags)->asBytes;
+
+               ecc--;
+                               
+               b[ecc / 8] ^= (1 << (ecc & 7));
+               
+               // Now recvalc the ecc
+               yaffs_CalcTagsECC(tags);
+               
+               return 1; // recovered error
+       }
+       else if(ecc)
+       {
+               // Wierd ecc failure value
+               // TODO Need to do somethiong here
+               return -1; //unrecovered error
+       }
+       
+       return 0;
+}
+
+
+///////////////////////// TNODES ///////////////////////
+
+// List of spare tnodes
+// The list is hooked together using the first pointer
+// in the tnode.
+
+//static yaffs_Tnode *yaffs_freeTnodes = NULL;
+
+// static int yaffs_nFreeTnodes;
+
+//static yaffs_TnodeList *yaffs_allocatedTnodeList = NULL;
+
+
+
+// yaffs_CreateTnodes creates a bunch more tnodes and
+// adds them to the tnode free list.
+// Don't use this function directly
+
+static int yaffs_CreateTnodes(yaffs_Device *dev,int nTnodes)
+{
+    int i;
+    yaffs_Tnode *newTnodes;
+    yaffs_TnodeList *tnl;
+    
+    if(nTnodes < 1) return YAFFS_OK;
+   
+       // make these things
+       
+    newTnodes = YMALLOC(nTnodes * sizeof(yaffs_Tnode));
+   
+    if (!newTnodes)
+    {
+               T(YAFFS_TRACE_ERROR,(TSTR("yaffs: Could not allocate Tnodes"TENDSTR)));
+               return YAFFS_FAIL;
+    }
+    
+    // Hook them into the free list
+    for(i = 0; i < nTnodes - 1; i++)
+    {
+       newTnodes[i].internal[0] = &newTnodes[i+1];
+    }
+       
+       newTnodes[nTnodes - 1].internal[0] = dev->freeTnodes;
+       dev->freeTnodes = newTnodes;
+       dev->nFreeTnodes+= nTnodes;
+       dev->nTnodesCreated += nTnodes;
+
+       // Now add this bunch of tnodes to a list for freeing up.
+       // NB If we can't add this to the management list it isn't fatal
+       // but it just means we can't free this bunch of tnodes later.
+       tnl = YMALLOC(sizeof(yaffs_TnodeList));
+       if(!tnl)
+       {
+               T(YAFFS_TRACE_ERROR,(TSTR("yaffs: Could not add tnodes to management list" TENDSTR)));
+               
+       }
+       else
+       {
+               tnl->tnodes = newTnodes;
+               tnl->next = dev->allocatedTnodeList;
+               dev->allocatedTnodeList = tnl;
+       }
+
+
+       T(YAFFS_TRACE_ALLOCATE,(TSTR("yaffs: Tnodes added" TENDSTR)));
+
+
+       return YAFFS_OK;
+}
+
+
+// GetTnode gets us a clean tnode. Tries to make allocate more if we run out
+static yaffs_Tnode *yaffs_GetTnode(yaffs_Device *dev)
+{
+       yaffs_Tnode *tn = NULL;
+       
+       // If there are none left make more
+       if(!dev->freeTnodes)
+       {
+               yaffs_CreateTnodes(dev,YAFFS_ALLOCATION_NTNODES);
+       }
+       
+       if(dev->freeTnodes)
+       {
+               tn = dev->freeTnodes;
+               dev->freeTnodes = dev->freeTnodes->internal[0];
+               dev->nFreeTnodes--;
+               // zero out
+               memset(tn,0,sizeof(yaffs_Tnode));
+       }
+       
+
+       return tn;
+}
+
+
+// FreeTnode frees up a tnode and puts it back on the free list
+static void yaffs_FreeTnode(yaffs_Device*dev, yaffs_Tnode *tn)
+{
+       tn->internal[0] = dev->freeTnodes;
+       dev->freeTnodes = tn;
+       dev->nFreeTnodes++;
+}
+
+
+static void yaffs_DeinitialiseTnodes(yaffs_Device*dev)
+{
+       // Free the list of allocated tnodes
+       
+       while(dev->allocatedTnodeList)
+       {
+               YFREE(dev->allocatedTnodeList->tnodes);
+               dev->allocatedTnodeList =  dev->allocatedTnodeList->next;
+       }
+       
+       dev->freeTnodes = NULL;
+       dev->nFreeTnodes = 0;
+}
+
+static void yaffs_InitialiseTnodes(yaffs_Device*dev)
+{
+       dev->allocatedTnodeList = NULL;
+       dev->freeTnodes = NULL;
+       dev->nFreeTnodes = 0;
+       dev->nTnodesCreated = 0;
+
+}
+
+#if 0
+void yaffs_TnodeTest(yaffs_Device *dev)
+{
+
+       int i;
+       int j;
+       yaffs_Tnode *tn[1000];
+       
+       YINFO("Testing TNodes");
+       
+       for(j = 0; j < 50; j++)
+       {
+               for(i = 0; i < 1000; i++)
+               {
+                       tn[i] = yaffs_GetTnode(dev);
+                       if(!tn[i])
+                       {
+                               YALERT("Getting tnode failed");
+                       }
+               }
+               for(i = 0; i < 1000; i+=3)
+               {
+                       yaffs_FreeTnode(dev,tn[i]);
+                       tn[i] = NULL;
+               }
+               
+       }
+}
+#endif
+
+
+////////////////// END OF TNODE MANIPULATION ///////////////////////////
+
+/////////////// Functions to manipulate the look-up tree (made up of tnodes)
+// The look up tree is represented by the top tnode and the number of topLevel
+// in the tree. 0 means only the level 0 tnode is in the tree.
+
+
+// FindLevel0Tnode finds the level 0 tnode, if one exists.
+// Used when reading.....
+static yaffs_Tnode *yaffs_FindLevel0Tnode(yaffs_Device *dev,yaffs_FileStructure *fStruct, __u32 chunkId)
+{
+       
+       yaffs_Tnode *tn = fStruct->top;
+       __u32 i;
+       int requiredTallness;   
+       int level = fStruct->topLevel;
+       
+       // Check sane level and chunk Id
+       if(level < 0 || level > YAFFS_TNODES_MAX_LEVEL)
+       {
+//             char str[50];
+//             sprintf(str,"Bad level %d",level);
+//             YALERT(str);
+               return NULL;
+       }
+       
+       if(chunkId > YAFFS_MAX_CHUNK_ID)
+       {
+//             char str[50];
+//             sprintf(str,"Bad chunkId %d",chunkId);
+//             YALERT(str);
+               return NULL;
+       }
+
+       // First check we're tall enough (ie enough topLevel)
+       
+       i = chunkId >> (/*dev->chunkGroupBits  + */YAFFS_TNODES_LEVEL0_BITS);
+       requiredTallness = 0;
+       while(i)
+       {
+               i >>= YAFFS_TNODES_INTERNAL_BITS;
+               requiredTallness++;
+       }
+       
+       
+       if(requiredTallness > fStruct->topLevel)
+       {
+               // Not tall enough, so we can't find it, return NULL.
+               return NULL;
+       }
+               
+       
+       // Traverse down to level 0
+       while (level > 0 && tn)
+       {
+           tn = tn->internal[(chunkId >>(/* dev->chunkGroupBits + */ YAFFS_TNODES_LEVEL0_BITS + (level-1) * YAFFS_TNODES_INTERNAL_BITS)) & 
+                              YAFFS_TNODES_INTERNAL_MASK]; 
+               level--;
+       
+       }
+       
+       return tn;              
+}
+
+// AddOrFindLevel0Tnode finds the level 0 tnode if it exists, otherwise first expands the tree.
+// This happens in two steps:
+//  1. If the tree isn't tall enough, then make it taller.
+//  2. Scan down the tree towards the level 0 tnode adding tnodes if required.
+//
+// Used when modifying the tree.
+//
+static yaffs_Tnode *yaffs_AddOrFindLevel0Tnode(yaffs_Device *dev, yaffs_FileStructure *fStruct, __u32 chunkId)
+{
+       
+       yaffs_Tnode *tn; 
+       
+       int requiredTallness;
+       int i;
+       int l;
+       
+       __u32 x;
+               
+       
+       //T((TSTR("AddOrFind topLevel=%d, chunk=%d"),fStruct->topLevel,chunkId));
+       
+       // Check sane level and page Id
+       if(fStruct->topLevel < 0 || fStruct->topLevel > YAFFS_TNODES_MAX_LEVEL)
+       {
+//             char str[50];
+//             sprintf(str,"Bad level %d",fStruct->topLevel);
+//             YALERT(str);
+               return NULL;
+       }
+       
+       if(chunkId > YAFFS_MAX_CHUNK_ID)
+       {
+//             char str[50];
+//             sprintf(str,"Bad chunkId %d",chunkId);
+//             YALERT(str);
+               return NULL;
+       }
+       
+       // First check we're tall enough (ie enough topLevel)
+       
+       x = chunkId >> (/*dev->chunkGroupBits + */YAFFS_TNODES_LEVEL0_BITS);
+       requiredTallness = 0;
+       while(x)
+       {
+               x >>= YAFFS_TNODES_INTERNAL_BITS;
+               requiredTallness++;
+       }
+       
+       //T((TSTR(" required=%d"),requiredTallness));
+       
+       
+       if(requiredTallness > fStruct->topLevel)
+       {
+               // Not tall enough,gotta make the tree taller
+               for(i = fStruct->topLevel; i < requiredTallness; i++)
+               {
+                       //T((TSTR(" add new top")));
+                       
+                       tn = yaffs_GetTnode(dev);
+                       
+                       if(tn)
+                       {
+                               tn->internal[0] = fStruct->top;
+                               fStruct->top = tn;
+                       }
+                       else
+                       {
+                                       T(YAFFS_TRACE_ERROR,(TSTR("yaffs: no more tnodes" TENDSTR)));
+                       }
+               }
+               
+               fStruct->topLevel = requiredTallness;
+       }
+       
+       
+       // Traverse down to level 0, adding anything we need
+       
+       l = fStruct->topLevel;
+       tn = fStruct->top;
+       while (l > 0 && tn)
+       {
+               x = (chunkId >> (/*dev->chunkGroupBits + */YAFFS_TNODES_LEVEL0_BITS + (l-1) * YAFFS_TNODES_INTERNAL_BITS)) & 
+                              YAFFS_TNODES_INTERNAL_MASK;
+                              
+               //T((TSTR(" [%d:%d]"),l,i));
+               
+           if(!tn->internal[x])
+           {
+               //T((TSTR(" added")));
+               
+               tn->internal[x] = yaffs_GetTnode(dev);
+           }
+           
+           tn =        tn->internal[x];
+               l--;
+       
+       }
+       
+       //TSTR(TENDSTR)));
+       
+       return tn;              
+}
+
+// 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 0 if it stopped early due to hitting the limit and the delete is incomplete.
+
+static int yaffs_DeleteWorker(yaffs_Object *in, yaffs_Tnode *tn, __u32 level, int chunkOffset,int *limit)
+{
+       int i;
+       int chunkInInode;
+       int theChunk;
+       yaffs_Tags tags;
+       int found;
+       int chunkDeleted;
+       int allDone = 1;
+       
+       
+       if(tn)
+       {
+               if(level > 0)
+               {
+               
+                       for(i = YAFFS_NTNODES_INTERNAL -1; allDone && i >= 0; i--)
+                       {
+                           if(tn->internal[i])
+                       {
+                                       if(limit && (*limit) < 0)
+                                       {
+                                               allDone = 0;
+                                       }
+                                       else
+                                       {
+                                               allDone = yaffs_DeleteWorker(in,tn->internal[i],level - 1,
+                                                                               (chunkOffset << YAFFS_TNODES_INTERNAL_BITS ) + i ,limit);
+                                       }
+                                       if(allDone)
+                                       {
+                                               yaffs_FreeTnode(in->myDev,tn->internal[i]);
+                                       tn->internal[i] = NULL;
+                                       }
+                           }
+                   
+                       }
+                       return (allDone) ? 1 : 0;
+               }
+               else if(level == 0)
+               {
+                       for(i = YAFFS_NTNODES_LEVEL0 -1; i >= 0; i--) //NB Don't apply the limit here, always delete a whole level0
+                       {
+                           if(tn->level0[i])
+                       {
+                                       int j;
+                                       
+                                       chunkInInode = (chunkOffset << YAFFS_TNODES_LEVEL0_BITS ) + i;
+                                       
+                                       theChunk =  tn->level0[i] << in->myDev->chunkGroupBits;
+
+                                       // Now we need to search for it
+                                       for(j = 0,found = 0; theChunk && j < in->myDev->chunkGroupSize && !found; j++)
+                                       {
+                                               yaffs_ReadChunkTagsFromNAND(in->myDev,theChunk,&tags,&chunkDeleted);
+                                               if(yaffs_TagsMatch(&tags,in->objectId,chunkInInode,chunkDeleted))
+                                               {
+                                                       // found it;
+                                                       found = 1;
+                                       
+                                               }
+                                               else
+                                               {
+                                                       theChunk++;
+                                               }
+                                       }
+                                       
+                                       if(found)
+                                       {
+                                               yaffs_DeleteChunk(in->myDev,theChunk);
+                                               in->nDataChunks--;
+                                               if(limit)
+                                               { 
+                                                       *limit = *limit-1;
+                                               }
+                                       
+                                       }
+                                       
+                               tn->level0[i] = 0;
+                           }
+                   
+                       }
+                       return 1;
+
+                       
+               }
+               
+       }
+       
+       return 1;
+       
+}
+
+
+
+
+// Pruning removes any part of the file structure tree that is beyond the
+// bounds of the file (ie that does not point to chunks).
+//
+// A file should only get pruned when its size is reduced.
+//
+// Before pruning, the chunks must be pulled from the tree and the
+// level 0 tnode entries must be zeroed out.
+// Could also use this for file deletion, but that's probably better handled
+// by a special case.
+
+// yaffs_PruneWorker should only be called by yaffs_PruneFileStructure()
+
+static yaffs_Tnode *yaffs_PruneWorker(yaffs_Device *dev, yaffs_Tnode *tn, __u32 level, int del0)
+{
+       int i;
+       int hasData;
+       
+       if(tn)
+       {
+               hasData = 0;
+               
+               for(i = 0; i < YAFFS_NTNODES_INTERNAL; i++)
+               {
+                   if(tn->internal[i] && level > 0)
+                   {
+                       tn->internal[i] = yaffs_PruneWorker(dev,tn->internal[i],level - 1, ( i == 0) ? del0 : 1);
+                   }
+                   
+                   if(tn->internal[i])
+                   {
+                       hasData++;
+                       }
+               }
+               
+               if(hasData == 0 && del0)
+               {
+                       // Free and return NULL
+                       
+                       yaffs_FreeTnode(dev,tn);
+                       tn = NULL;
+               }
+               
+       }
+
+       return tn;
+       
+}
+
+static int yaffs_PruneFileStructure(yaffs_Device *dev, yaffs_FileStructure *fStruct)
+{
+       int i;
+       int hasData;
+       int done = 0;
+       yaffs_Tnode *tn;
+       
+       if(fStruct->topLevel > 0)
+       {
+               fStruct->top = yaffs_PruneWorker(dev,fStruct->top, fStruct->topLevel,0);
+               
+               // 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 
+               // (ie all the non-zero are NULL)
+               
+               while(fStruct->topLevel && !done)
+               {
+                       tn = fStruct->top;
+                       
+                       hasData = 0;
+                       for(i = 1; i <YAFFS_NTNODES_INTERNAL; i++)
+                       {
+                               if(tn->internal[i])
+                       {
+                               hasData++;
+                               }
+                       }
+                       
+                       if(!hasData)
+                       {
+                               fStruct->top = tn->internal[0];
+                               fStruct->topLevel--;
+                               yaffs_FreeTnode(dev,tn);
+                       }
+                       else
+                       {
+                               done = 1;
+                       }
+               }
+       }
+       
+       return YAFFS_OK;
+}
+
+
+
+
+
+/////////////////////// End of File Structure functions. /////////////////
+
+// yaffs_CreateFreeObjects creates a bunch more objects and
+// adds them to the object free list.
+static int yaffs_CreateFreeObjects(yaffs_Device *dev, int nObjects)
+{
+    int i;
+    yaffs_Object *newObjects;
+    yaffs_ObjectList *list;
+    
+    if(nObjects < 1) return YAFFS_OK;
+   
+       // make these things
+       
+    newObjects = YMALLOC(nObjects * sizeof(yaffs_Object));
+   
+    if (!newObjects)
+    {
+               T(YAFFS_TRACE_ALLOCATE,(TSTR("yaffs: Could not allocate more objects" TENDSTR)));
+               return YAFFS_FAIL;
+    }
+    
+    // Hook them into the free list
+    for(i = 0; i < nObjects - 1; i++)
+    {
+       (yaffs_Object *)newObjects[i].siblings.next = &newObjects[i+1];
+    }
+       
+       newObjects[nObjects - 1].siblings.next = (void *)dev->freeObjects;
+       dev->freeObjects = newObjects;
+       dev->nFreeObjects+= nObjects;
+       dev->nObjectsCreated+= nObjects;
+       
+       // Now add this bunch of Objects to a list for freeing up.
+       
+       list = YMALLOC(sizeof(yaffs_ObjectList));
+       if(!list)
+       {
+               T(YAFFS_TRACE_ALLOCATE,(TSTR("Could not add objects to management list" TENDSTR)));
+       }
+       else
+       {
+               list->objects = newObjects;
+               list->next = dev->allocatedObjectList;
+               dev->allocatedObjectList = list;
+       }
+       
+       
+       
+       return YAFFS_OK;
+}
+
+
+// AllocateEmptyObject gets us a clean Object. Tries to make allocate more if we run out
+static yaffs_Object *yaffs_AllocateEmptyObject(yaffs_Device *dev)
+{
+       yaffs_Object *tn = NULL;
+       
+       // If there are none left make more
+       if(!dev->freeObjects)
+       {
+               yaffs_CreateFreeObjects(dev,YAFFS_ALLOCATION_NOBJECTS);
+       }
+       
+       if(dev->freeObjects)
+       {
+               tn = dev->freeObjects;
+               dev->freeObjects = (yaffs_Object *)(dev->freeObjects->siblings.next);
+               dev->nFreeObjects--;
+               
+               // Now sweeten it up...
+       
+               memset(tn,0,sizeof(yaffs_Object));
+               tn->myDev = dev;
+               tn->chunkId = -1;
+               tn->variantType = YAFFS_OBJECT_TYPE_UNKNOWN;
+               INIT_LIST_HEAD(&(tn->hardLinks));
+               INIT_LIST_HEAD(&(tn->hashLink));
+               INIT_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);      
+               }
+       }
+       
+
+       return tn;
+}
+
+static yaffs_Object *yaffs_CreateFakeDirectory(yaffs_Device *dev,int number,__u32 mode)
+{
+
+       yaffs_Object *obj = yaffs_CreateNewObject(dev,number,YAFFS_OBJECT_TYPE_DIRECTORY);              
+       if(obj)
+       {
+               obj->fake = 1;                  // it is fake so it has no NAND presence...
+               obj->renameAllowed= 0;  // ... and we're not allowed to rename it...
+               obj->unlinkAllowed= 0;  // ... or unlink it
+               obj->deleted = 0;
+               obj->unlinked = 0;
+               obj->st_mode = mode;
+               obj->myDev = dev;
+               obj->chunkId = 0; // Not a valid chunk.
+       }
+       
+       return obj;
+       
+}
+
+
+static void yaffs_UnhashObject(yaffs_Object *tn)
+{
+       int bucket;
+       yaffs_Device *dev = tn->myDev;
+       
+       
+       // If it is still linked into the bucket list, free from the list
+       if(!list_empty(&tn->hashLink))
+       {
+               list_del_init(&tn->hashLink);
+               bucket =  yaffs_HashFunction(tn->objectId);
+               dev->objectBucket[bucket].count--;
+       }
+       
+}
+
+
+// FreeObject frees up a Object and puts it back on the free list
+static void yaffs_FreeObject(yaffs_Object *tn)
+{
+
+       yaffs_Device *dev = tn->myDev;
+       
+       yaffs_UnhashObject(tn);
+       
+       // Link into the free list.
+       (yaffs_Object *)(tn->siblings.next) = dev->freeObjects;
+       dev->freeObjects = tn;
+       dev->nFreeObjects++;
+}
+
+
+
+
+static void yaffs_DeinitialiseObjects(yaffs_Device *dev)
+{
+       // Free the list of allocated Objects
+       
+       while( dev->allocatedObjectList)
+       {
+               YFREE(dev->allocatedObjectList->objects);
+               dev->allocatedObjectList =  dev->allocatedObjectList->next;
+       }
+       
+       dev->freeObjects = NULL;
+       dev->nFreeObjects = 0;
+}
+
+static void yaffs_InitialiseObjects(yaffs_Device *dev)
+{
+       int i;
+       
+       dev->allocatedObjectList = NULL;
+       dev->freeObjects = NULL;
+       dev->nFreeObjects = 0;
+       
+       for(i = 0; i < YAFFS_NOBJECT_BUCKETS; i++)
+       {
+               INIT_LIST_HEAD(&dev->objectBucket[i].list);
+               dev->objectBucket[i].count = 0; 
+       }
+
+}
+
+
+
+
+
+
+int yaffs_FindNiceObjectBucket(yaffs_Device *dev)
+{
+       static int x = 0;
+       int i;
+       int l = 999;
+       int lowest = 999999;
+
+               
+       // First let's see if we can find one that's empty.
+       
+       for(i = 0; i < 10 && lowest > 0; i++)
+        {
+               x++;
+               x %=  YAFFS_NOBJECT_BUCKETS;
+               if(dev->objectBucket[x].count < lowest)
+               {
+                       lowest = dev->objectBucket[x].count;
+                       l = x;
+               }
+               
+       }
+       
+       // If we didn't find an empty list, then try
+       // looking a bit further for a short one
+       
+       for(i = 0; i < 10 && lowest > 3; i++)
+        {
+               x++;
+               x %=  YAFFS_NOBJECT_BUCKETS;
+               if(dev->objectBucket[x].count < lowest)
+               {
+                       lowest = dev->objectBucket[x].count;
+                       l = x;
+               }
+               
+       }
+       
+       return l;
+}
+
+static int yaffs_CreateNewObjectNumber(yaffs_Device *dev)
+{
+       int bucket = yaffs_FindNiceObjectBucket(dev);
+       
+       // Now find an object value that has not already been taken
+       // by scanning the list.
+       
+       int found = 0;
+       struct list_head *i;
+       
+       __u32 n = (__u32)bucket;
+
+       //yaffs_CheckObjectHashSanity();        
+       
+       while(!found)
+       {
+               found = 1;
+               n +=  YAFFS_NOBJECT_BUCKETS;
+               if(1 ||dev->objectBucket[bucket].count > 0)
+               {
+                       list_for_each(i,&dev->objectBucket[bucket].list)
+                       {
+                               // If there is already one in the list
+                               if(list_entry(i, yaffs_Object,hashLink)->objectId == n)
+                               {
+                                       found = 0;
+                               }
+                       }
+               }
+       }
+       
+       //T(("bucket %d count %d inode %d\n",bucket,yaffs_objectBucket[bucket].count,n);
+       
+       return n;       
+}
+
+void yaffs_HashObject(yaffs_Object *in)
+{
+       int bucket = yaffs_HashFunction(in->objectId);
+       yaffs_Device *dev = in->myDev;
+       
+       if(!list_empty(&in->hashLink))
+       {
+               //YINFO("!!!");
+       }
+
+       
+       list_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 list_head *i;
+       yaffs_Object *in;
+       
+       list_for_each(i,&dev->objectBucket[bucket].list)
+       {
+               // Look if it is in the list
+               in = list_entry(i, yaffs_Object,hashLink);
+               if(in->objectId == number)
+               {
+                       return in;
+               }
+       }
+       
+       return NULL;
+}
+
+
+
+yaffs_Object *yaffs_CreateNewObject(yaffs_Device *dev,int number,yaffs_ObjectType type)
+{
+               
+       yaffs_Object *theObject;
+
+       if(number < 0)
+       {
+               number = yaffs_CreateNewObjectNumber(dev);
+       }
+       
+       theObject = yaffs_AllocateEmptyObject(dev);
+       
+       if(theObject)
+       {
+               theObject->fake = 0;
+               theObject->renameAllowed = 1;
+               theObject->unlinkAllowed = 1;
+               theObject->objectId = number;
+               yaffs_HashObject(theObject);
+               theObject->variantType = type;
+#ifdef CONFIG_YAFFS_WINCE
+               yfsd_WinFileTimeNow(theObject->win_atime);
+               theObject->win_ctime[0] = theObject->win_mtime[0] = theObject->win_atime[0];
+               theObject->win_ctime[1] = theObject->win_mtime[1] = theObject->win_atime[1];
+
+#else
+               theObject->st_atime = theObject->st_mtime =     theObject->st_ctime = CURRENT_TIME;
+#endif
+               switch(type)
+               {
+                       case YAFFS_OBJECT_TYPE_FILE: 
+                               theObject->variant.fileVariant.fileSize = 0;
+                               theObject->variant.fileVariant.scannedFileSize = 0;
+                               theObject->variant.fileVariant.topLevel = 0;
+                               theObject->variant.fileVariant.top  = yaffs_GetTnode(dev);
+                               break;
+                       case YAFFS_OBJECT_TYPE_DIRECTORY:
+                               INIT_LIST_HEAD(&theObject->variant.directoryVariant.children);
+                               break;
+                       case YAFFS_OBJECT_TYPE_SYMLINK:
+                               // No action required
+                               break;
+                       case YAFFS_OBJECT_TYPE_HARDLINK:
+                               // No action required
+                               break;
+                       case YAFFS_OBJECT_TYPE_SPECIAL:
+                               // No action required
+                               break;
+                       case YAFFS_OBJECT_TYPE_UNKNOWN:
+                               // todo this should not happen
+                               break;
+               }
+       }
+       
+       return theObject;
+}
+
+yaffs_Object *yaffs_FindOrCreateObjectByNumber(yaffs_Device *dev, int number,yaffs_ObjectType type)
+{
+       yaffs_Object *theObject = NULL;
+       
+       if(number > 0)
+       {
+               theObject = yaffs_FindObjectByNumber(dev,number);
+       }
+       
+       if(!theObject)
+       {
+               theObject = yaffs_CreateNewObject(dev,number,type);
+       }
+       
+       return theObject;
+
+}
+
+char *yaffs_CloneString(const char *str)
+{
+       char *newStr = NULL;
+       
+       if(str && *str)
+       {
+               newStr = YMALLOC(strlen(str) + 1);
+               strcpy(newStr,str);
+       }
+
+       return newStr;
+       
+}
+
+//
+// Mknod (create) a new object.
+// equivalentObject only has meaning for a hard link;
+// aliasString only has meaning for a sumlink.
+// rdev only has meaning for devices (a subset of special objects)
+yaffs_Object *yaffs_MknodObject( yaffs_ObjectType type,
+                                                                yaffs_Object *parent,
+                                                                const char *name, 
+                                                                __u32 mode,
+                                                                __u32 uid,
+                                                                __u32 gid,
+                                                                yaffs_Object *equivalentObject,
+                                                                const char *aliasString,
+                                                                __u32 rdev)
+{
+       yaffs_Object *in;
+
+       yaffs_Device *dev = parent->myDev;
+       
+       // Check if the entry exists. If it does then fail the call since we don't want a dup.
+       if(yaffs_FindObjectByName(parent,name))
+       {
+               return NULL;
+       }
+       
+       in = yaffs_CreateNewObject(dev,-1,type);
+       
+       if(in)
+       {
+               in->chunkId = -1;
+               in->valid = 1;
+               in->variantType = type;
+
+               in->st_mode  = mode;
+               
+#ifdef CONFIG_YAFFS_WINCE
+               yfsd_WinFileTimeNow(in->win_atime);
+               in->win_ctime[0] = in->win_mtime[0] = in->win_atime[0];
+               in->win_ctime[1] = in->win_mtime[1] = in->win_atime[0];
+               
+#else
+               in->st_atime = in->st_mtime = in->st_ctime = CURRENT_TIME;
+               in->st_rdev  = rdev;
+               in->st_uid   = uid;
+               in->st_gid   = gid;
+#endif         
+               in->nDataChunks = 0;
+
+               yaffs_SetObjectName(in,name);
+               in->dirty = 1;
+               
+               yaffs_AddObjectToDirectory(parent,in);
+               
+               in->myDev = parent->myDev;
+               
+                               
+               switch(type)
+               {
+                       case YAFFS_OBJECT_TYPE_SYMLINK:
+                               in->variant.symLinkVariant.alias = yaffs_CloneString(aliasString);
+                               break;
+                       case YAFFS_OBJECT_TYPE_HARDLINK:
+                               in->variant.hardLinkVariant.equivalentObject = equivalentObject;
+                               in->variant.hardLinkVariant.equivalentObjectId = equivalentObject->objectId;
+                               list_add(&in->hardLinks,&equivalentObject->hardLinks);
+                               break;
+                       case YAFFS_OBJECT_TYPE_FILE: // do nothing
+                       case YAFFS_OBJECT_TYPE_DIRECTORY: // do nothing
+                       case YAFFS_OBJECT_TYPE_SPECIAL: // do nothing
+                       case YAFFS_OBJECT_TYPE_UNKNOWN:
+                               break;
+               }
+
+               if(yaffs_GetNumberOfFreeChunks(dev) <= 0 ||
+                  yaffs_UpdateObjectHeader(in,name,0) < 0)
+               {
+                       // Could not create the object header, fail the creation
+                       yaffs_UnlinkWorker(in);
+                       in = NULL;
+               }
+
+       }
+       
+       return in;
+}
+
+yaffs_Object *yaffs_MknodFile(yaffs_Object *parent,const char *name, __u32 mode, __u32 uid, __u32 gid)
+{
+       return yaffs_MknodObject(YAFFS_OBJECT_TYPE_FILE,parent,name,mode,uid,gid,NULL,NULL,0);
+}
+
+yaffs_Object *yaffs_MknodDirectory(yaffs_Object *parent,const char *name, __u32 mode, __u32 uid, __u32 gid)
+{
+       return yaffs_MknodObject(YAFFS_OBJECT_TYPE_DIRECTORY,parent,name,mode,uid,gid,NULL,NULL,0);
+}
+
+yaffs_Object *yaffs_MknodSpecial(yaffs_Object *parent,const char *name, __u32 mode, __u32 uid, __u32 gid, __u32 rdev)
+{
+       return yaffs_MknodObject(YAFFS_OBJECT_TYPE_DIRECTORY,parent,name,mode,uid,gid,NULL,NULL,rdev);
+}
+
+yaffs_Object *yaffs_MknodSymLink(yaffs_Object *parent,const char *name, __u32 mode, __u32 uid, __u32 gid,const char *alias)
+{
+       return yaffs_MknodObject(YAFFS_OBJECT_TYPE_SYMLINK,parent,name,mode,uid,gid,NULL,alias,0);
+}
+
+// NB yaffs_Link returns the object id of the equivalent object.
+yaffs_Object *yaffs_Link(yaffs_Object *parent, const char *name, yaffs_Object *equivalentObject)
+{
+       // Get the real object in case we were fed a hard link as an equivalent object
+       equivalentObject = yaffs_GetEquivalentObject(equivalentObject);
+       
+       if(yaffs_MknodObject(YAFFS_OBJECT_TYPE_HARDLINK,parent,name,0,0,0,equivalentObject,NULL,0))
+       {
+               return equivalentObject;
+       }
+       else
+       {
+               return NULL;
+       }
+       
+}
+
+
+static int yaffs_ChangeObjectName(yaffs_Object *obj, yaffs_Object *newDir, const char *newName,int force)
+{
+       int unlinkOp;
+
+       if(newDir == NULL)
+       {
+               newDir = obj->parent; // use the old directory
+       }
+
+       unlinkOp = (newDir == obj->myDev->unlinkedDir && obj->variantType == YAFFS_OBJECT_TYPE_FILE);
+       
+       // 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.
+       // Otherwise only proceed if the new name does not exist and if we're putting it into a directory.
+       if( (unlinkOp|| 
+                force || 
+                !yaffs_FindObjectByName(newDir,newName))  &&
+            newDir->variantType == YAFFS_OBJECT_TYPE_DIRECTORY)
+       {
+               yaffs_SetObjectName(obj,newName);
+               obj->dirty = 1;
+               
+               yaffs_AddObjectToDirectory(newDir,obj);
+               
+               if(unlinkOp) obj->unlinked = 1;
+               
+               
+               if(yaffs_UpdateObjectHeader(obj,newName,0) >= 0)
+               {
+                       return YAFFS_OK;
+               }
+       }
+       
+       return YAFFS_FAIL;
+}
+
+
+
+int yaffs_RenameObject(yaffs_Object *oldDir, const char *oldName, yaffs_Object *newDir, const char *newName)
+{
+       yaffs_Object *obj;
+       int force = 0;
+       
+#ifdef CONFIG_YAFFS_WINCE
+       // Special case for WinCE.
+       // While look-up is case insensitive, the name isn't.
+       // THerefore we might want to change x.txt to X.txt
+       if(oldDir == newDir && _stricmp(oldName,newName) == 0)
+       {
+               force = 1;
+       }       
+#endif
+       
+       obj = yaffs_FindObjectByName(oldDir,oldName);
+       if(obj && obj->renameAllowed)
+       {
+               return yaffs_ChangeObjectName(obj,newDir,newName,force);
+       }
+       return YAFFS_FAIL;
+}
+
+
+
+static int yaffs_CheckObjectHashSanity(yaffs_Device *dev)
+{
+       // Scan the buckets and check that the lists 
+       // have as many members as the count says there are
+       int bucket;
+       int countEm;
+       struct list_head *j;
+       int ok = YAFFS_OK;
+       
+       for(bucket = 0; bucket < YAFFS_NOBJECT_BUCKETS; bucket++)
+       {
+               countEm = 0;
+               
+               list_for_each(j,&dev->objectBucket[bucket].list)
+               {
+                       countEm++;
+               }
+               
+               if(countEm != dev->objectBucket[bucket].count)
+               {
+                       T(YAFFS_TRACE_ERROR,(TSTR("Inode hash inconsistency" TENDSTR)));
+                       ok = YAFFS_FAIL;
+               }
+       }
+
+       return ok;
+}
+
+#if 0
+void yaffs_ObjectTest(yaffs_Device *dev)
+{
+       yaffs_Object *in[1000];
+       int inNo[1000];
+       yaffs_Object *inold[1000];
+       int i;
+       int j;
+       
+       memset(in,0,1000*sizeof(yaffs_Object *));
+       memset(inold,0,1000*sizeof(yaffs_Object *));
+       
+       yaffs_CheckObjectHashSanity(dev);
+       
+       for(j = 0; j < 10; j++)
+       {
+               //T(("%d\n",j));
+               
+               for(i = 0; i < 1000; i++)
+               {
+                       in[i] = yaffs_CreateNewObject(dev,-1,YAFFS_OBJECT_TYPE_FILE);
+                       if(!in[i])
+                       {
+                               YINFO("No more inodes");
+                       }
+                       else
+                       {
+                               inNo[i] = in[i]->objectId;
+                       }
+               }
+               
+               for(i = 0; i < 1000; i++)
+               {
+                       if(yaffs_FindObjectByNumber(dev,inNo[i]) != in[i])
+                       {
+                               //T(("Differnce in look up test\n"));
+                       }
+                       else
+                       {
+                               // T(("Look up ok\n"));
+                       }
+               }
+               
+               yaffs_CheckObjectHashSanity(dev);
+       
+               for(i = 0; i < 1000; i+=3)
+               {
+                       yaffs_FreeObject(in[i]);        
+                       in[i] = NULL;
+               }
+               
+       
+               yaffs_CheckObjectHashSanity(dev);
+       }
+               
+}
+
+#endif
+
+/////////////////////////// Block Management and Page Allocation ///////////////////
+
+
+static int yaffs_InitialiseBlocks(yaffs_Device *dev,int nBlocks)
+{
+       dev->allocationBlock = -1; // force it to get a new one
+       //Todo we're assuming the malloc will pass.
+       dev->blockInfo = YMALLOC(nBlocks * sizeof(yaffs_BlockInfo));
+       if(dev->blockInfo)
+       {
+               memset(dev->blockInfo,0,nBlocks * sizeof(yaffs_BlockInfo));
+               return YAFFS_OK;
+       }
+       return YAFFS_FAIL;
+       
+}
+
+static void yaffs_DeinitialiseBlocks(yaffs_Device *dev)
+{
+       YFREE(dev->blockInfo);
+}
+
+// FindDiretiestBlock is used to select the dirtiest block (or close enough)
+// for garbage collection.
+
+static int yaffs_FindDirtiestBlock(yaffs_Device *dev)
+{
+
+       int b = dev->currentDirtyChecker;
+       
+       int i;
+       int dirtiest = -1;
+       int pagesInUse = 100; // silly big number
+       yaffs_BlockInfo *bi;
+       
+       for(i = dev->startBlock; i <= dev->endBlock && pagesInUse > 2 ; i++)
+       {
+               b++;
+               if ( b < dev->startBlock || b > dev->endBlock)
+               {
+                       b =  dev->startBlock;
+               }
+
+               if(b < dev->startBlock || b > dev->endBlock)
+               {
+                       T(YAFFS_TRACE_ERROR,(TSTR("**>> Block %d is not valid" TENDSTR),b));
+                       YBUG();
+               }
+               
+               bi = yaffs_GetBlockInfo(dev,b);
+               
+               if(bi->blockState == YAFFS_BLOCK_STATE_FULL &&
+                  bi->pagesInUse < pagesInUse)
+               {
+                       dirtiest = b;
+                       pagesInUse = bi->pagesInUse;
+               }
+       }
+       
+       dev->currentDirtyChecker = b;
+       
+       return dirtiest;
+}
+
+
+static void yaffs_BlockBecameDirty(yaffs_Device *dev,int blockNo)
+{
+       yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,blockNo);
+       
+       int erasedOk = 0;
+       
+       // If the block is still healthy erase it and mark as clean.
+       // If the block has had a data failure, then retire it.
+       bi->blockState = YAFFS_BLOCK_STATE_DIRTY;
+
+       if(!bi->needsRetiring)
+       {
+               erasedOk = yaffs_EraseBlockInNAND(dev,blockNo);
+               if(!erasedOk)
+               {
+                       T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,(TSTR("**>> Erasure failed %d" TENDSTR),blockNo));
+               }
+       }
+       
+       if( erasedOk )
+       {
+               bi->blockState = YAFFS_BLOCK_STATE_EMPTY;
+               dev->nErasedBlocks++;
+               bi->pagesInUse = 0;
+               bi->pageBits = 0;
+       
+               T(YAFFS_TRACE_ERASE,(TSTR("Erased block %d" TENDSTR),blockNo));
+       }
+       else
+       {
+               yaffs_RetireBlock(dev,blockNo);
+               T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,(TSTR("**>> Block %d retired" TENDSTR),blockNo));
+       }
+}
+
+
+static int yaffs_FindBlockForAllocation(yaffs_Device *dev)
+{
+       int i;
+       yaffs_BlockInfo *bi;
+       
+       if(dev->nErasedBlocks < 1)
+       {
+               // Hoosterman we've got a problem.
+               // Can't get space to gc
+               T(YAFFS_TRACE_ERROR, (TSTR("yaffs tradgedy: no space during gc" TENDSTR)));
+
+               return -1;
+       }
+       
+       // Find an empty block.
+       
+       for(i = dev->startBlock; i <= dev->endBlock; i++)
+       {
+               bi = yaffs_GetBlockInfo(dev,i);
+               if(bi->blockState == YAFFS_BLOCK_STATE_EMPTY)
+               {
+                       bi->blockState = YAFFS_BLOCK_STATE_ALLOCATING;
+                       dev->nErasedBlocks--;                   
+                       return i;
+               }
+       }
+       
+       return -1;      
+}
+
+
+
+static int yaffs_AllocateChunk(yaffs_Device *dev,int useReserve)
+{
+       int retVal;
+       yaffs_BlockInfo *bi;
+       
+       if(dev->allocationBlock < 0)
+       {
+               // Get next block to allocate off
+               dev->allocationBlock = yaffs_FindBlockForAllocation(dev);
+               dev->allocationPage = 0;
+       }
+       
+       if(!useReserve &&  dev->nErasedBlocks <= YAFFS_RESERVED_BLOCKS)
+       {
+               // Not enough space to allocate unless we're allowed to use the reserve.
+               return -1;
+       }
+       
+       // Next page please....
+       if(dev->allocationBlock >= 0)
+       {
+               bi = yaffs_GetBlockInfo(dev,dev->allocationBlock);
+               
+               retVal = (dev->allocationBlock * YAFFS_CHUNKS_PER_BLOCK) + 
+                                 dev->allocationPage;
+               bi->pagesInUse++;
+               bi->pageBits |= (1 << (dev->allocationPage));
+
+               dev->allocationPage++;
+               
+               dev->nFreeChunks--;
+               
+               // If the block is full set the state to full
+               if(dev->allocationPage >= YAFFS_CHUNKS_PER_BLOCK)
+               {
+                       bi->blockState = YAFFS_BLOCK_STATE_FULL;
+                       dev->allocationBlock = -1;
+               }
+
+
+               return retVal;
+               
+       }
+       T(YAFFS_TRACE_ERROR,(TSTR("!!!!!!!!! Allocator out !!!!!!!!!!!!!!!!!" TENDSTR)));
+
+       return -1;      
+}
+
+// To determine if we have enough space we just look at the 
+// number of erased blocks.
+// The cache is allowed to use reserved blocks.
+
+int yaffs_CheckSpaceForChunkCache(yaffs_Device *dev)
+{
+       return (dev->nErasedBlocks >= YAFFS_RESERVED_BLOCKS);
+}
+
+
+int  yaffs_GarbageCollectBlock(yaffs_Device *dev,int block)
+{
+       int oldChunk;
+       int newChunk;
+       __u32 mask;
+       
+       
+       yaffs_Spare spare;
+       yaffs_Tags  tags;
+               __u8  buffer[YAFFS_BYTES_PER_CHUNK];
+       
+       yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,block);
+       
+       yaffs_Object *object;
+
+       //T(("Collecting block %d n %d bits %x\n",block, bi->pagesInUse, bi->pageBits));        
+       
+       for(mask = 1,oldChunk = block * YAFFS_CHUNKS_PER_BLOCK; 
+           mask && bi->pageBits;
+           mask <<= 1, oldChunk++ )
+       {
+               if(bi->pageBits & mask)
+               {
+                       
+                       // This page is in use and needs to be copied off
+                       
+                       dev->nGCCopies++;
+                       
+                       //T(("copying page %x from %d to %d\n",mask,oldChunk,newChunk));
+                       
+                       yaffs_ReadChunkFromNAND(dev,oldChunk,buffer, &spare,1);
+                       
+                       yaffs_GetTagsFromSpare(dev,&spare,&tags);
+
+                       object = yaffs_FindObjectByNumber(dev,tags.objectId);
+                       
+                       if(object && object->deleted && tags.chunkId != 0)
+                       {
+                               // Data chunk in a deleted file, throw it away
+                               // It's a deleted data chunk,
+                               // No need to copy this, just forget about it and fix up the
+                               // object.
+                               
+                               yaffs_PutChunkIntoFile(object, tags.chunkId, 0,0); 
+                               object->nDataChunks--;
+                       }
+                       else if( 0 /* Todo object && object->deleted && object->nDataChunks == 0 */)
+                       {
+                               // Deleted object header with no data chunks.
+                               // Can be discarded
+                               object->chunkId = 0;
+                               //Todo some clean up
+                               
+                       }
+                       else if(object)
+                       {
+                               // It's either a data chunk in a live file or
+                               // an ObjectHeader, so we're interested in it.
+                               // NB Need to keep the ObjectHeaders of deleted files
+                               // until the whole file has been deleted off
+                               tags.serialNumber++;
+                               yaffs_LoadTagsIntoSpare(&spare,&tags);
+
+
+                               newChunk = yaffs_WriteNewChunkToNAND(dev, buffer, &spare,1);
+                       
+                               if(newChunk < 0)
+                               {
+                                       return YAFFS_FAIL;
+                               }
+                       
+                               // Ok, now fix up the Tnodes etc.
+                       
+                               if(tags.chunkId == 0)
+                               {
+                                       // It's a header
+                                       object->chunkId = newChunk;
+                               }
+                               else
+                               {
+                                       // It's a data chunk
+                                       yaffs_PutChunkIntoFile(object, tags.chunkId, newChunk,0);
+                               }
+                       }
+                       
+                       yaffs_DeleteChunk(dev,oldChunk);                        
+                       
+               }
+       }
+
+       return YAFFS_OK;
+}
+
+
+static yaffs_Object *yaffs_FindDeletedUnlinkedFile(yaffs_Device *dev)
+{
+       // todo find a file to delete
+       struct list_head *i;    
+       yaffs_Object *l;
+
+
+       // To the free chunks add the chunks that are in the deleted unlinked files.
+       list_for_each(i,&dev->unlinkedDir->variant.directoryVariant.children)
+       {
+               l = list_entry(i, yaffs_Object,siblings);
+               if(l->deleted)
+               {
+                       return l;                       
+               }
+       }       
+       return NULL;
+}
+
+static void yaffs_DoUnlinkedFileDeletion(yaffs_Device *dev)
+{
+       // This does background deletion on unlinked files.. only deleted ones.
+       // If we don't have a file we're working on then find one
+       if(!dev->unlinkedDeletion && dev->nDeletedFiles > 0)
+       {
+               dev->unlinkedDeletion = yaffs_FindDeletedUnlinkedFile(dev);
+       }
+       
+       // OK, we're working on a file...
+       if(dev->unlinkedDeletion)
+       {
+               yaffs_Object *obj = dev->unlinkedDeletion;
+               int delresult;
+               int limit; // Number of chunks to delete in a file.
+                                  // NB this can be exceeded, but not by much.
+                                  
+               limit = 5;
+#if 0                             
+               if(dev->nErasedBlocks <= (YAFFS_RESERVED_BLOCKS + YAFFS_GARBAGE_COLLECT_LOW_WATER))
+               {
+                       limit = 50; // Doing GC soon, so dig deeper     
+               }
+               else
+               {
+                       limit = 5;
+               }
+#endif
+       
+               delresult = yaffs_DeleteWorker(obj, obj->variant.fileVariant.top, obj->variant.fileVariant.topLevel, 0,&limit);
+               
+               if(obj->nDataChunks == 0)
+               {
+                       // Done all the deleting of data chunks.
+                       // Now dump the header and clean up
+                       yaffs_FreeTnode(dev,obj->variant.fileVariant.top);
+                       yaffs_DoGenericObjectDeletion(obj);
+                       dev->nDeletedFiles--;
+                       dev->nUnlinkedFiles--;
+                       dev->nBackgroundDeletions++;
+                       dev->unlinkedDeletion = NULL;   
+               }
+       }
+}
+
+
+
+static int yaffs_CheckGarbageCollection(yaffs_Device *dev)
+{
+       int block;
+       
+       yaffs_DoUnlinkedFileDeletion(dev);
+       
+       if(dev->nErasedBlocks <= (YAFFS_RESERVED_BLOCKS + YAFFS_GARBAGE_COLLECT_LOW_WATER))
+       {
+               dev->garbageCollectionRequired = 1;
+       }       
+       
+       if(dev->garbageCollectionRequired)
+       {
+               dev->garbageCollections++;
+               dev->garbageCollectionRequired = 0;
+               if(dev->blockSelectedForGC >= 0)
+               {
+                       block = dev->blockSelectedForGC;
+               }
+               else
+               {
+                       block = yaffs_FindDirtiestBlock(dev);
+               }
+               
+               if(block >= 0)
+               {
+                       return yaffs_GarbageCollectBlock(dev,block);
+               }       
+               else
+               {
+                       return YAFFS_FAIL;
+               }
+       }
+
+       return YAFFS_OK;
+}
+
+
+//////////////////////////// TAGS ///////////////////////////////////////
+
+static void yaffs_LoadTagsIntoSpare(yaffs_Spare *sparePtr, yaffs_Tags *tagsPtr)
+{
+       yaffs_TagsUnion *tu = (yaffs_TagsUnion *)tagsPtr;
+       
+       yaffs_CalcTagsECC(tagsPtr);
+       
+       sparePtr->tagByte0 = tu->asBytes[0];
+       sparePtr->tagByte1 = tu->asBytes[1];
+       sparePtr->tagByte2 = tu->asBytes[2];
+       sparePtr->tagByte3 = tu->asBytes[3];
+       sparePtr->tagByte4 = tu->asBytes[4];
+       sparePtr->tagByte5 = tu->asBytes[5];
+       sparePtr->tagByte6 = tu->asBytes[6];
+       sparePtr->tagByte7 = tu->asBytes[7];
+}
+
+static void yaffs_GetTagsFromSpare(yaffs_Device *dev, yaffs_Spare *sparePtr,yaffs_Tags *tagsPtr)
+{
+       yaffs_TagsUnion *tu = (yaffs_TagsUnion *)tagsPtr;
+       int result;
+
+       tu->asBytes[0]= sparePtr->tagByte0;
+       tu->asBytes[1]= sparePtr->tagByte1;
+       tu->asBytes[2]= sparePtr->tagByte2;
+       tu->asBytes[3]= sparePtr->tagByte3;
+       tu->asBytes[4]= sparePtr->tagByte4;
+       tu->asBytes[5]= sparePtr->tagByte5;
+       tu->asBytes[6]= sparePtr->tagByte6;
+       tu->asBytes[7]= sparePtr->tagByte7;
+       
+       result =  yaffs_CheckECCOnTags(tagsPtr);
+       if(result> 0)
+       {
+               dev->tagsEccFixed++;
+       }
+       else if(result <0)
+       {
+               dev->tagsEccUnfixed++;
+       }
+}
+
+static void yaffs_SpareInitialise(yaffs_Spare *spare)
+{
+       memset(spare,0xFF,sizeof(yaffs_Spare));
+}
+
+static int yaffs_ReadChunkTagsFromNAND(yaffs_Device *dev,int chunkInNAND, yaffs_Tags *tags, int *chunkDeleted)
+{
+       if(tags)
+       {
+               yaffs_Spare spare;
+               if(yaffs_ReadChunkFromNAND(dev,chunkInNAND,NULL,&spare,1) == YAFFS_OK)
+               {
+                       *chunkDeleted = (yaffs_CountBits(spare.pageStatus) < 7) ? 1 : 0;
+                       yaffs_GetTagsFromSpare(dev,&spare,tags);
+                       return YAFFS_OK;
+               }
+               else
+               {
+                       return YAFFS_FAIL;
+               }
+       }
+       
+       return YAFFS_OK;
+}
+
+#if 0
+static int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND, const __u8 *buffer, yaffs_Tags *tags)
+{
+       // NB There must be tags, data is optional
+       // If there is data, then an ECC is calculated on it.
+       
+       yaffs_Spare spare;
+       
+       if(!tags)
+       {
+               return YAFFS_FAIL;
+       }
+       
+       yaffs_SpareInitialise(&spare);
+       
+#ifndef CONFIG_YAFFS_USE_NANDECC
+       if(buffer)
+       {
+               yaffs_CalcECC(buffer,&spare);
+       }
+#endif
+       
+       yaffs_LoadTagsIntoSpare(&spare,tags);
+       
+       return yaffs_WriteChunkToNAND(dev,chunkInNAND,buffer,&spare);
+       
+}
+#endif
+
+
+static int yaffs_WriteNewChunkWithTagsToNAND(yaffs_Device *dev, const __u8 *buffer, yaffs_Tags *tags, int useReserve)
+{
+       // NB There must be tags, data is optional
+       // If there is data, then an ECC is calculated on it.
+       
+       yaffs_Spare spare;
+       
+       if(!tags)
+       {
+               return YAFFS_FAIL;
+       }
+       
+       yaffs_SpareInitialise(&spare);
+       
+#ifndef CONFIG_YAFFS_USE_NANDECC
+
+       if(buffer)
+       {
+               yaffs_CalcECC(buffer,&spare);
+       }
+#endif
+       
+       yaffs_LoadTagsIntoSpare(&spare,tags);
+       
+       return yaffs_WriteNewChunkToNAND(dev,buffer,&spare,useReserve);
+       
+}
+
+static int yaffs_TagsMatch(const yaffs_Tags *tags, int objectId, int chunkInObject, int chunkDeleted)
+{
+       return  (  tags->chunkId == chunkInObject &&
+                          tags->objectId == objectId &&
+                          !chunkDeleted) ? 1 : 0;
+       
+}
+
+
+
+int yaffs_FindChunkInFile(yaffs_Object *in,int chunkInInode,yaffs_Tags *tags)
+{
+       //Get the Tnode, then get the level 0 offset chunk offset
+    yaffs_Tnode *tn;     
+    int theChunk = -1;
+    yaffs_Tags localTags;
+    int i;
+    int found = 0;
+    int chunkDeleted;
+    
+    yaffs_Device *dev = in->myDev;
+    
+    
+    if(!tags)
+    {
+       // Passed a NULL, so use our own tags space
+       tags = &localTags;
+    }
+    
+    tn = yaffs_FindLevel0Tnode(dev,&in->variant.fileVariant, chunkInInode);
+    
+    if(tn)
+    {
+               theChunk = tn->level0[chunkInInode & YAFFS_TNODES_LEVEL0_MASK] << dev->chunkGroupBits;
+
+               // Now we need to do the shifting etc and search for it
+               for(i = 0,found = 0; theChunk && i < dev->chunkGroupSize && !found; i++)
+               {
+                       yaffs_ReadChunkTagsFromNAND(dev,theChunk,tags,&chunkDeleted);
+                       if(yaffs_TagsMatch(tags,in->objectId,chunkInInode,chunkDeleted))
+                       {
+                               // found it;
+                               found = 1;
+                       }
+                       else
+                       {
+                               theChunk++;
+                       }
+               }
+    }
+    return found ? theChunk : -1;
+}
+
+int yaffs_FindAndDeleteChunkInFile(yaffs_Object *in,int chunkInInode,yaffs_Tags *tags)
+{
+       //Get the Tnode, then get the level 0 offset chunk offset
+    yaffs_Tnode *tn;     
+    int theChunk = -1;
+    yaffs_Tags localTags;
+    int i;
+    int found = 0;
+    yaffs_Device *dev = in->myDev;
+    int chunkDeleted;
+    
+    if(!tags)
+    {
+       // Passed a NULL, so use our own tags space
+       tags = &localTags;
+    }
+    
+    tn = yaffs_FindLevel0Tnode(dev,&in->variant.fileVariant, chunkInInode);
+    
+    if(tn)
+    {
+    
+               theChunk = tn->level0[chunkInInode & YAFFS_TNODES_LEVEL0_MASK] << dev->chunkGroupBits;
+    
+               // Now we need to do the shifting etc and search for it
+               for(i = 0,found = 0; theChunk && i < dev->chunkGroupSize && !found; i++)
+               {
+                       yaffs_ReadChunkTagsFromNAND(dev,theChunk,tags,&chunkDeleted);
+                       if(yaffs_TagsMatch(tags,in->objectId,chunkInInode,chunkDeleted))
+                       {
+                               // found it;
+                               found = 1;
+                       }
+                       else
+                       {
+                               theChunk++;
+                       }
+               }
+    
+               // Delete the entry in the filestructure
+               if(found)
+               {
+                       tn->level0[chunkInInode & YAFFS_TNODES_LEVEL0_MASK] = 0;
+               }
+    }
+    else
+    {
+       //T(("No level 0 found for %d\n", chunkInInode));
+    }
+    
+    if(!found)
+    {
+       //T(("Could not find %d to delete\n",chunkInInode));
+    }
+    return found ? theChunk : -1;
+}
+
+
+#ifdef YAFFS_PARANOID
+
+static int yaffs_CheckFileSanity(yaffs_Object *in)
+{
+       int chunk;
+       int nChunks;
+       int fSize;
+       int failed = 0;
+       int objId;
+       yaffs_Tnode *tn;
+    yaffs_Tags localTags;
+    yaffs_Tags *tags = &localTags;
+    int theChunk;
+    int chunkDeleted;
+    
+       
+       if(in->variantType != YAFFS_OBJECT_TYPE_FILE)
+       {
+               //T(("Object not a file\n"));
+               return YAFFS_FAIL;
+       }
+       
+       objId = in->objectId;
+       fSize  = in->variant.fileVariant.fileSize;
+       nChunks = (fSize + YAFFS_BYTES_PER_CHUNK -1)/YAFFS_BYTES_PER_CHUNK;
+       
+       for(chunk = 1; chunk <= nChunks; chunk++)
+       {
+               tn = yaffs_FindLevel0Tnode(in->myDev,&in->variant.fileVariant, chunk);
+    
+               if(tn)
+               {
+    
+                       theChunk = tn->level0[chunk & YAFFS_TNODES_LEVEL0_MASK] << in->myDev->chunkGroupBits;
+    
+
+                               yaffs_ReadChunkTagsFromNAND(in->myDev,theChunk,tags,&chunkDeleted);
+                               if(yaffs_TagsMatch(tags,in->objectId,chunk,chunkDeleted))
+                               {
+                                       // found it;
+                               
+                               }
+                               else
+                               {
+                                       //T(("File problem file [%d,%d] NAND %d  tags[%d,%d]\n",
+                                       //              objId,chunk,theChunk,tags->chunkId,tags->objectId);
+                                                       
+                                       failed = 1;
+                                                               
+                               }
+    
+               }
+               else
+               {
+                       //T(("No level 0 found for %d\n", chunk));
+               }
+       }
+       
+       return failed ? YAFFS_FAIL : YAFFS_OK;
+}
+
+#endif
+
+static int yaffs_PutChunkIntoFile(yaffs_Object *in,int chunkInInode, int chunkInNAND, int inScan)
+{
+       yaffs_Tnode *tn;
+       yaffs_Device *dev = in->myDev;
+       int existingChunk;
+       yaffs_Tags existingTags;
+       yaffs_Tags newTags;
+       unsigned existingSerial, newSerial;
+       
+       int newChunkDeleted;
+       
+       
+       tn = yaffs_AddOrFindLevel0Tnode(dev,&in->variant.fileVariant, chunkInInode);
+       if(!tn)
+       {
+               return YAFFS_FAIL;
+       }
+
+       existingChunk = tn->level0[chunkInInode & YAFFS_TNODES_LEVEL0_MASK];            
+       
+       if(inScan)
+       {
+               // If we're scanning then we need to test for duplicates
+               // 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.
+       
+               
+               if(existingChunk != 0)
+               {
+                       // NB Right now existing chunk will not be real chunkId if the device >= 32MB
+                       //    thus we have to do a FindChunkInFile to get the real chunk id.
+                       //
+                       // We have a duplicate now we need to decide which one to use
+                       // To do this we get both sets of tags and compare serial numbers.
+                       yaffs_ReadChunkTagsFromNAND(dev,chunkInNAND, &newTags,&newChunkDeleted);
+                       
+                       
+                       // Do a proper find
+                       existingChunk = yaffs_FindChunkInFile(in,chunkInInode, &existingTags);
+
+                       if(existingChunk <=0)
+                       {
+                               //Hoosterman - how did this happen?
+                               
+                               T(YAFFS_TRACE_ERROR, (TSTR("yaffs tradgedy: existing chunk < 0 in scan" TENDSTR)));
+
+                       }
+
+                       
+                       // NB The deleted flags should be false, otherwise the chunks will 
+                       // not be loaded during a scan
+                       
+                       newSerial = newTags.serialNumber;
+                       existingSerial = existingTags.serialNumber;
+                       
+                       if( existingChunk <= 0 ||
+                           ((existingSerial+1) & 3) == newSerial)
+                       {
+                               // Use new
+                               // Delete the old one and drop through to update the tnode
+                               yaffs_DeleteChunk(dev,existingChunk);
+                       }
+                       else
+                       {
+                               // Use existing.
+                               // Delete the new one and return early so that the tnode isn't changed
+                               yaffs_DeleteChunk(dev,chunkInNAND);
+                               return YAFFS_OK;
+                       }
+               }
+
+       }
+               
+       if(existingChunk == 0)
+       {
+               in->nDataChunks++;
+       }
+       
+       tn->level0[chunkInInode & YAFFS_TNODES_LEVEL0_MASK] = (chunkInNAND >> dev->chunkGroupBits);
+       
+       return YAFFS_OK;
+}
+
+
+
+int yaffs_ReadChunkDataFromObject(yaffs_Object *in,int chunkInInode, __u8 *buffer)
+{
+    int chunkInNAND = yaffs_FindChunkInFile(in,chunkInInode,NULL);
+    
+    if(chunkInNAND >= 0)
+    {
+               return yaffs_ReadChunkFromNAND(in->myDev,chunkInNAND,buffer,NULL,1);
+       }
+       else
+       {
+               return 0;
+       }
+
+}
+
+
+static void yaffs_DeleteChunk(yaffs_Device *dev,int chunkId)
+{
+       int block;
+       int page;
+       yaffs_Spare spare;
+       yaffs_BlockInfo *bi;
+       
+       if(chunkId <= 0) return;        
+               
+       block = chunkId / YAFFS_CHUNKS_PER_BLOCK;
+       page = chunkId % YAFFS_CHUNKS_PER_BLOCK;
+       yaffs_SpareInitialise(&spare);
+       
+       spare.pageStatus = 0; // To mark it as deleted.
+
+       
+       yaffs_WriteChunkToNAND(dev,chunkId,NULL,&spare);
+       yaffs_HandleUpdateChunk(dev,chunkId,&spare);
+       bi = yaffs_GetBlockInfo(dev,block);
+                       
+       
+       // Pull out of the management area.
+       // If the whole block became dirty, this will kick off an erasure.
+       if(     bi->blockState == YAFFS_BLOCK_STATE_ALLOCATING ||
+           bi->blockState == YAFFS_BLOCK_STATE_FULL)
+       {
+               dev->nFreeChunks++;
+
+               bi->pageBits &= ~(1 << page);
+               bi->pagesInUse--;
+               
+               if(bi->pagesInUse == 0 &&
+              bi->blockState == YAFFS_BLOCK_STATE_FULL)
+           {
+               yaffs_BlockBecameDirty(dev,block);
+           }
+
+       }
+       else
+       {
+               // T(("Bad news deleting chunk %d\n",chunkId));
+       }
+       
+}
+
+
+
+
+int yaffs_WriteChunkDataToObject(yaffs_Object *in,int chunkInInode, const __u8 *buffer,int nBytes,int useReserve)
+{
+       // Find old chunk Need to do this to get serial number
+       // Write new one and patch into tree.
+       // Invalidate old tags.
+
+    int prevChunkId;
+    yaffs_Tags prevTags;
+    
+    int newChunkId;
+    yaffs_Tags newTags;
+
+    yaffs_Device *dev = in->myDev;    
+
+       yaffs_CheckGarbageCollection(dev);
+
+       // Get the previous chunk at this location in the file if it exists
+    prevChunkId  = yaffs_FindChunkInFile(in,chunkInInode,&prevTags);
+    
+    // Set up new tags
+       newTags.chunkId = chunkInInode;
+       newTags.objectId = in->objectId;
+       newTags.serialNumber = (prevChunkId >= 0) ? prevTags.serialNumber + 1 : 1;
+       newTags.byteCount = nBytes;
+       newTags.unusedStuff = 0xFFFFFFFF;
+               
+       yaffs_CalcTagsECC(&newTags);
+
+       newChunkId = yaffs_WriteNewChunkWithTagsToNAND(dev,buffer,&newTags,useReserve);
+       if(newChunkId >= 0)
+       {
+               yaffs_PutChunkIntoFile(in,chunkInInode,newChunkId,0);
+               
+               
+               if(prevChunkId >= 0)
+               {
+                       yaffs_DeleteChunk(dev,prevChunkId);
+       
+               }
+               
+               yaffs_CheckFileSanity(in);
+       }
+       return newChunkId;
+
+
+
+
+
+}
+
+
+// UpdateObjectHeader updates the header on NAND for an object.
+// If name is not NULL, then that new name is used.
+//
+int yaffs_UpdateObjectHeader(yaffs_Object *in,const char *name, int force)
+{
+
+       yaffs_Device *dev = in->myDev;
+       
+    int prevChunkId;
+    
+    int newChunkId;
+    yaffs_Tags newTags;
+    __u8 bufferNew[YAFFS_BYTES_PER_CHUNK];
+    __u8 bufferOld[YAFFS_BYTES_PER_CHUNK];
+    
+    yaffs_ObjectHeader *oh = (yaffs_ObjectHeader *)bufferNew;
+    yaffs_ObjectHeader *ohOld = (yaffs_ObjectHeader *)bufferOld;
+
+    
+    if(!in->fake || force)
+    {
+  
+               yaffs_CheckGarbageCollection(dev);              
+    
+               memset(bufferNew,0xFF,YAFFS_BYTES_PER_CHUNK);
+    
+               prevChunkId = in->chunkId;
+    
+               if(prevChunkId >= 0)
+               {
+                       yaffs_ReadChunkFromNAND(dev,prevChunkId,bufferOld,NULL,1);      
+               }
+
+               // Header data
+               oh->type = in->variantType;
+               
+               oh->st_mode = in->st_mode;
+
+#ifdef CONFIG_YAFFS_WINCE
+               oh->win_atime[0] = in->win_atime[0];
+               oh->win_ctime[0] = in->win_ctime[0];
+               oh->win_mtime[0] = in->win_mtime[0];
+               oh->win_atime[1] = in->win_atime[1];
+               oh->win_ctime[1] = in->win_ctime[1];
+               oh->win_mtime[1] = in->win_mtime[1];
+#else
+               oh->st_uid = in->st_uid;
+               oh->st_gid = in->st_gid;
+               oh->st_atime = in->st_atime;
+               oh->st_mtime = in->st_mtime;
+               oh->st_ctime = in->st_ctime;
+               oh->st_rdev = in->st_rdev;
+#endif 
+               if(in->parent)
+               {
+                       oh->parentObjectId = in->parent->objectId;
+               }
+               else
+               {
+                       oh->parentObjectId = 0;
+               }
+               
+               //oh->sum = in->sum;
+               if(name && *name)
+               {
+                       memset(oh->name,0,YAFFS_MAX_NAME_LENGTH + 1);
+                       strncpy(oh->name,name,YAFFS_MAX_NAME_LENGTH);
+               }
+               else if(prevChunkId)
+               {       
+                       memcpy(oh->name, ohOld->name,YAFFS_MAX_NAME_LENGTH + 1);
+               }
+               else
+               {
+                       memset(oh->name,0,YAFFS_MAX_NAME_LENGTH + 1);   
+               }
+       
+               switch(in->variantType)
+               {
+                       case YAFFS_OBJECT_TYPE_UNKNOWN:         
+                               // Should not happen
+                               break;
+                       case YAFFS_OBJECT_TYPE_FILE:
+                               oh->fileSize = in->variant.fileVariant.fileSize;
+                               break;
+                       case YAFFS_OBJECT_TYPE_HARDLINK:
+                               oh->equivalentObjectId = in->variant.hardLinkVariant.equivalentObjectId;
+                               break;
+                       case YAFFS_OBJECT_TYPE_SPECIAL: 
+                               // Do nothing
+                               break;
+                       case YAFFS_OBJECT_TYPE_DIRECTORY:       
+                               // Do nothing
+                               break;
+                       case YAFFS_OBJECT_TYPE_SYMLINK:
+                               strncpy(oh->alias,in->variant.symLinkVariant.alias,YAFFS_MAX_ALIAS_LENGTH);
+                               oh->alias[YAFFS_MAX_ALIAS_LENGTH] = 0;
+                               break;
+               }
+
+               // Tags
+               in->serial++;
+               newTags.chunkId = 0;
+               newTags.objectId = in->objectId;
+               newTags.serialNumber = in->serial;
+               newTags.byteCount =   0xFFFFFFFF;
+               newTags.unusedStuff = 0xFFFFFFFF;
+       
+               yaffs_CalcTagsECC(&newTags);
+       
+
+               // Create new chunk in NAND
+               newChunkId = yaffs_WriteNewChunkWithTagsToNAND(dev,bufferNew,&newTags,1);
+    
+               if(newChunkId >= 0)
+               {
+               
+                       in->chunkId = newChunkId;               
+               
+                       if(prevChunkId >= 0)
+                       {
+                               yaffs_DeleteChunk(dev,prevChunkId);
+                       }
+               
+                       in->dirty = 0;
+               }
+               
+               return newChunkId;
+
+    }
+    return 0;
+}
+
+
+/////////////////////// Short Operations Cache ////////////////////////////////
+//     In many siturations 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 
+//  sequential writes. eg. scanning/writing a jpeg file.
+//     In these cases, a short read/write cache can provide a huge perfomance benefit 
+//  with dumb-as-a-rock code.
+//  There are a limited number (~10) of cache chunks per device so that we don't
+//  need a very intelligent search.
+
+
+#ifdef CONFIG_YAFFS_SHORT_OP_CACHE
+
+
+static void yaffs_FlushFilesChunkCache(yaffs_Object *obj)
+{
+       yaffs_Device *dev = obj->myDev;
+       int lowest;
+       int i;
+       yaffs_ChunkCache *cache;
+       int chunkWritten;
+       int nBytes;
+       
+       do{
+               cache = NULL;
+               
+               // Find the dirty cache for this object with the lowest chunk id.
+               for(i = 0; i < YAFFS_N_CACHE_CHUNKS; i++)
+               {
+                       if(dev->srCache[i].object == obj &&
+                          dev->srCache[i].dirty)
+                       {
+                               if(!cache ||  dev->srCache[i].chunkId < lowest)
+                               {
+                                       cache = &dev->srCache[i];
+                                       lowest = cache->chunkId;
+                               }
+                       }
+               }
+               
+               if(cache)
+               {
+                       //Write it out
+
+                       nBytes = cache->object->variant.fileVariant.fileSize - ((cache->chunkId -1) * YAFFS_BYTES_PER_CHUNK);
+                       
+                       if(nBytes > YAFFS_BYTES_PER_CHUNK)
+                       {
+                               nBytes= YAFFS_BYTES_PER_CHUNK;
+                       }
+                       
+                       chunkWritten = yaffs_WriteChunkDataToObject(cache->object,
+                                                                                                               cache->chunkId,
+                                                                                                               cache->data,
+                                                                                                               nBytes,1);
+
+                       cache->dirty = 0;
+               }
+               
+       } while(cache && chunkWritten > 0);
+       
+       if(cache)
+       {
+               //Hoosterman, disk full while writing cache out.
+               T(YAFFS_TRACE_ERROR, (TSTR("yaffs tradgedy: no space during caceh write" TENDSTR)));
+
+       }       
+               
+}
+
+
+// Grab us a chunk for use.
+// First look for an empty one. 
+// Then look for the least recently used non-dirty one.
+// Then look for the least recently used dirty one...., flush and look again.
+static yaffs_ChunkCache *yaffs_GrabChunkCacheWorker(yaffs_Device *dev)
+{
+       int i;
+       int usage;
+       int theOne;
+       
+       for(i = 0; i < YAFFS_N_CACHE_CHUNKS; i++)
+       {
+               if(!dev->srCache[i].object)
+               {
+                       //T(("Grabbing empty %d\n",i));
+                       
+                       return &dev->srCache[i];
+               }
+       }
+       
+       theOne = -1; 
+       usage = 0; // just to stop the compiler grizzling
+       
+       for(i = 0; i < YAFFS_N_CACHE_CHUNKS; i++)
+       {
+               if(!dev->srCache[i].dirty &&
+                  ((dev->srCache[i].lastUse < usage  && theOne >= 0)|| 
+                    theOne < 0))
+               {
+                       usage = dev->srCache[i].lastUse;
+                       theOne = i;
+               }
+       }
+       
+       //T(("Grabbing non-empty %d\n",theOne));
+       return  theOne >= 0 ?  &dev->srCache[theOne] : NULL;
+       
+}
+
+
+static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device *dev)
+{
+       yaffs_ChunkCache *cache;
+       yaffs_Object *theObj;
+       int usage;
+       int i;
+       
+       // Try find a non-dirty one...
+       
+       cache = yaffs_GrabChunkCacheWorker(dev);
+       
+       if(!cache)
+       {
+               // They were all dirty, find the last recently used object and flush
+               // its cache, then  find again.
+               // NB what's here is not very accurate, we actually flush the object
+               // the last recently used page.
+               
+               theObj = dev->srCache[0].object;
+               usage = dev->srCache[0].lastUse;
+       
+               for(i = 1; i < YAFFS_N_CACHE_CHUNKS; i++)
+               {
+                       if( dev->srCache[i].object && 
+                           dev->srCache[i].lastUse < usage)
+                       {
+                               usage  = dev->srCache[i].lastUse;
+                               theObj = dev->srCache[i].object;
+                       }
+               }
+               
+               yaffs_FlushFilesChunkCache(theObj);
+               
+               // Try again
+               cache = yaffs_GrabChunkCacheWorker(dev);
+       }
+       
+       return cache;
+
+}
+
+
+// Find a cached chunk
+static yaffs_ChunkCache *yaffs_FindChunkCache(const yaffs_Object *obj, int chunkId)
+{
+       yaffs_Device *dev = obj->myDev;
+       int i;
+       
+       for(i = 0; i < YAFFS_N_CACHE_CHUNKS; i++)
+       {
+               if(dev->srCache[i].object == obj && 
+                  dev->srCache[i].chunkId == chunkId)
+               {
+                       dev->cacheHits++;
+                       
+                       return &dev->srCache[i];
+               }
+       }
+       
+       return NULL;
+}
+
+// Mark the chunk for the least recently used algorithym
+static void yaffs_UseChunkCache(yaffs_Device *dev, yaffs_ChunkCache *cache, int isAWrite)
+{
+       if( dev->srLastUse < 0 || 
+               dev->srLastUse > 100000000)
+       {
+               // Reset the cache usages
+               int i;
+               for(i = 1; i < YAFFS_N_CACHE_CHUNKS; i++)
+               {
+                       dev->srCache[i].lastUse = 0;
+               }
+               dev->srLastUse = 0;
+       }
+
+       dev->srLastUse++;
+       
+       cache->lastUse = dev->srLastUse;
+
+       if(isAWrite)
+       {
+               cache->dirty = 1;
+       }
+}
+
+// Invalidate a single cache page.
+// Do this when a whole page gets written,
+// ie the short cache for this page is no longer valid.
+static void yaffs_InvalidateChunkCache(yaffs_Object *object, int chunkId)
+{
+       yaffs_ChunkCache *cache = yaffs_FindChunkCache(object,chunkId);
+
+       if(cache)
+       {
+               cache->object = NULL;
+       }
+}
+
+
+// Invalidate all the cache pages associated with this object
+// Do this whenever ther file is deleted or resized.
+static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in)
+{
+       int i;
+       yaffs_Device *dev = in->myDev;
+       
+       // Now invalidate it.
+       for(i = 0; i < YAFFS_N_CACHE_CHUNKS; i++)
+       {
+               if(dev->srCache[i].object == in)
+               {
+                       dev->srCache[i].object = NULL;
+               }
+       }
+}
+
+
+#else
+// Stubs for disabling short op caching
+
+static void yaffs_FlushFilesChunkCache(yaffs_Object *obj)
+{}
+
+static yaffs_ChunkCache *yaffs_GrabChunkCache(yaffs_Device *dev)
+{
+       return NULL;    
+}
+
+
+static yaffs_ChunkCache *yaffs_FindChunkCache(yaffs_Device *dev, int objectId, int chunkId)
+{
+       return NULL;
+}
+
+static void yaffs_UseChunkCache(yaffs_Device *dev, yaffs_ChunkCache *cache)
+{
+}
+
+static void yaffs_InvalidateChunkCache(yaffs_Object *obj, int chunkId)
+{
+}
+
+static void yaffs_InvalidateWholeChunkCache(yaffs_Object *in)
+{
+}
+
+
+
+#endif
+
+
+
+///////////////////////// File read/write ///////////////////////////////
+// Read and write have very similar structures.
+// In general the read/write has three parts to it
+// * An incomplete chunk to start with (if the read/write is not chunk-aligned)
+// * Some complete chunks
+// * An incomplete chunk to end off with
+//
+// Curve-balls: the first chunk might also be the last chunk.
+
+int yaffs_ReadDataFromFile(yaffs_Object *in, __u8 * buffer, __u32 offset, int nBytes)
+{
+       
+       
+       int chunk;
+       int start;
+       int nToCopy;
+       int n = nBytes;
+       int nDone = 0;
+       
+       yaffs_Device *dev;
+       
+       dev = in->myDev;
+       
+       while(n > 0)
+       {
+               chunk = offset / YAFFS_BYTES_PER_CHUNK + 1; // The first chunk is 1
+               start = offset % YAFFS_BYTES_PER_CHUNK;
+
+               // OK now check for the curveball where the start and end are in
+               // the same chunk.      
+               if(     (start + n) < YAFFS_BYTES_PER_CHUNK)
+               {
+                       nToCopy = n;
+               }
+               else
+               {
+                       nToCopy = YAFFS_BYTES_PER_CHUNK - start;
+               }
+       
+               if(nToCopy != YAFFS_BYTES_PER_CHUNK)
+               {
+                       // An incomplete start or end chunk (or maybe both start and end chunk)
+#ifdef CONFIG_YAFFS_SHORT_OP_CACHE
+                       yaffs_ChunkCache *cache;
+                       // If we can't find the data in the cache, then load it up.
+                       cache = yaffs_FindChunkCache(in,chunk);
+                       if(!cache)
+                       {
+                               cache = yaffs_GrabChunkCache(in->myDev);
+                               cache->object = in;
+                               cache->chunkId = chunk;
+                               cache->dirty = 0;
+                               yaffs_ReadChunkDataFromObject(in,chunk,cache->data);            
+                       }
+                       
+                       yaffs_UseChunkCache(dev,cache,0);
+
+                       memcpy(buffer,&cache->data[start],nToCopy);
+#else
+                       // Read into the local buffer then copy...
+                       yaffs_ReadChunkDataFromObject(in,chunk,dev->localBuffer);               
+                       memcpy(buffer,&dev->localBuffer[start],nToCopy);
+#endif
+               }
+               else
+               {
+#ifdef CONFIG_YAFFS_WINCE
+                       
+                       // Under WinCE can't do direct transfer. Need to use a local buffer.
+                       // This is because we otherwise screw up WinCE's memory mapper
+                       yaffs_ReadChunkDataFromObject(in,chunk,dev->localBuffer);
+                       memcpy(buffer,dev->localBuffer,YAFFS_BYTES_PER_CHUNK);
+#else
+                       // A full chunk. Read directly into the supplied buffer.
+                       yaffs_ReadChunkDataFromObject(in,chunk,buffer);
+#endif
+               }
+               
+               n -= nToCopy;
+               offset += nToCopy;
+               buffer += nToCopy;
+               nDone += nToCopy;
+               
+       }
+       
+       return nDone;
+}
+
+
+
+int yaffs_WriteDataToFile(yaffs_Object *in,const __u8 * buffer, __u32 offset, int nBytes)
+{      
+       
+       int chunk;
+       int start;
+       int nToCopy;
+       int n = nBytes;
+       int nDone = 0;
+       int nToWriteBack;
+       int startOfWrite = offset;
+       int chunkWritten = 0;
+       int nBytesRead;
+       
+       yaffs_Device *dev;
+       
+       dev = in->myDev;
+       
+       
+       while(n > 0 && chunkWritten >= 0)
+       {
+               chunk = offset / YAFFS_BYTES_PER_CHUNK + 1;
+               start = offset % YAFFS_BYTES_PER_CHUNK;
+               
+
+               // OK now check for the curveball where the start and end are in
+               // the same chunk.
+               
+               if(     (start + n) < YAFFS_BYTES_PER_CHUNK)
+               {
+                       nToCopy = n;
+                       
+                       // Now folks, to calculate how many bytes to write back....
+                       // If we're overwriting and not writing to then end of file then
+                       // we need to write back as much as was there before.
+                       
+                       nBytesRead = in->variant.fileVariant.fileSize - ((chunk -1) * YAFFS_BYTES_PER_CHUNK);
+                       
+                       if(nBytesRead > YAFFS_BYTES_PER_CHUNK)
+                       {
+                               nBytesRead = YAFFS_BYTES_PER_CHUNK;
+                       }
+                       
+                       nToWriteBack = (nBytesRead > (start + n)) ? nBytesRead : (start +n);
+                       
+               }
+               else
+               {
+                       nToCopy = YAFFS_BYTES_PER_CHUNK - start;
+                       nToWriteBack = YAFFS_BYTES_PER_CHUNK;
+               }
+       
+               if(nToCopy != YAFFS_BYTES_PER_CHUNK)
+               {
+                       // An incomplete start or end chunk (or maybe both start and end chunk)
+#ifdef CONFIG_YAFFS_SHORT_OP_CACHE
+                       yaffs_ChunkCache *cache;
+                       // If we can't find the data in the cache, then load it up.
+                       cache = yaffs_FindChunkCache(in,chunk);
+                       if(!cache && yaffs_CheckSpaceForChunkCache(in->myDev))
+                       {
+                               cache = yaffs_GrabChunkCache(in->myDev);
+                               cache->object = in;
+                               cache->chunkId = chunk;
+                               cache->dirty = 0;
+                               yaffs_ReadChunkDataFromObject(in,chunk,cache->data);            
+                       }
+                       
+                       if(cache)
+                       {       
+                               yaffs_UseChunkCache(dev,cache,1);
+                               memcpy(&cache->data[start],buffer,nToCopy);
+                       }
+                       else
+                       {
+                               chunkWritten = -1; // fail the write
+                       }
+#else
+               
+
+                       // An incomplete start or end chunk (or maybe both start and end chunk)
+                       // Read into the local buffer then copy, then copy over and write back.
+               
+                       yaffs_ReadChunkDataFromObject(in,chunk,dev->localBuffer);
+                               
+                       memcpy(&dev->localBuffer[start],buffer,nToCopy);
+                       
+                       chunkWritten = yaffs_WriteChunkDataToObject(in,chunk,dev->localBuffer,nToWriteBack,0);
+                       
+                       //T(("Write with readback to chunk %d %d  start %d  copied %d wrote back %d\n",chunk,chunkWritten,start, nToCopy, nToWriteBack));
+#endif
+                       
+               }
+               else
+               {
+                       
+#ifdef CONFIG_YAFFS_WINCE
+                       // Under WinCE can't do direct transfer. Need to use a local buffer.
+                       // This is because we otherwise screw up WinCE's memory mapper
+                       memcpy(dev->localBuffer,buffer,YAFFS_BYTES_PER_CHUNK);
+                       chunkWritten = yaffs_WriteChunkDataToObject(in,chunk,dev->localBuffer,YAFFS_BYTES_PER_CHUNK,0);
+#else
+                       // A full chunk. Write directly from the supplied buffer.
+                       chunkWritten = yaffs_WriteChunkDataToObject(in,chunk,buffer,YAFFS_BYTES_PER_CHUNK,0);
+#endif
+                       // Since we've overwritten the cached data, we better invalidate it.
+                       yaffs_InvalidateChunkCache(in,chunk);
+                       //T(("Write to chunk %d %d\n",chunk,chunkWritten));
+               }
+               
+               if(chunkWritten >= 0)
+               {
+                       n -= nToCopy;
+                       offset += nToCopy;
+                       buffer += nToCopy;
+                       nDone += nToCopy;
+               }
+               
+       }
+       
+       // Update file object
+       
+       if((startOfWrite + nDone) > in->variant.fileVariant.fileSize)
+       {
+               in->variant.fileVariant.fileSize = (startOfWrite + nDone);
+       }
+       
+       in->dirty = 1;
+       
+       return nDone;
+}
+
+
+int yaffs_ResizeFile(yaffs_Object *in, int newSize)
+{
+       int i;
+       int chunkId;
+       int oldFileSize = in->variant.fileVariant.fileSize;
+       int sizeOfPartialChunk = newSize % YAFFS_BYTES_PER_CHUNK;
+       
+       yaffs_Device *dev = in->myDev;
+       
+
+       yaffs_FlushFilesChunkCache(in); 
+       yaffs_InvalidateWholeChunkCache(in);
+       
+       if(in->variantType != YAFFS_OBJECT_TYPE_FILE)
+       {
+               return yaffs_GetFileSize(in);
+       }
+       
+       if(newSize < oldFileSize)
+       {
+               
+               int lastDel = 1 + (oldFileSize-1)/YAFFS_BYTES_PER_CHUNK;
+               
+               int startDel = 1 + (newSize + YAFFS_BYTES_PER_CHUNK - 1)/
+                                                       YAFFS_BYTES_PER_CHUNK;
+
+               // Delete backwards so that we don't end up with holes if
+               // power is lost part-way through the operation.
+               for(i = lastDel; i >= startDel; i--)
+               {
+                       // NB this could be optimised somewhat,
+                       // eg. could retrieve the tags and write them without
+                       // using yaffs_DeleteChunk
+
+                       chunkId = yaffs_FindAndDeleteChunkInFile(in,i,NULL);
+                       if(chunkId <= 0 || chunkId >= (dev->endBlock * 32))
+                       {
+                               //T(("Found daft chunkId %d for %d\n",chunkId,i));
+                       }
+                       else
+                       {
+                               in->nDataChunks--;
+                               yaffs_DeleteChunk(dev,chunkId);
+                       }
+               }
+               
+               
+               if(sizeOfPartialChunk != 0)
+               {
+                       int lastChunk = 1+ newSize/YAFFS_BYTES_PER_CHUNK;
+                       
+                       // Got to read and rewrite the last chunk with its new size.
+                       yaffs_ReadChunkDataFromObject(in,lastChunk,dev->localBuffer);
+                       
+                       yaffs_WriteChunkDataToObject(in,lastChunk,dev->localBuffer,sizeOfPartialChunk,1);
+                               
+               }
+               
+               in->variant.fileVariant.fileSize = newSize;
+               
+               yaffs_PruneFileStructure(dev,&in->variant.fileVariant);
+               
+               return newSize;
+               
+       }
+       else
+       {
+               return oldFileSize;
+       }
+}
+
+
+loff_t yaffs_GetFileSize(yaffs_Object *obj)
+{
+       obj = yaffs_GetEquivalentObject(obj);
+       
+       switch(obj->variantType)
+       {
+               case YAFFS_OBJECT_TYPE_FILE: 
+                       return obj->variant.fileVariant.fileSize;
+               case YAFFS_OBJECT_TYPE_SYMLINK:
+                       return strlen(obj->variant.symLinkVariant.alias);
+               default:
+                       return 0;
+       }
+}
+
+
+
+// yaffs_FlushFile() updates the file's
+// objectId in NAND
+
+int yaffs_FlushFile(yaffs_Object *in)
+{
+       int retVal;
+       if(in->dirty)
+       {
+               //T(("flushing object header\n"));
+               
+               yaffs_FlushFilesChunkCache(in);
+       
+#ifdef CONFIG_YAFFS_WINCE
+               yfsd_WinFileTimeNow(in->win_mtime);
+#else
+               in->st_mtime = CURRENT_TIME;
+#endif
+
+               retVal = yaffs_UpdateObjectHeader(in,NULL,0);
+       }
+       else
+       {
+               retVal = YAFFS_OK;
+       }
+       
+       return retVal;
+       
+}
+
+
+static int yaffs_DoGenericObjectDeletion(yaffs_Object *in)
+{
+
+       // First off, invalidate the file's data in the cache, without flushing.
+       yaffs_InvalidateWholeChunkCache(in);
+       
+       yaffs_RemoveObjectFromDirectory(in);
+       yaffs_DeleteChunk(in->myDev,in->chunkId);
+#ifdef __KERNEL__
+       if(in->myInode)
+       {
+               in->myInode->u.generic_ip = NULL;
+               in->myInode = 0;
+       }
+#endif
+       yaffs_FreeObject(in);
+       return YAFFS_OK;
+
+}
+
+// yaffs_DeleteFile deletes the whole file data
+// and the inode associated with the file.
+// It does not delete the links associated with the file.
+static int yaffs_UnlinkFile(yaffs_Object *in)
+{
+
+#ifdef CONFIG_YAFFS_DISABLE_BACKGROUND_DELETION
+       // Delete the file data & tnodes
+
+        yaffs_DeleteWorker(in, in->variant.fileVariant.top, in->variant.fileVariant.topLevel, 0,NULL);
+        
+
+       yaffs_FreeTnode(in->myDev,in->variant.fileVariant.top);
+       
+       return  yaffs_DoGenericObjectDeletion(in);
+#else
+       int retVal;
+       int immediateDeletion=0;
+       retVal = yaffs_ChangeObjectName(in, in->myDev->unlinkedDir,NULL,0);
+       if(retVal == YAFFS_OK)
+       {
+               //in->unlinked = 1;
+               //in->myDev->nUnlinkedFiles++;
+               //in->renameAllowed = 0;
+#ifdef __KERNEL__
+               if(in->myInode)
+               {
+                       immediateDeletion = 1;
+
+               }
+#endif
+#ifdef CONFIG_YAFFS_WINCE
+               if(in->inUse <= 0)
+               {
+                       immediateDeletion = 1;
+
+               }
+#endif
+               
+               if(immediateDeletion)
+               {
+                       T(YAFFS_TRACE_TRACING,(TSTR("yaffs: immediate deletion of file %d" TENDSTR),in->objectId));
+                       in->deleted=1;
+                       in->myDev->nDeletedFiles++;
+               }
+       
+       }
+       return retVal;
+
+       
+#endif
+}
+
+int yaffs_DeleteFile(yaffs_Object *in)
+{
+       int retVal = YAFFS_OK;
+       if(!in->unlinked)
+       {
+               retVal = yaffs_UnlinkFile(in);
+       }
+       if(retVal == YAFFS_OK && 
+          in->unlinked &&
+          !in->deleted)
+       {
+               in->deleted = 1;
+               in->myDev->nDeletedFiles++;
+       }
+       return in->deleted ? YAFFS_OK : YAFFS_FAIL;     
+}
+
+static int yaffs_DeleteDirectory(yaffs_Object *in)
+{
+       //First check that the directory is empty.
+       if(list_empty(&in->variant.directoryVariant.children))
+       {
+               return  yaffs_DoGenericObjectDeletion(in);
+       }
+       
+       return YAFFS_FAIL;
+       
+}
+
+static int yaffs_DeleteSymLink(yaffs_Object *in)
+{
+       YFREE(in->variant.symLinkVariant.alias);
+
+       return  yaffs_DoGenericObjectDeletion(in);
+}
+
+static int yaffs_DeleteHardLink(yaffs_Object *in)
+{
+       // remove this hardlink from the list assocaited with the equivalent
+       // object
+       list_del(&in->hardLinks);
+       return  yaffs_DoGenericObjectDeletion(in);      
+}
+
+
+static int yaffs_UnlinkWorker(yaffs_Object *obj)
+{
+
+       
+       if(obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
+       {
+               return  yaffs_DeleteHardLink(obj);
+       }
+       else if(!list_empty(&obj->hardLinks))
+       {       
+               // Curve ball: We're unlinking an object that has a hardlink.
+               //
+               //      This problem arises because we are not strictly following
+               //  The Linux link/inode model.
+               //
+               // We can't really delete the object.
+               // Instead, we do the following:
+               // - Select a hardlink.
+               // - Unhook it from the hard links
+               // - Unhook it from its parent directory (so that the rename can work)
+               // - Rename the object to the hardlink's name.
+               // - Delete the hardlink
+               
+               
+               yaffs_Object *hl;
+               int retVal;
+               char name[YAFFS_MAX_NAME_LENGTH+1];
+               
+               hl = list_entry(obj->hardLinks.next,yaffs_Object,hardLinks);
+               
+               list_del_init(&hl->hardLinks);
+               list_del_init(&hl->siblings);
+               
+               yaffs_GetObjectName(hl,name,YAFFS_MAX_NAME_LENGTH+1);
+               
+               retVal = yaffs_ChangeObjectName(obj, hl->parent, name,0);
+               
+               if(retVal == YAFFS_OK)
+               {
+                       retVal = yaffs_DoGenericObjectDeletion(hl);
+               }
+               return retVal;
+                               
+       }
+       else
+       {
+               switch(obj->variantType)
+               {
+                       case YAFFS_OBJECT_TYPE_FILE:
+                               return yaffs_UnlinkFile(obj);
+                               break;
+                       case YAFFS_OBJECT_TYPE_DIRECTORY:
+                               return yaffs_DeleteDirectory(obj);
+                               break;
+                       case YAFFS_OBJECT_TYPE_SYMLINK:
+                               return yaffs_DeleteSymLink(obj);
+                               break;
+                       case YAFFS_OBJECT_TYPE_HARDLINK:
+                       case YAFFS_OBJECT_TYPE_UNKNOWN:
+                       default:
+                               return YAFFS_FAIL;
+               }
+       }
+}
+
+int yaffs_Unlink(yaffs_Object *dir, const char *name)
+{
+       yaffs_Object *obj;
+       
+        obj = yaffs_FindObjectByName(dir,name);
+        
+        if(obj && obj->unlinkAllowed)
+        {
+               return yaffs_UnlinkWorker(obj);
+        }
+        
+        return YAFFS_FAIL;
+       
+}
+
+//////////////// Initialisation Scanning /////////////////
+
+
+
+// For now we use the SmartMedia check.
+// We look at the blockStatus byte in the first two chunks
+// These must be 0xFF to pass as OK.
+// todo: this function needs to be modifyable foir different NAND types
+// and different chunk sizes.  Suggest make this into a per-device configurable
+// function.
+static int yaffs_IsBlockBad(yaffs_Device *dev, int blk)
+{
+       yaffs_Spare spare;
+       
+       yaffs_ReadChunkFromNAND(dev,blk * YAFFS_CHUNKS_PER_BLOCK,NULL,&spare,1);
+#if 1
+       if(yaffs_CountBits(spare.blockStatus) < 7)
+       {
+               return 1;
+       }
+#else
+       if(spare.blockStatus != 0xFF)
+       {
+               return 1;
+       }
+#endif
+       yaffs_ReadChunkFromNAND(dev,blk * YAFFS_CHUNKS_PER_BLOCK + 1,NULL,&spare,1);
+
+#if 1
+       if(yaffs_CountBits(spare.blockStatus) < 7)
+       {
+               return 1;
+       }
+#else
+       if(spare.blockStatus != 0xFF)
+       {
+               return 1;
+       }
+#endif
+       
+       return 0;
+       
+}
+
+static int yaffs_Scan(yaffs_Device *dev)
+{
+       yaffs_Spare spare;
+       yaffs_Tags tags;
+       int blk;
+       int chunk;
+       int c;
+       int deleted;
+       yaffs_BlockState state;
+       yaffs_Object *hardList = NULL;
+       yaffs_Object *hl;
+       yaffs_BlockInfo *bi;
+
+       
+       yaffs_ObjectHeader *oh;
+       yaffs_Object *in;
+       yaffs_Object *parent;
+       
+       __u8 chunkData[YAFFS_BYTES_PER_CHUNK];
+       
+       
+       // Scan all the blocks...
+       
+       for(blk = dev->startBlock; blk <= dev->endBlock; blk++)
+       {
+               deleted = 0;
+               bi = yaffs_GetBlockInfo(dev,blk);
+               bi->pageBits = 0;
+               bi->pagesInUse = 0;
+               state = YAFFS_BLOCK_STATE_SCANNING;
+               
+               
+               if(yaffs_IsBlockBad(dev,blk))
+               {
+                       state = YAFFS_BLOCK_STATE_DEAD;
+                       T(YAFFS_TRACE_BAD_BLOCKS,(TSTR("block %d is bad" TENDSTR),blk));
+               }
+               
+               // Read each chunk in the block.
+               
+               for(c = 0; c < YAFFS_CHUNKS_PER_BLOCK && 
+                                  state == YAFFS_BLOCK_STATE_SCANNING; c++)
+               {
+                       // Read the spare area and decide what to do
+                       chunk = blk * YAFFS_CHUNKS_PER_BLOCK + c;
+                       
+                       yaffs_ReadChunkFromNAND(dev,chunk,NULL,&spare,1);
+
+                       
+                       // This block looks ok, now what's in this chunk?
+                       yaffs_GetTagsFromSpare(dev,&spare,&tags);
+                       
+                       if(yaffs_CountBits(spare.pageStatus) < 6)
+                       {
+                               // A deleted chunk
+                               deleted++;
+                               dev->nFreeChunks ++;
+                               //T((" %d %d deleted\n",blk,c));
+                       }
+                       else if(tags.objectId == YAFFS_UNUSED_OBJECT_ID)
+                       {
+                               // An unassigned chunk in the block
+                               // This means that either the block is empty or 
+                               // this is the one being allocated from
+                               
+                               if(c == 0)
+                               {
+                                       // the block is unused
+                                       state = YAFFS_BLOCK_STATE_EMPTY;
+                                       dev->nErasedBlocks++;
+                               }
+                               else
+                               {
+                                       // this is the block being allocated from
+                                       T(YAFFS_TRACE_SCAN,(TSTR(" Allocating from %d %d" TENDSTR),blk,c));
+                                       state = YAFFS_BLOCK_STATE_ALLOCATING;
+                                       dev->allocationBlock = blk;
+                                       dev->allocationPage = c;
+                               }
+
+                               dev->nFreeChunks += (YAFFS_CHUNKS_PER_BLOCK - c);
+                       }
+                       else if(tags.chunkId > 0)
+                       {
+                               int endpos;
+                               // A data chunk.
+                               bi->pageBits |= (1 << c);
+                               bi->pagesInUse++;
+                                                               
+                               in = yaffs_FindOrCreateObjectByNumber(dev,tags.objectId,YAFFS_OBJECT_TYPE_FILE);
+                               // PutChunkIntoFIle checks for a clash (two data chunks with
+                               // the same chunkId).
+                               yaffs_PutChunkIntoFile(in,tags.chunkId,chunk,1);
+                               endpos = (tags.chunkId - 1)* YAFFS_BYTES_PER_CHUNK + tags.byteCount;
+                               if(in->variant.fileVariant.scannedFileSize <endpos)
+                               {
+                                       in->variant.fileVariant.scannedFileSize = endpos;
+#ifndef CONFIG_YAFFS_USE_HEADER_FILE_SIZE
+                                               in->variant.fileVariant.fileSize =      
+                                                       in->variant.fileVariant.scannedFileSize;
+#endif
+
+                               }
+                               //T((" %d %d data %d %d\n",blk,c,tags.objectId,tags.chunkId));  
+                       }
+                       else
+                       {
+                               // chunkId == 0, so it is an ObjectHeader.
+                               // Thus, we read in the object header and make the object
+                               bi->pageBits |= (1 << c);
+                               bi->pagesInUse++;
+                                                       
+                               yaffs_ReadChunkFromNAND(dev,chunk,chunkData,NULL,1);
+                               
+                               oh = (yaffs_ObjectHeader *)chunkData;
+                               
+                               in = yaffs_FindOrCreateObjectByNumber(dev,tags.objectId,oh->type);
+                               
+                               if(in->valid)
+                               {
+                                       // We have already filled this one. We have a duplicate and need to resolve it.
+                                       
+                                       unsigned existingSerial = in->serial;
+                                       unsigned newSerial = tags.serialNumber;
+                                       
+                                       if(((existingSerial+1) & 3) == newSerial)
+                                       {
+                                               // Use new one - destroy the exisiting one
+                                               yaffs_DeleteChunk(dev,in->chunkId);
+                                               in->valid = 0;
+                                       }
+                                       else
+                                       {
+                                               // Use existing - destroy this one.
+                                               yaffs_DeleteChunk(dev,chunk);
+                                       }
+                               }
+                               
+                               if(!in->valid &&
+                                  (tags.objectId == YAFFS_OBJECTID_ROOT ||
+                                   tags.objectId == YAFFS_OBJECTID_LOSTNFOUND))
+                               {
+                                       // We only load some info, don't fiddle with directory structure
+                                       in->valid = 1;
+                                       in->variantType = oh->type;
+       
+                                       in->st_mode  = oh->st_mode;
+#ifdef CONFIG_YAFFS_WINCE
+                                       in->win_atime[0] = oh->win_atime[0];
+                                       in->win_ctime[0] = oh->win_ctime[0];
+                                       in->win_mtime[0] = oh->win_mtime[0];
+                                       in->win_atime[1] = oh->win_atime[1];
+                                       in->win_ctime[1] = oh->win_ctime[1];
+                                       in->win_mtime[1] = oh->win_mtime[1];
+#else
+                                       in->st_uid   = oh->st_uid;
+                                       in->st_gid   = oh->st_gid;
+                                       in->st_atime = oh->st_atime;
+                                       in->st_mtime = oh->st_mtime;
+                                       in->st_ctime = oh->st_ctime;
+                                       in->st_rdev = oh->st_rdev;
+#endif
+                                       in->chunkId  = chunk;
+
+                               }
+                               else if(!in->valid)
+                               {
+                                       // we need to load this info
+                               
+                                       in->valid = 1;
+                                       in->variantType = oh->type;
+       
+                                       in->st_mode  = oh->st_mode;
+#ifdef CONFIG_YAFFS_WINCE
+                                       in->win_atime[0] = oh->win_atime[0];
+                                       in->win_ctime[0] = oh->win_ctime[0];
+                                       in->win_mtime[0] = oh->win_mtime[0];
+                                       in->win_atime[1] = oh->win_atime[1];
+                                       in->win_ctime[1] = oh->win_ctime[1];
+                                       in->win_mtime[1] = oh->win_mtime[1];
+#else
+                                       in->st_uid   = oh->st_uid;
+                                       in->st_gid   = oh->st_gid;
+                                       in->st_atime = oh->st_atime;
+                                       in->st_mtime = oh->st_mtime;
+                                       in->st_ctime = oh->st_ctime;
+                                       in->st_rdev = oh->st_rdev;
+#endif
+                                       in->chunkId  = chunk;
+
+                                       yaffs_SetObjectName(in,oh->name);
+                                       in->dirty = 0;
+                                                       
+                                       // directory stuff...
+                                       // hook up to parent
+       
+                                       parent = yaffs_FindOrCreateObjectByNumber(dev,oh->parentObjectId,YAFFS_OBJECT_TYPE_DIRECTORY);
+                                       if(parent->variantType == YAFFS_OBJECT_TYPE_UNKNOWN)
+                                       {
+                                               // Set up as a directory
+                                               parent->variantType = YAFFS_OBJECT_TYPE_DIRECTORY;
+                                               INIT_LIST_HEAD(&parent->variant.directoryVariant.children);
+                                       }
+                                       else if(parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
+                                       {
+                                               // Hoosterman, another problem....
+                                               // We're trying to use a non-directory as a directory
+                                               // Todo ... handle
+                                               T(YAFFS_TRACE_ERROR, (TSTR("yaffs tradgedy: attempting to use non-directory as a directory in scan" TENDSTR)));
+
+                                       }
+                               
+                                       yaffs_AddObjectToDirectory(parent,in);
+                                       if(parent == dev->unlinkedDir)
+                                       {
+                                               in->deleted = 1; // If it is unlinked at start up then it wants deleting
+                                               dev->nDeletedFiles++;
+                                       }
+                               
+                                       // Note re hardlinks.
+                                       // Since we might scan a hardlink before its equivalent object is scanned
+                                       // we put them all in a list.
+                                       // After scanning is complete, we should have all the objects, so we run through this
+                                       // list and fix up all the chains.              
+       
+                                       switch(in->variantType)
+                                       {
+                                               case YAFFS_OBJECT_TYPE_UNKNOWN:         // Todo got a problem
+                                                       break;
+                                               case YAFFS_OBJECT_TYPE_FILE:
+#ifdef CONFIG_YAFFS_USE_HEADER_FILE_SIZE
+                                                       in->variant.fileVariant.fileSize = oh->fileSize;
+#endif
+                                                       break;
+                                               case YAFFS_OBJECT_TYPE_HARDLINK:
+                                                       in->variant.hardLinkVariant.equivalentObjectId = oh->equivalentObjectId;
+                                                       (yaffs_Object *)(in->hardLinks.next) = 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:         // Do nothing
+                                                       in->variant.symLinkVariant.alias = yaffs_CloneString(oh->alias);
+                                                       break;
+                                       }
+                                       //T((" %d %d header %d \"%s\" type %d\n",blk,c,tags.objectId,oh->name,in->variantType));        
+                               }
+                       }
+               }
+               
+               if(state == YAFFS_BLOCK_STATE_SCANNING)
+               {
+                       // If we got this far while scanning, then the block is fully allocated.
+                       state = YAFFS_BLOCK_STATE_FULL; 
+               }
+               
+               bi->blockState = state;
+               
+               // Now let's see if it was dirty
+               if(     bi->pagesInUse == 0 &&
+               bi->blockState == YAFFS_BLOCK_STATE_FULL)
+           {
+               yaffs_BlockBecameDirty(dev,blk);
+           }
+
+       }
+       
+       // Fix up the hard link chains.
+       // We should now have scanned all the objects, now it's time to add these 
+       // hardlinks.
+       while(hardList)
+       {
+               hl = hardList;
+               hardList = (yaffs_Object *)(hardList->hardLinks.next);
+               
+               in = yaffs_FindObjectByNumber(dev,hl->variant.hardLinkVariant.equivalentObjectId);
+               
+               if(in)
+               {
+                       // Add the hardlink pointers
+                       hl->variant.hardLinkVariant.equivalentObject=in;
+                       list_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;
+                       INIT_LIST_HEAD(&hl->hardLinks);
+                       
+               }
+               
+       }
+       
+       
+       
+       return YAFFS_OK;
+}
+
+
+////////////////////////// Directory Functions /////////////////////////
+
+
+static void yaffs_AddObjectToDirectory(yaffs_Object *directory, yaffs_Object *obj)
+{
+
+       if(obj->siblings.prev == NULL)
+       {
+               // Not initialised
+               INIT_LIST_HEAD(&obj->siblings);
+               
+       }
+       else if(!list_empty(&obj->siblings))
+       {
+               // If it is holed up somewhere else, un hook it
+               list_del_init(&obj->siblings);
+       }
+       // Now add it
+       list_add(&obj->siblings,&directory->variant.directoryVariant.children);
+       obj->parent = directory;
+       
+       if(directory == obj->myDev->unlinkedDir)
+       {
+               obj->unlinked = 1;
+               obj->myDev->nUnlinkedFiles++;
+               obj->renameAllowed = 0;
+       }
+}
+
+static void yaffs_RemoveObjectFromDirectory(yaffs_Object *obj)
+{
+       list_del_init(&obj->siblings);
+       obj->parent = NULL;
+}
+
+yaffs_Object *yaffs_FindObjectByName(yaffs_Object *directory,const char *name)
+{
+       int sum;
+       
+       struct list_head *i;
+       char buffer[YAFFS_MAX_NAME_LENGTH+1];
+       
+       yaffs_Object *l;
+       
+       sum = yaffs_CalcNameSum(name);
+       
+       list_for_each(i,&directory->variant.directoryVariant.children)
+       {
+               l = list_entry(i, yaffs_Object,siblings);
+               
+               // 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))
+               {
+                       // Do a real check
+                       yaffs_GetObjectName(l,buffer,YAFFS_MAX_NAME_LENGTH);
+                       if(yaffs_strcmp(name,buffer) == 0)
+                       {
+                               return l;
+                       }
+                       
+                       
+               }
+       }
+       
+       return NULL;
+}
+
+
+int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir,int (*fn)(yaffs_Object *))
+{
+       struct list_head *i;    
+       yaffs_Object *l;
+       
+       
+       list_for_each(i,&theDir->variant.directoryVariant.children)
+       {
+               l = list_entry(i, yaffs_Object,siblings);
+               if(!fn(l))
+               {
+                       return YAFFS_FAIL;
+               }
+       }
+       
+       return YAFFS_OK;
+
+}
+
+
+// GetEquivalentObject dereferences any hard links to get to the
+// actual object.
+
+yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object *obj)
+{
+       if(obj && obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK)
+       {
+               // We want the object id of the equivalent object, not this one
+               obj = obj->variant.hardLinkVariant.equivalentObject;
+       }
+       return obj;
+
+}
+
+int yaffs_GetObjectName(yaffs_Object *obj,char *name,int buffSize)
+{
+       memset(name,0,buffSize);
+       
+       if(obj->objectId == YAFFS_OBJECTID_LOSTNFOUND)
+       {
+               strncpy(name,YAFFS_LOSTNFOUND_NAME,buffSize - 1);
+       }
+       else if(obj->chunkId <= 0)
+       {
+               char locName[20];
+               // make up a name
+               sprintf(locName,"%s%d",YAFFS_LOSTNFOUND_PREFIX,obj->objectId);
+               strncpy(name,locName,buffSize - 1);
+
+       }
+#ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM
+       else if(obj->shortName[0])
+       {
+               strcpy(name,obj->shortName);
+       }
+#endif
+       else
+       {
+               __u8 buffer[YAFFS_BYTES_PER_CHUNK];
+               yaffs_ObjectHeader *oh = (yaffs_ObjectHeader *)buffer;
+
+               memset(buffer,0,YAFFS_BYTES_PER_CHUNK);
+       
+               if(obj->chunkId >= 0)
+               {
+                       yaffs_ReadChunkFromNAND(obj->myDev,obj->chunkId,buffer,NULL,1);
+               }
+               strncpy(name,oh->name,buffSize - 1);
+       }
+       
+       return strlen(name);
+}
+
+int yaffs_GetObjectFileLength(yaffs_Object *obj)
+{
+       
+       // Dereference any hard linking
+       obj = yaffs_GetEquivalentObject(obj);
+       
+       if(obj->variantType == YAFFS_OBJECT_TYPE_FILE)
+       {
+               return obj->variant.fileVariant.fileSize;
+       }
+       if(obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
+       {
+               return strlen(obj->variant.symLinkVariant.alias);
+       }
+       else
+       {
+               // Only a directory should drop through to here
+               return YAFFS_BYTES_PER_CHUNK;
+       }       
+}
+
+int yaffs_GetObjectLinkCount(yaffs_Object *obj)
+{
+       int count = 0; 
+       struct list_head *i;
+       
+       if(!obj->unlinked)
+       {
+               count++;        // the object itself
+       }
+       list_for_each(i,&obj->hardLinks)
+       {
+               count++;        // add the hard links;
+       }
+       return count;
+       
+}
+
+
+int yaffs_GetObjectInode(yaffs_Object *obj)
+{
+       obj = yaffs_GetEquivalentObject(obj);
+       
+       return obj->objectId;
+}
+
+unsigned yaffs_GetObjectType(yaffs_Object *obj)
+{
+       obj = yaffs_GetEquivalentObject(obj);
+       
+       switch(obj->variantType)
+       {
+               case YAFFS_OBJECT_TYPE_FILE:            return DT_REG; break;
+               case YAFFS_OBJECT_TYPE_DIRECTORY:       return DT_DIR; break;
+               case YAFFS_OBJECT_TYPE_SYMLINK:         return DT_LNK; break;
+               case YAFFS_OBJECT_TYPE_HARDLINK:        return DT_REG; break;
+               case YAFFS_OBJECT_TYPE_SPECIAL:         
+                       if(S_ISFIFO(obj->st_mode)) return DT_FIFO;
+                       if(S_ISCHR(obj->st_mode)) return DT_CHR;
+                       if(S_ISBLK(obj->st_mode)) return DT_BLK;
+                       if(S_ISSOCK(obj->st_mode)) return DT_SOCK;
+               default: return DT_REG; break;
+       }
+}
+
+char *yaffs_GetSymlinkAlias(yaffs_Object *obj)
+{
+       obj = yaffs_GetEquivalentObject(obj);
+       if(obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
+       {
+               return yaffs_CloneString(obj->variant.symLinkVariant.alias);
+       }
+       else
+       {
+               return yaffs_CloneString("");
+       }
+}
+
+#ifndef CONFIG_YAFFS_WINCE
+
+int yaffs_SetAttributes(yaffs_Object *obj, struct iattr *attr)
+{
+       unsigned int valid = attr->ia_valid;
+       
+       if(valid & ATTR_MODE) obj->st_mode = attr->ia_mode;
+       if(valid & ATTR_UID) obj->st_uid = attr->ia_uid;
+       if(valid & ATTR_GID) obj->st_gid = attr->ia_gid;
+       
+       if(valid & ATTR_ATIME) obj->st_atime = attr->ia_atime;
+       if(valid & ATTR_CTIME) obj->st_ctime = attr->ia_ctime;
+       if(valid & ATTR_MTIME) obj->st_mtime = attr->ia_mtime;
+       
+       if(valid & ATTR_SIZE) yaffs_ResizeFile(obj,attr->ia_size);
+       
+       yaffs_UpdateObjectHeader(obj,NULL,1);
+       
+       return YAFFS_OK;
+       
+}
+int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr)
+{
+       unsigned int valid = 0;
+       
+       attr->ia_mode = obj->st_mode;   valid |= ATTR_MODE;
+       attr->ia_uid = obj->st_uid;             valid |= ATTR_UID;
+       attr->ia_gid = obj->st_gid;             valid |= ATTR_GID;
+       
+       attr->ia_atime = obj->st_atime; valid |= ATTR_ATIME;
+       attr->ia_ctime = obj->st_ctime; valid |= ATTR_CTIME;
+       attr->ia_mtime = obj->st_mtime; valid |= ATTR_MTIME;
+       
+       attr->ia_size = yaffs_GetFileSize(obj); valid |= ATTR_SIZE;
+       
+       attr->ia_valid = valid;
+       
+       return YAFFS_OK;
+       
+}
+
+#endif
+
+int yaffs_DumpObject(yaffs_Object *obj)
+{
+//     __u8 buffer[YAFFS_BYTES_PER_CHUNK];
+       char name[257];
+//     yaffs_ObjectHeader *oh = (yaffs_ObjectHeader *)buffer;
+
+//     memset(buffer,0,YAFFS_BYTES_PER_CHUNK);
+       
+//     if(obj->chunkId >= 0)
+//     {
+//             yaffs_ReadChunkFromNAND(obj->myDev,obj->chunkId,buffer,NULL);
+//     }
+       
+       yaffs_GetObjectName(obj,name,256);
+       
+       T(YAFFS_TRACE_ALWAYS,(TSTR("Object %d, inode %d \"%s\"\n dirty %d valid %d serial %d sum %d chunk %d type %d size %d\n" TENDSTR),
+                       obj->objectId,yaffs_GetObjectInode(obj), name, obj->dirty, obj->valid, obj->serial, 
+                       obj->sum, obj->chunkId, yaffs_GetObjectType(obj), yaffs_GetObjectFileLength(obj)));
+
+#if 0
+       YPRINTF(("Object %d \"%s\"\n dirty %d valid %d serial %d sum %d chunk %d\n",
+                       obj->objectId, oh->name, obj->dirty, obj->valid, obj->serial, 
+                       obj->sum, obj->chunkId));
+               switch(obj->variantType)
+       {
+               case YAFFS_OBJECT_TYPE_FILE: 
+                       YPRINTF((" FILE length %d\n",obj->variant.fileVariant.fileSize));
+                       break;
+               case YAFFS_OBJECT_TYPE_DIRECTORY:
+                       YPRINTF((" DIRECTORY\n"));
+                       break;
+               case YAFFS_OBJECT_TYPE_HARDLINK: //todo
+               case YAFFS_OBJECT_TYPE_SYMLINK:
+               case YAFFS_OBJECT_TYPE_UNKNOWN:
+               default:
+       }
+#endif
+       
+       return YAFFS_OK;
+}
+
+
+///////////////////////// Initialisation code ///////////////////////////
+
+
+
+int yaffs_GutsInitialise(yaffs_Device *dev)
+{
+       unsigned x;
+       int bits;
+       int extraBits;
+       int nBlocks;
+
+
+       
+       if(!yaffs_CheckStructures())
+       {
+               T(YAFFS_TRACE_ALWAYS,(TSTR("yaffs_CheckStructures failed\n" TENDSTR)));
+               return YAFFS_FAIL;
+       }
+       
+       if(dev->startBlock <= 0 ||
+          (dev->endBlock - dev->startBlock) < 10)
+       {
+               T(YAFFS_TRACE_ALWAYS,(TSTR("startBlock %d or endBlock %d invalid\n" TENDSTR),
+                               dev->startBlock, dev->endBlock));
+               return YAFFS_FAIL;
+       }
+       
+       nBlocks = dev->endBlock - dev->startBlock + 1;
+       
+
+               
+       // OK now calculate a few things for the device
+       // Calculate chunkGroupBits. 
+       // We need to find the next power of 2 > than endBlock
+       
+       x = YAFFS_CHUNKS_PER_BLOCK * (dev->endBlock+1);
+       
+       for(bits = extraBits = 0; x > 1; bits++)
+       {
+               if(x & 1) extraBits++;
+               x >>= 1;
+       }
+
+       if(extraBits > 0) bits++;
+       
+       
+       // Level0 Tnodes are 16 bits, 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 <= 16) 
+       {
+               dev->chunkGroupBits = 0;
+       }
+       else
+       {
+               dev->chunkGroupBits = bits - 16;
+       }
+       dev->chunkGroupSize = 1 << dev->chunkGroupBits;
+       
+       
+       // More device initialisation
+       dev->garbageCollectionRequired  = 0;
+       dev->garbageCollections = 0;
+       dev->currentDirtyChecker = 0;
+       dev->bufferedBlock = -1;
+       dev->doingBufferedBlockRewrite = 0;
+       dev->blockSelectedForGC = -1;
+       dev->nDeletedFiles = 0;
+       dev->nBackgroundDeletions=0;
+       dev->nUnlinkedFiles = 0;
+       dev->eccFixed=0;
+       dev->eccUnfixed=0;
+       dev->tagsEccFixed=0;
+       dev->tagsEccUnfixed=0;
+       
+       dev->localBuffer = YMALLOC(YAFFS_BYTES_PER_CHUNK);
+       
+       yaffs_InitialiseBlocks(dev,nBlocks);
+       
+       yaffs_InitialiseTnodes(dev);
+
+       yaffs_InitialiseObjects(dev);
+       
+#ifdef CONFIG_YAFFS_SHORT_OP_CACHE
+       { 
+               int i;
+               for(i=0; i < YAFFS_N_CACHE_CHUNKS; i++)
+               {
+                       dev->srCache[i].object = NULL;
+                       dev->srCache[i].lastUse = 0;
+                       dev->srCache[i].dirty = 0;
+               }
+               dev->srLastUse = 0;
+       }
+#endif
+
+       dev->cacheHits = 0;
+       
+       
+       // Initialise the unlinked, root and lost and found directories
+       dev->lostNFoundDir = dev->rootDir = dev->unlinkedDir = NULL;
+       
+       dev->unlinkedDir = yaffs_CreateFakeDirectory(dev,YAFFS_OBJECTID_UNLINKED, S_IFDIR);
+
+       dev->rootDir = yaffs_CreateFakeDirectory(dev,YAFFS_OBJECTID_ROOT,YAFFS_ROOT_MODE | S_IFDIR);
+       dev->lostNFoundDir = yaffs_CreateFakeDirectory(dev,YAFFS_OBJECTID_LOSTNFOUND,YAFFS_LOSTNFOUND_MODE | S_IFDIR);
+       yaffs_AddObjectToDirectory(dev->rootDir,dev->lostNFoundDir);
+       
+               
+       // Now scan the flash.  
+       yaffs_Scan(dev);
+       
+       // Zero out stats
+       dev->nPageReads = 0;
+    dev->nPageWrites =  0;
+       dev->nBlockErasures = 0;
+       dev->nGCCopies = 0;
+       dev->nRetriedWrites = 0;
+       dev->nRetiredBlocks = 0;
+
+       
+       return YAFFS_OK;
+               
+}
+
+void yaffs_Deinitialise(yaffs_Device *dev)
+{
+       yaffs_DeinitialiseBlocks(dev);
+       yaffs_DeinitialiseTnodes(dev);
+       yaffs_DeinitialiseObjects(dev);
+       
+}
+
+int  yaffs_GetNumberOfFreeChunks(yaffs_Device *dev)
+{
+       int nFree = dev->nFreeChunks - (YAFFS_CHUNKS_PER_BLOCK * YAFFS_RESERVED_BLOCKS);
+       
+       struct list_head *i;    
+       yaffs_Object *l;
+       
+       
+       // To the free chunks add the chunks that are in the deleted unlinked files.
+       list_for_each(i,&dev->unlinkedDir->variant.directoryVariant.children)
+       {
+               l = list_entry(i, yaffs_Object,siblings);
+               if(l->deleted)
+               {
+                       nFree++;
+                       nFree += l->nDataChunks;
+               }
+       }
+
+
+       return (nFree < 0) ? 0 : nFree; 
+       
+}
+
+
+/////////////////// YAFFS test code //////////////////////////////////
+
+#define yaffs_CheckStruct(structure,syze, name) \
+           if(sizeof(structure) != syze) \
+              { \
+                T(YAFFS_TRACE_ALWAYS,(TSTR("%s should be %d but is %d\n" TENDSTR),name,syze,sizeof(structure))); \
+                return YAFFS_FAIL; \
+                  }
+                
+                
+static int yaffs_CheckStructures(void)
+{
+       yaffs_CheckStruct(yaffs_Tags,8,"yaffs_Tags")
+       yaffs_CheckStruct(yaffs_TagsUnion,8,"yaffs_TagsUnion")
+       yaffs_CheckStruct(yaffs_Spare,16,"yaffs_Spare")
+       yaffs_CheckStruct(yaffs_Tnode,2* YAFFS_NTNODES_LEVEL0,"yaffs_Tnode")
+       yaffs_CheckStruct(yaffs_ObjectHeader,512,"yaffs_ObjectHeader")
+       
+       
+       return YAFFS_OK;
+}
+
+#if 0
+void yaffs_GutsTest(yaffs_Device *dev)
+{
+       
+       if(yaffs_CheckStructures() != YAFFS_OK)
+       {
+               T(YAFFS_TRACE_ALWAYS,(TSTR("One or more structures malformed-- aborting\n" TENDSTR)));
+               return;
+       }
+       
+       yaffs_TnodeTest(dev);
+       yaffs_ObjectTest(dev);  
+}
+#endif
+
+
+
index 08cc362819f4557e50313238e474e647016156c6..6130c4fd2343a343b224e022c7e83146d52c2d5f 100644 (file)
-/*
- * YAFFS: Yet another FFS. A NAND-flash specific file system. 
- * yaffs_guts.h: Configuration etc for yaffs_guts
- *
- * Copyright (C) 2002 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
- *
- * Created by Charles Manning <charles@aleph1.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1 as
- * published by the Free Software Foundation.
- *
- *
- * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
- *
- * $Id: yaffs_guts.h,v 1.11 2002-11-08 07:19:42 charles Exp $
- */
-
-#ifndef __YAFFS_GUTS_H__
-#define __YAFFS_GUTS_H__
-
-#include "devextras.h"
-
-
-#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 an S=0x53
-// And what have we got... 
-#define YAFFS_MAGIC                                    0x5941FF53
-
-#define YAFFS_NTNODES_LEVEL0           16
-#define YAFFS_TNODES_LEVEL0_BITS       4
-#define YAFFS_TNODES_LEVEL0_MASK       0xf
-
-#define YAFFS_NTNODES_INTERNAL                 (YAFFS_NTNODES_LEVEL0 / 2)
-#define YAFFS_TNODES_INTERNAL_BITS     (YAFFS_TNODES_LEVEL0_BITS - 1)
-#define YAFFS_TNODES_INTERNAL_MASK     0x7
-#define YAFFS_TNODES_MAX_LEVEL         6
-               
-#define YAFFS_BYTES_PER_CHUNK          512
-#define YAFFS_CHUNK_SIZE_SHIFT         9
-
-#define YAFFS_BYTES_PER_SPARE          16
-
-#define YAFFS_CHUNKS_PER_BLOCK         32
-#define YAFFS_BYTES_PER_BLOCK          (YAFFS_CHUNKS_PER_BLOCK*YAFFS_BYTES_PER_CHUNK)
-
-#define YAFFS_MAX_CHUNK_ID                     0x000FFFFF
-
-#define YAFFS_UNUSED_OBJECT_ID         0x0003FFFF
-
-#define YAFFS_ALLOCATION_NOBJECTS      100
-#define YAFFS_ALLOCATION_NTNODES       100
-#define YAFFS_ALLOCATION_NLINKS                100
-
-#define YAFFS_NOBJECT_BUCKETS          256
-
-
-#define YAFFS_RESERVED_BLOCKS          8
-
-#define YAFFS_OBJECT_SPACE                     0x40000
+/*\r
+ * YAFFS: Yet another FFS. A NAND-flash specific file system. \r
+ * yaffs_guts.h: Configuration etc for yaffs_guts\r
+ *\r
+ * Copyright (C) 2002 Aleph One Ltd.\r
+ *   for Toby Churchill Ltd and Brightstar Engineering\r
+ *\r
+ * Created by Charles Manning <charles@aleph1.co.uk>\r
+ *\r
+ * This program is free software; you can redistribute it and/or modify\r
+ * it under the terms of the GNU Lesser General Public License version 2.1 as\r
+ * published by the Free Software Foundation.\r
+ *\r
+ *\r
+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.\r
+ *\r
+ * $Id: yaffs_guts.h,v 1.12 2002-11-26 01:15:37 charles Exp $\r
+ */\r
+\r
+#ifndef __YAFFS_GUTS_H__\r
+#define __YAFFS_GUTS_H__\r
+\r
+#include "devextras.h"\r
+\r
+\r
+#define YAFFS_OK       1\r
+#define YAFFS_FAIL  0\r
+\r
+// Give us a Y=0x59, \r
+// Give us an A=0x41, \r
+// Give us an FF=0xFF \r
+// Give us an S=0x53\r
+// And what have we got... \r
+#define YAFFS_MAGIC                                    0x5941FF53\r
+\r
+#define YAFFS_NTNODES_LEVEL0           16\r
+#define YAFFS_TNODES_LEVEL0_BITS       4\r
+#define YAFFS_TNODES_LEVEL0_MASK       0xf\r
+\r
+#define YAFFS_NTNODES_INTERNAL                 (YAFFS_NTNODES_LEVEL0 / 2)\r
+#define YAFFS_TNODES_INTERNAL_BITS     (YAFFS_TNODES_LEVEL0_BITS - 1)\r
+#define YAFFS_TNODES_INTERNAL_MASK     0x7\r
+#define YAFFS_TNODES_MAX_LEVEL         6\r
+               \r
+#define YAFFS_BYTES_PER_CHUNK          512\r
+#define YAFFS_CHUNK_SIZE_SHIFT         9\r
+\r
+#define YAFFS_BYTES_PER_SPARE          16\r
+\r
+#define YAFFS_CHUNKS_PER_BLOCK         32\r
+#define YAFFS_BYTES_PER_BLOCK          (YAFFS_CHUNKS_PER_BLOCK*YAFFS_BYTES_PER_CHUNK)\r
+\r
+#define YAFFS_MAX_CHUNK_ID                     0x000FFFFF\r
+\r
+#define YAFFS_UNUSED_OBJECT_ID         0x0003FFFF\r
+\r
+#define YAFFS_ALLOCATION_NOBJECTS      100\r
+#define YAFFS_ALLOCATION_NTNODES       100\r
+#define YAFFS_ALLOCATION_NLINKS                100\r
+\r
+#define YAFFS_NOBJECT_BUCKETS          256\r
+\r
+\r
+#define YAFFS_RESERVED_BLOCKS          8\r
+\r
+#define YAFFS_OBJECT_SPACE                     0x40000\r
 #define YAFFS_MAX_NAME_LENGTH          255\r
-#define YAFFS_SHORT_NAME_LENGTH                15
-
-#define YAFFS_MAX_ALIAS_LENGTH         159
-
-#define YAFFS_OBJECTID_ROOT                    1
-#define YAFFS_OBJECTID_LOSTNFOUND      2
-#define YAFFS_OBJECTID_UNLINKED                3
-
-#define YAFFS_N_CACHE_CHUNKS           10
-
-#ifdef CONFIG_YAFFS_WINCE
-
-// Force the short operation cache on for WinCE
-
-#define CONFIG_YAFFS_SHORT_OP_CACHE
-#endif
-
-
-// ChunkCache is used for short read/write operations.
-typedef struct
-{
-       struct yaffs_ObjectStruct *object;
-       int chunkId;
-       int lastUse;
-       int dirty;      
-       __u8 data[YAFFS_BYTES_PER_CHUNK];
-} yaffs_ChunkCache;
-
-// Tags structures in RAM
-// NB This uses bitfield. Bitfields should not stradle a u32 boundary otherwise
-// the structure size will get blown out.
-
-typedef struct
-{
-    unsigned chunkId:20;
-    unsigned serialNumber:2;
-    unsigned byteCount:10;
-    unsigned objectId:18;
-    unsigned ecc:12;
-    unsigned unusedStuff:2;
-} yaffs_Tags;
-
-typedef union
-{
-    yaffs_Tags asTags;
-    __u8       asBytes[8];
-} yaffs_TagsUnion;
-
-
-// Spare structure
-typedef struct
-{
-    __u8  tagByte0;
-    __u8  tagByte1;
-    __u8  tagByte2;
-    __u8  tagByte3;
-    __u8  pageStatus;  // set to 0 to delete the chunk
-    __u8  blockStatus;
-    __u8  tagByte4;
-    __u8  tagByte5;
-    __u8  ecc1[3];
-    __u8  tagByte6;
-    __u8  tagByte7;
-    __u8  ecc2[3];
-} yaffs_Spare;
-
-// Block data in RAM
-
-typedef enum {
-       YAFFS_BLOCK_STATE_UddNKNOWN     = 0,
-       YAFFS_BLOCK_STATE_SCANNING,             // Used while the block is being scanned.
-                                                                       // NB Don't erase blocks while they're being scanned
-       
-       YAFFS_BLOCK_STATE_EMPTY,                // This block is empty
-       
-       YAFFS_BLOCK_STATE_ALLOCATING,   // This block is partially allocated. 
-                                                                       // This is the one currently being used for page
-                                                                       // allocation. Should never be more than one of these
-                                                       
-
-       YAFFS_BLOCK_STATE_FULL,                 // All the pages in this block have been allocated.
-                                                                       // At least one page holds valid data.
-                                                        
-       YAFFS_BLOCK_STATE_DIRTY,                // All pages have been allocated and deleted. 
-                                                                       // Erase me, reuse me.
-                                                       
-       YAFFS_BLOCK_STATE_DEAD = 0x77   // This block has failed and is not in use
-
-} yaffs_BlockState;
-
-
-
-
-typedef struct
-{
-       __u32 pageBits;   // bitmap of pages in use
-    __u8  blockState; // One of the above block states
-    __u8  pagesInUse; // number of pages in use
-    __u8  needsRetiring:1;     // Data has failed on this block, need to get valid data off
-                                               // and retire the block.
-} yaffs_BlockInfo;
-
-
-//////////////////// Object structure ///////////////////////////
-// This is the object structure as stored on NAND
-
-typedef enum
-{
-       YAFFS_OBJECT_TYPE_UNKNOWN,
-       YAFFS_OBJECT_TYPE_FILE,
-       YAFFS_OBJECT_TYPE_SYMLINK,
-       YAFFS_OBJECT_TYPE_DIRECTORY,
-       YAFFS_OBJECT_TYPE_HARDLINK,
-       YAFFS_OBJECT_TYPE_SPECIAL
-} yaffs_ObjectType;
-
-typedef struct
-{
-       yaffs_ObjectType type;
-
-       // Apply to everything  
-       int   parentObjectId;
-       __u16 sum__NoLongerUsed;        // checksum of name. Calc this off the name to prevent inconsistencies
-       char  name[YAFFS_MAX_NAME_LENGTH + 1];
-
-       // Thes following apply to directories, files, symlinks - not hard links
-       __u32 st_mode;  // protection
+#define YAFFS_SHORT_NAME_LENGTH                15\r
+\r
+#define YAFFS_MAX_ALIAS_LENGTH         159\r
+\r
+#define YAFFS_OBJECTID_ROOT                    1\r
+#define YAFFS_OBJECTID_LOSTNFOUND      2\r
+#define YAFFS_OBJECTID_UNLINKED                3\r
+\r
+#define YAFFS_N_CACHE_CHUNKS           10\r
+\r
+#ifdef CONFIG_YAFFS_WINCE\r
+\r
+// Force the short operation cache on for WinCE\r
+\r
+#define CONFIG_YAFFS_SHORT_OP_CACHE\r
+#endif\r
+\r
+\r
+// ChunkCache is used for short read/write operations.\r
+typedef struct\r
+{\r
+       struct yaffs_ObjectStruct *object;\r
+       int chunkId;\r
+       int lastUse;\r
+       int dirty;      \r
+       __u8 data[YAFFS_BYTES_PER_CHUNK];\r
+} yaffs_ChunkCache;\r
+\r
+// Tags structures in RAM\r
+// NB This uses bitfield. Bitfields should not stradle a u32 boundary otherwise\r
+// the structure size will get blown out.\r
+\r
+typedef struct\r
+{\r
+    unsigned chunkId:20;\r
+    unsigned serialNumber:2;\r
+    unsigned byteCount:10;\r
+    unsigned objectId:18;\r
+    unsigned ecc:12;\r
+    unsigned unusedStuff:2;\r
+} yaffs_Tags;\r
+\r
+typedef union\r
+{\r
+    yaffs_Tags asTags;\r
+    __u8       asBytes[8];\r
+} yaffs_TagsUnion;\r
+\r
+\r
+// Spare structure\r
+typedef struct\r
+{\r
+    __u8  tagByte0;\r
+    __u8  tagByte1;\r
+    __u8  tagByte2;\r
+    __u8  tagByte3;\r
+    __u8  pageStatus;  // set to 0 to delete the chunk\r
+    __u8  blockStatus;\r
+    __u8  tagByte4;\r
+    __u8  tagByte5;\r
+    __u8  ecc1[3];\r
+    __u8  tagByte6;\r
+    __u8  tagByte7;\r
+    __u8  ecc2[3];\r
+} yaffs_Spare;\r
+\r
+// Block data in RAM\r
+\r
+typedef enum {\r
+       YAFFS_BLOCK_STATE_UddNKNOWN     = 0,\r
+       YAFFS_BLOCK_STATE_SCANNING,             // Used while the block is being scanned.\r
+                                                                       // NB Don't erase blocks while they're being scanned\r
+       \r
+       YAFFS_BLOCK_STATE_EMPTY,                // This block is empty\r
+       \r
+       YAFFS_BLOCK_STATE_ALLOCATING,   // This block is partially allocated. \r
+                                                                       // This is the one currently being used for page\r
+                                                                       // allocation. Should never be more than one of these\r
+                                                       \r
+\r
+       YAFFS_BLOCK_STATE_FULL,                 // All the pages in this block have been allocated.\r
+                                                                       // At least one page holds valid data.\r
+                                                        \r
+       YAFFS_BLOCK_STATE_DIRTY,                // All pages have been allocated and deleted. \r
+                                                                       // Erase me, reuse me.\r
+                                                       \r
+       YAFFS_BLOCK_STATE_DEAD = 0x77   // This block has failed and is not in use\r
+\r
+} yaffs_BlockState;\r
+\r
+\r
+\r
+\r
+typedef struct\r
+{\r
+       __u32 pageBits;   // bitmap of pages in use\r
+    __u8  blockState; // One of the above block states\r
+    __u8  pagesInUse; // number of pages in use\r
+    __u8  needsRetiring:1;     // Data has failed on this block, need to get valid data off\r
+                                               // and retire the block.\r
+} yaffs_BlockInfo;\r
+\r
+\r
+//////////////////// Object structure ///////////////////////////\r
+// This is the object structure as stored on NAND\r
+\r
+typedef enum\r
+{\r
+       YAFFS_OBJECT_TYPE_UNKNOWN,\r
+       YAFFS_OBJECT_TYPE_FILE,\r
+       YAFFS_OBJECT_TYPE_SYMLINK,\r
+       YAFFS_OBJECT_TYPE_DIRECTORY,\r
+       YAFFS_OBJECT_TYPE_HARDLINK,\r
+       YAFFS_OBJECT_TYPE_SPECIAL\r
+} yaffs_ObjectType;\r
+\r
+typedef struct\r
+{\r
+       yaffs_ObjectType type;\r
+\r
+       // Apply to everything  \r
+       int   parentObjectId;\r
+       __u16 sum__NoLongerUsed;        // checksum of name. Calc this off the name to prevent inconsistencies\r
+       char  name[YAFFS_MAX_NAME_LENGTH + 1];\r
+\r
+       // Thes following apply to directories, files, symlinks - not hard links\r
+       __u32 st_mode;  // protection\r
 \r
 #ifdef CONFIG_YAFFS_WINCE\r
        __u32 notForWinCE[5];\r
-#else
-       __u32 st_uid;   // user ID of owner
-       __u32 st_gid;    // group ID of owner 
-       __u32 st_atime; // time of last access
-       __u32 st_mtime; // time of last modification
-       __u32 st_ctime; // time of last change
+#else\r
+       __u32 st_uid;   // user ID of owner\r
+       __u32 st_gid;    // group ID of owner \r
+       __u32 st_atime; // time of last access\r
+       __u32 st_mtime; // time of last modification\r
+       __u32 st_ctime; // time of last change\r
+#endif\r
+\r
+       // File size  applies to files only\r
+       int fileSize; \r
+               \r
+       // Equivalent object id applies to hard links only.\r
+       int  equivalentObjectId;\r
+       \r
+       // Alias is for symlinks only.\r
+       char alias[YAFFS_MAX_ALIAS_LENGTH + 1];\r
+       \r
+       __u32 st_rdev;  // device stuff for block and char devices (maj/min)\r
+       \r
+#ifdef CONFIG_YAFFS_WINCE\r
+       __u32 win_ctime[2];\r
+       __u32 win_atime[2];\r
+       __u32 win_mtime[2];\r
+       __u32 roomToGrow[6];\r
+#else\r
+       __u32 roomToGrow[12];\r
 #endif\r
+       \r
+} yaffs_ObjectHeader;\r
+\r
+\r
+\r
+////////////////////  Tnode ///////////////////////////\r
+\r
+union yaffs_Tnode_union\r
+{\r
+       union yaffs_Tnode_union *internal[YAFFS_NTNODES_INTERNAL];\r
+       __u16 level0[YAFFS_NTNODES_LEVEL0];\r
+       \r
+};\r
+\r
+typedef union yaffs_Tnode_union yaffs_Tnode;\r
+\r
+struct yaffs_TnodeList_struct\r
+{\r
+       struct yaffs_TnodeList_struct *next;\r
+       yaffs_Tnode *tnodes;\r
+};\r
+\r
+typedef struct yaffs_TnodeList_struct yaffs_TnodeList;\r
+\r
+\r
+\r
+///////////////////  Object ////////////////////////////////\r
+// An object can be one of:\r
+// - a directory (no data, has children links\r
+// - a regular file (data.... not prunes :->).\r
+// - a symlink [symbolic link] (the alias).\r
+// - a hard link\r
+\r
+\r
+typedef struct \r
+{\r
+       __u32 fileSize;\r
+       __u32 scannedFileSize;\r
+       int   topLevel;\r
+       yaffs_Tnode *top;\r
+} yaffs_FileStructure;\r
+\r
+typedef struct\r
+{\r
+       struct list_head children; // list of child links\r
+} yaffs_DirectoryStructure;\r
+\r
+typedef struct\r
+{\r
+       char *alias;\r
+} yaffs_SymLinkStructure;\r
 \r
-       // File size  applies to files only
-       int fileSize; 
-               
-       // Equivalent object id applies to hard links only.
-       int  equivalentObjectId;
-       
-       // Alias is for symlinks only.
-       char alias[YAFFS_MAX_ALIAS_LENGTH + 1];
-       
-       __u32 st_rdev;  // device stuff for block and char devices (maj/min)
-       
-#ifdef CONFIG_YAFFS_WINCE
-       __u32 win_ctime[2];
-       __u32 win_atime[2];
-       __u32 win_mtime[2];
-       __u32 roomToGrow[6];
-#else
-       __u32 roomToGrow[12];
-#endif
-       
-} yaffs_ObjectHeader;
-
-
-
-////////////////////  Tnode ///////////////////////////
-
-union yaffs_Tnode_union
-{
-       union yaffs_Tnode_union *internal[YAFFS_NTNODES_INTERNAL];
-       __u16 level0[YAFFS_NTNODES_LEVEL0];
-       
-};
-
-typedef union yaffs_Tnode_union yaffs_Tnode;
-
-struct yaffs_TnodeList_struct
-{
-       struct yaffs_TnodeList_struct *next;
-       yaffs_Tnode *tnodes;
-};
-
-typedef struct yaffs_TnodeList_struct yaffs_TnodeList;
-
-
-
-///////////////////  Object ////////////////////////////////
-// An object can be one of:
-// - a directory (no data, has children links
-// - a regular file (data.... not prunes :->).
-// - a symlink [symbolic link] (the alias).
-// - a hard link
-
-
-typedef struct 
-{
-       __u32 fileSize;
-       __u32 scannedFileSize;
-       int   topLevel;
-       yaffs_Tnode *top;
-} yaffs_FileStructure;
-
-typedef struct
-{
-       struct list_head children; // list of child links
-} yaffs_DirectoryStructure;
-
-typedef struct
-{
-       char *alias;
-} yaffs_SymLinkStructure;
-
-typedef struct
-{
-       struct yaffs_ObjectStruct *equivalentObject;
-       __u32   equivalentObjectId;
-} yaffs_HardLinkStructure;
-
-typedef union
-{
-       yaffs_FileStructure fileVariant;
-       yaffs_DirectoryStructure directoryVariant;
-       yaffs_SymLinkStructure symLinkVariant;
-       yaffs_HardLinkStructure hardLinkVariant;
-} yaffs_ObjectVariant;
-
-
-struct  yaffs_ObjectStruct
-{
-       __u8 deleted: 1;                // This should only apply to unlinked files.
-       __u8 unlinked: 1;               // An unlinked file. The file should be in the unlinked pseudo directory.
-       __u8 fake:1;                    // A fake object has no presence on NAND.
-       __u8 renameAllowed:1;
-       __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 
-                                                       // object might be created before the data
-                                                       // is available (ie. file data records appear before the header).
-       __u8 serial;                    // serial number of chunk in NAND. Store here so we don't have to
-                                                       // read back the old one to update.
-       __u16 sum;                              // sum of the name to speed searching
-       
-       struct yaffs_DeviceStruct *myDev; // The device I'm on
-       
-                                                               
-       struct list_head hashLink;      // list of objects in this hash bucket
-                                                       
-
-       struct list_head hardLinks; // all the equivalent hard linked objects
-                                                               // live on this list
-       // directory structure stuff
-       struct yaffs_ObjectStruct  *parent;     //my parent directory
-       struct list_head siblings;      // siblings in a directory
-                                                               // also used for linking up the free list
-               
-       // Where's my data in NAND?
-       int chunkId;            // where it lives
-
-       int nDataChunks;        
-       
-       __u32 objectId;         // the object id value
-       
-       
+typedef struct\r
+{\r
+       struct yaffs_ObjectStruct *equivalentObject;\r
+       __u32   equivalentObjectId;\r
+} yaffs_HardLinkStructure;\r
+\r
+typedef union\r
+{\r
+       yaffs_FileStructure fileVariant;\r
+       yaffs_DirectoryStructure directoryVariant;\r
+       yaffs_SymLinkStructure symLinkVariant;\r
+       yaffs_HardLinkStructure hardLinkVariant;\r
+} yaffs_ObjectVariant;\r
+\r
+\r
+struct  yaffs_ObjectStruct\r
+{\r
+       __u8 deleted: 1;                // This should only apply to unlinked files.\r
+       __u8 unlinked: 1;               // An unlinked file. The file should be in the unlinked pseudo directory.\r
+       __u8 fake:1;                    // A fake object has no presence on NAND.\r
+       __u8 renameAllowed:1;\r
+       __u8 unlinkAllowed:1;\r
+       __u8 dirty:1;                   // the object needs to be written to flash\r
+       __u8 valid:1;                   // When the file system is being loaded up, this \r
+                                                       // object might be created before the data\r
+                                                       // is available (ie. file data records appear before the header).\r
+       __u8 serial;                    // serial number of chunk in NAND. Store here so we don't have to\r
+                                                       // read back the old one to update.\r
+       __u16 sum;                              // sum of the name to speed searching\r
+       \r
+       struct yaffs_DeviceStruct *myDev; // The device I'm on\r
+       \r
+                                                               \r
+       struct list_head hashLink;      // list of objects in this hash bucket\r
+                                                       \r
+\r
+       struct list_head hardLinks; // all the equivalent hard linked objects\r
+                                                               // live on this list\r
+       // directory structure stuff\r
+       struct yaffs_ObjectStruct  *parent;     //my parent directory\r
+       struct list_head siblings;      // siblings in a directory\r
+                                                               // also used for linking up the free list\r
+               \r
+       // Where's my data in NAND?\r
+       int chunkId;            // where it lives\r
+\r
+       int nDataChunks;        \r
+       \r
+       __u32 objectId;         // the object id value\r
+       \r
+       \r
        __u32 st_mode;          // protection\r
 \r
 #ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM\r
@@ -337,223 +337,225 @@ struct  yaffs_ObjectStruct
        __u32 win_ctime[2];\r
        __u32 win_mtime[2];\r
        __u32 win_atime[2];\r
-#else
-       __u32 st_uid;           // user ID of owner
-       __u32 st_gid;           // group ID of owner 
-       __u32 st_atime;         // time of last access
-       __u32 st_mtime;         // time of last modification
-       __u32 st_ctime;         // time of last change
-       __u32 st_rdev;      // device stuff for block and char devices
+#else\r
+       __u32 st_uid;           // user ID of owner\r
+       __u32 st_gid;           // group ID of owner \r
+       __u32 st_atime;         // time of last access\r
+       __u32 st_mtime;         // time of last modification\r
+       __u32 st_ctime;         // time of last change\r
+       __u32 st_rdev;      // device stuff for block and char devices\r
+#endif\r
+\r
+\r
+\r
+\r
+#ifdef __KERNEL__\r
+       struct inode *myInode;\r
+#endif\r
+\r
+\r
+       \r
+       yaffs_ObjectType variantType;\r
+       \r
+       yaffs_ObjectVariant variant;\r
+       \r
+};\r
+\r
+\r
+\r
+typedef struct yaffs_ObjectStruct yaffs_Object;\r
+\r
+\r
+struct yaffs_ObjectList_struct\r
+{\r
+       yaffs_Object *objects;\r
+       struct yaffs_ObjectList_struct *next;\r
+};\r
+\r
+typedef struct yaffs_ObjectList_struct yaffs_ObjectList;\r
+\r
+typedef struct\r
+{\r
+       struct list_head list;\r
+       int count;\r
+} yaffs_ObjectBucket;\r
+\r
+\r
+//////////////////// Device ////////////////////////////////\r
+\r
+struct yaffs_DeviceStruct\r
+{\r
+       // Entry parameters set up way early. Yaffs sets up the rest.\r
+       int   startBlock;       // Start block we're allowed to use\r
+       int   endBlock;         // End block we're allowed to use\r
+       __u16 chunkGroupBits; // 0 for devices <= 32MB. else log2(nchunks) - 16\r
+       __u16 chunkGroupSize; // == 2^^chunkGroupBits\r
+       \r
+       \r
+       void *genericDevice; // Pointer to device context\r
+                                                // On an mtd this holds the mtd pointer.\r
+       \r
+#ifdef __KERNEL__\r
+\r
+       struct semaphore sem;// Semaphore for waiting on erasure.\r
+       struct semaphore grossLock; // Gross locking semaphore\r
+\r
+#endif\r
+       \r
+       \r
+       // NAND access functions (Must be set before calling YAFFS)\r
+       \r
+       int (*writeChunkToNAND)(struct yaffs_DeviceStruct *dev,int chunkInNAND, const __u8 *data, yaffs_Spare *spare);\r
+       int (*readChunkFromNAND)(struct yaffs_DeviceStruct *dev,int chunkInNAND, __u8 *data, yaffs_Spare *spare);\r
+       int (*eraseBlockInNAND)(struct yaffs_DeviceStruct *dev,int blockInNAND);        \r
+       int (*initialiseNAND)(struct yaffs_DeviceStruct *dev);\r
+\r
+#ifdef __KERNEL__\r
+       void (*putSuperFunc)(struct super_block *sb);\r
+#endif\r
+\r
+       // Runtime parameters.\r
+       yaffs_BlockInfo *blockInfo;\r
+       int   nErasedBlocks;\r
+       int   allocationBlock;\r
+       __u32 allocationPage;\r
+       \r
+       // Runtime state\r
+       int   nTnodesCreated;   \r
+       yaffs_Tnode *freeTnodes;\r
+       int  nFreeTnodes;\r
+       yaffs_TnodeList *allocatedTnodeList;\r
+\r
+\r
+       int   nObjectsCreated;\r
+       yaffs_Object *freeObjects;\r
+       int   nFreeObjects;\r
+\r
+       yaffs_ObjectList *allocatedObjectList;\r
+\r
+       yaffs_ObjectBucket objectBucket[YAFFS_NOBJECT_BUCKETS];\r
+\r
+       int       nFreeChunks;\r
+               \r
+       int   currentDirtyChecker;      // Used to find current dirtiest block\r
+       \r
+       int   garbageCollectionRequired;\r
+       \r
+       // Operations since mount\r
+       int nPageWrites;\r
+       int nPageReads;\r
+       int nBlockErasures;\r
+       int nGCCopies;\r
+       int garbageCollections;\r
+       int nRetriedWrites;\r
+       int nRetiredBlocks;\r
+       int eccFixed;\r
+       int eccUnfixed;\r
+       int tagsEccFixed;\r
+       int tagsEccUnfixed;\r
+       \r
+       yaffs_Object *rootDir;\r
+       yaffs_Object *lostNFoundDir;\r
+       \r
+       // Buffer areas for storing data to recover from write failures\r
+       __u8            bufferedData[YAFFS_CHUNKS_PER_BLOCK][YAFFS_BYTES_PER_CHUNK];\r
+       yaffs_Spare bufferedSpare[YAFFS_CHUNKS_PER_BLOCK];\r
+       int bufferedBlock;      // Which block is buffered here?\r
+       int doingBufferedBlockRewrite;\r
+       \r
+       int blockSelectedForGC;\r
+\r
+#ifdef CONFIG_YAFFS_SHORT_OP_CACHE\r
+       yaffs_ChunkCache srCache[YAFFS_N_CACHE_CHUNKS];\r
+       int srLastUse;\r
 #endif\r
+       int cacheHits;\r
+\r
+       // Stuff for background deletion and unlinked files.\r
+       yaffs_Object *unlinkedDir;              // Directory where unlinked and deleted files live.\r
+       yaffs_Object *unlinkedDeletion; // Current file being background deleted.\r
+       int nDeletedFiles;                              // Count of files awaiting deletion;\r
+       int nUnlinkedFiles;                             // Count of unlinked files. \r
+       int nBackgroundDeletions;                       // Count of background deletions.       \r
+       \r
+       __u8 *localBuffer;\r
+       \r
+};\r
+\r
+typedef struct yaffs_DeviceStruct yaffs_Device;\r
+\r
+\r
+\r
+//////////// YAFFS Functions //////////////////\r
+\r
+int yaffs_GutsInitialise(yaffs_Device *dev);\r
+void yaffs_Deinitialise(yaffs_Device *dev);\r
+\r
+int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev);\r
+\r
+\r
+// Rename\r
+int yaffs_RenameObject(yaffs_Object *oldDir, const char *oldName, yaffs_Object *newDir, const char *newName);\r
+\r
+// generic Object functions\r
+int yaffs_Unlink(yaffs_Object *dir, const char *name);\r
+int yaffs_DeleteFile(yaffs_Object *obj);\r
+\r
+// Object access functions.\r
+int yaffs_GetObjectName(yaffs_Object *obj,char *name,int buffSize);\r
+int yaffs_GetObjectFileLength(yaffs_Object *obj);\r
+int yaffs_GetObjectInode(yaffs_Object *obj);\r
+unsigned yaffs_GetObjectType(yaffs_Object *obj);\r
+int yaffs_GetObjectLinkCount(yaffs_Object *obj);\r
+\r
+// Change inode attributes\r
+int yaffs_SetAttributes(yaffs_Object *obj, struct iattr *attr);\r
+int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr);\r
+\r
+// File operations\r
+int yaffs_ReadDataFromFile(yaffs_Object *obj, __u8 *buffer, __u32 offset, int nBytes);\r
+int yaffs_WriteDataToFile(yaffs_Object *obj, const __u8 *buffer, __u32 offset, int nBytes);\r
+int yaffs_ResizeFile(yaffs_Object *obj, int newSize);\r
 \r
+yaffs_Object *yaffs_MknodFile(yaffs_Object *parent,const char *name, __u32 mode, __u32 uid, __u32 gid);\r
+int yaffs_FlushFile(yaffs_Object *obj);\r
 \r
-
-
-#ifdef __KERNEL__
-       struct inode *myInode;
-#endif
-
-
-       
-       yaffs_ObjectType variantType;
-       
-       yaffs_ObjectVariant variant;
-       
-};
-
-
-
-typedef struct yaffs_ObjectStruct yaffs_Object;
-
-
-struct yaffs_ObjectList_struct
-{
-       yaffs_Object *objects;
-       struct yaffs_ObjectList_struct *next;
-};
-
-typedef struct yaffs_ObjectList_struct yaffs_ObjectList;
-
-typedef struct
-{
-       struct list_head list;
-       int count;
-} yaffs_ObjectBucket;
-
-
-//////////////////// Device ////////////////////////////////
-
-struct yaffs_DeviceStruct
-{
-       // Entry parameters set up way early. Yaffs sets up the rest.
-       int   startBlock;       // Start block we're allowed to use
-       int   endBlock;         // End block we're allowed to use
-       __u16 chunkGroupBits; // 0 for devices <= 32MB. else log2(nchunks) - 16
-       __u16 chunkGroupSize; // == 2^^chunkGroupBits
-       
-       
-       void *genericDevice; // Pointer to device context
-                                                // On an mtd this holds the mtd pointer.
-       
-#ifdef __KERNEL__
-
-       struct semaphore sem;// Semaphore for waiting on erasure.
-       struct semaphore grossLock; // Gross locking semaphore
-
-#endif
-       
-       
-       // NAND access functions (Must be set before calling YAFFS)
-       
-       int (*writeChunkToNAND)(struct yaffs_DeviceStruct *dev,int chunkInNAND, const __u8 *data, yaffs_Spare *spare);
-       int (*readChunkFromNAND)(struct yaffs_DeviceStruct *dev,int chunkInNAND, __u8 *data, yaffs_Spare *spare);
-       int (*eraseBlockInNAND)(struct yaffs_DeviceStruct *dev,int blockInNAND);        
-       int (*initialiseNAND)(struct yaffs_DeviceStruct *dev);
-
-#ifdef __KERNEL__
-       void (*putSuperFunc)(struct super_block *sb);
-#endif
-
-       // Runtime parameters.
-       yaffs_BlockInfo *blockInfo;
-       int   nErasedBlocks;
-       int   allocationBlock;
-       __u32 allocationPage;
-       
-       // Runtime state
-       int   nTnodesCreated;   
-       yaffs_Tnode *freeTnodes;
-       int  nFreeTnodes;
-       yaffs_TnodeList *allocatedTnodeList;
-
-
-       int   nObjectsCreated;
-       yaffs_Object *freeObjects;
-       int   nFreeObjects;
-
-       yaffs_ObjectList *allocatedObjectList;
-
-       yaffs_ObjectBucket objectBucket[YAFFS_NOBJECT_BUCKETS];
-
-       int       nFreeChunks;
-               
-       int   currentDirtyChecker;      // Used to find current dirtiest block
-       
-       int   garbageCollectionRequired;
-       
-       // Operations since mount
-       int nPageWrites;
-       int nPageReads;
-       int nBlockErasures;
-       int nGCCopies;
-       int garbageCollections;
-       int nRetriedWrites;
-       int nRetiredBlocks;
-       int eccFixed;
-       int eccUnfixed;
-       int tagsEccFixed;
-       int tagsEccUnfixed;
-       
-       yaffs_Object *rootDir;
-       yaffs_Object *lostNFoundDir;
-       
-       // Buffer areas for storing data to recover from write failures
-       __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;
-       
-       int blockSelectedForGC;
-
-#ifdef CONFIG_YAFFS_SHORT_OP_CACHE
-       yaffs_ChunkCache srCache[YAFFS_N_CACHE_CHUNKS];
-       int srLastUse;
-#endif
-       int cacheHits;
-
-       // Stuff for background deletion and unlinked files.
-       yaffs_Object *unlinkedDir;              // Directory where unlinked and deleted files live.
-       yaffs_Object *unlinkedDeletion; // Current file being background deleted.
-       int nDeletedFiles;                              // Count of files awaiting deletion;
-       int nUnlinkedFiles;                             // Count of unlinked files. 
-       int nBackgroundDeletions;                       // Count of background deletions.       
-       
-};
-
-typedef struct yaffs_DeviceStruct yaffs_Device;
-
-
-
-//////////// YAFFS Functions //////////////////
-
-int yaffs_GutsInitialise(yaffs_Device *dev);
-void yaffs_Deinitialise(yaffs_Device *dev);
-
-int yaffs_GetNumberOfFreeChunks(yaffs_Device *dev);
-
-
-// Rename
-int yaffs_RenameObject(yaffs_Object *oldDir, const char *oldName, yaffs_Object *newDir, const char *newName);
-
-// generic Object functions
-int yaffs_Unlink(yaffs_Object *dir, const char *name);
-int yaffs_DeleteFile(yaffs_Object *obj);
-
-// Object access functions.
-int yaffs_GetObjectName(yaffs_Object *obj,char *name,int buffSize);
-int yaffs_GetObjectFileLength(yaffs_Object *obj);
-int yaffs_GetObjectInode(yaffs_Object *obj);
-unsigned yaffs_GetObjectType(yaffs_Object *obj);
-int yaffs_GetObjectLinkCount(yaffs_Object *obj);
-
-// Change inode attributes
-int yaffs_SetAttributes(yaffs_Object *obj, struct iattr *attr);
-int yaffs_GetAttributes(yaffs_Object *obj, struct iattr *attr);
-
-// File operations
-int yaffs_ReadDataFromFile(yaffs_Object *obj, __u8 *buffer, __u32 offset, int nBytes);
-int yaffs_WriteDataToFile(yaffs_Object *obj, const __u8 *buffer, __u32 offset, int nBytes);
-int yaffs_ResizeFile(yaffs_Object *obj, int newSize);
-
-yaffs_Object *yaffs_MknodFile(yaffs_Object *parent,const char *name, __u32 mode, __u32 uid, __u32 gid);
-int yaffs_FlushFile(yaffs_Object *obj);
-
-
-// Directory operations
-yaffs_Object *yaffs_MknodDirectory(yaffs_Object *parent,const char *name, __u32 mode, __u32 uid, __u32 gid);
-yaffs_Object *yaffs_FindObjectByName(yaffs_Object *theDir,const char *name);
-int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir,int (*fn)(yaffs_Object *));
-
-yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device *dev,__u32 number);
-
-// Link operations
-yaffs_Object *yaffs_Link(yaffs_Object *parent, const char *name, yaffs_Object *equivalentObject);
-
-yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object *obj);
-
-// Symlink operations
-yaffs_Object *yaffs_MknodSymLink(yaffs_Object *parent, const char *name, __u32 mode,  __u32 uid, __u32 gid, const char *alias);
-char *yaffs_GetSymlinkAlias(yaffs_Object *obj);
-
-// Special inodes (fifos, sockets and devices)
-yaffs_Object *yaffs_MknodSpecial(yaffs_Object *parent,const char *name, __u32 mode, __u32 uid, __u32 gid,__u32 rdev);
-
-
-// Special directories
-yaffs_Object *yaffs_Root(yaffs_Device *dev);
+\r
+// Directory operations\r
+yaffs_Object *yaffs_MknodDirectory(yaffs_Object *parent,const char *name, __u32 mode, __u32 uid, __u32 gid);\r
+yaffs_Object *yaffs_FindObjectByName(yaffs_Object *theDir,const char *name);\r
+int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir,int (*fn)(yaffs_Object *));\r
+\r
+yaffs_Object *yaffs_FindObjectByNumber(yaffs_Device *dev,__u32 number);\r
+\r
+// Link operations\r
+yaffs_Object *yaffs_Link(yaffs_Object *parent, const char *name, yaffs_Object *equivalentObject);\r
+\r
+yaffs_Object *yaffs_GetEquivalentObject(yaffs_Object *obj);\r
+\r
+// Symlink operations\r
+yaffs_Object *yaffs_MknodSymLink(yaffs_Object *parent, const char *name, __u32 mode,  __u32 uid, __u32 gid, const char *alias);\r
+char *yaffs_GetSymlinkAlias(yaffs_Object *obj);\r
+\r
+// Special inodes (fifos, sockets and devices)\r
+yaffs_Object *yaffs_MknodSpecial(yaffs_Object *parent,const char *name, __u32 mode, __u32 uid, __u32 gid,__u32 rdev);\r
+\r
+\r
+// Special directories\r
+yaffs_Object *yaffs_Root(yaffs_Device *dev);\r
 yaffs_Object *yaffs_LostNFound(yaffs_Device *dev);\r
 \r
 #ifdef CONFIG_YAFFS_WINCE\r
 // CONFIG_YAFFS_WINCE special stuff\r
 void  yfsd_WinFileTimeNow(__u32 target[2]);\r
-#endif
-
-
-// Debug dump 
-int yaffs_DumpObject(yaffs_Object *obj);
-
-
-void yaffs_GutsTest(yaffs_Device *dev);
-
-
-#endif
+#endif\r
+\r
+\r
+// Debug dump \r
+int yaffs_DumpObject(yaffs_Object *obj);\r
+\r
+\r
+void yaffs_GutsTest(yaffs_Device *dev);\r
+\r
+\r
+#endif\r
index 923de914c83afd471b2eb4abc810ba4da3614cc3..4d31736bc6d7ab07e7ac461f49cc230d1ea6952c 100644 (file)
@@ -13,7 +13,7 @@
  *
  */
 
-const char *yaffs_mtdif_c_version = "$Id: yaffs_mtdif.c,v 1.3 2002-09-27 20:50:50 charles Exp $";
+const char *yaffs_mtdif_c_version = "$Id: yaffs_mtdif.c,v 1.4 2002-11-26 01:15:37 charles Exp $";
 
 #ifdef CONFIG_YAFFS_MTD_ENABLED
  
@@ -24,6 +24,10 @@ const char *yaffs_mtdif_c_version = "$Id: yaffs_mtdif.c,v 1.3 2002-09-27 20:50:5
 #include "linux/mtd/mtd.h"
 #include "linux/types.h"
 
+#ifndef        CONFIG_YAFFS_USE_OLD_MTD
+#include "linux/mtd/nand.h"
+#endif
+
 
 int nandmtd_WriteChunkToNAND(yaffs_Device *dev,int chunkInNAND,const __u8 *data, yaffs_Spare *spare)
 {
@@ -34,11 +38,26 @@ int nandmtd_WriteChunkToNAND(yaffs_Device *dev,int chunkInNAND,const __u8 *data,
        
        
        __u8 *spareAsBytes = (__u8 *)spare;
-       
+
+#ifndef        CONFIG_YAFFS_USE_OLD_MTD
+       if(data && spare)
+       {
+#ifdef CONFIG_YAFFS_USE_NANDECC
+               mtd->write_ecc(mtd,addr,YAFFS_BYTES_PER_CHUNK,&dummy,data,spareAsBytes,NAND_YAFFS_OOB);
+#else
+               mtd->write_ecc(mtd,addr,YAFFS_BYTES_PER_CHUNK,&dummy,data,spareAsBytes,NAND_NONE_OOB);
+#endif
+       }
+       else
+       {
+#endif
        if(data)
                mtd->write(mtd,addr,YAFFS_BYTES_PER_CHUNK,&dummy,data);
        if(spare)
                mtd->write_oob(mtd,addr,YAFFS_BYTES_PER_SPARE,&dummy,spareAsBytes);
+#ifndef        CONFIG_YAFFS_USE_OLD_MTD
+       }
+#endif
 
        return YAFFS_OK;
 }
@@ -52,12 +71,27 @@ int nandmtd_ReadChunkFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *data, yaf
        loff_t addr = ((loff_t)chunkInNAND) * YAFFS_BYTES_PER_CHUNK;
        
        __u8 *spareAsBytes = (__u8 *)spare;
+
        
+#ifndef        CONFIG_YAFFS_USE_OLD_MTD
+       if(data && spare)
+       {
+#ifdef CONFIG_YAFFS_USE_NANDECC
+               mtd->read_ecc(mtd,addr,YAFFS_BYTES_PER_CHUNK,&dummy,data,spareAsBytes,NAND_YAFFS_OOB);
+#else
+               mtd->read_ecc(mtd,addr,YAFFS_BYTES_PER_CHUNK,&dummy,data,spareAsBytes,NAND_NONE_OOB);
+#endif 
+       }
+       else
+       {
+#endif
        if(data)
                mtd->read(mtd,addr,YAFFS_BYTES_PER_CHUNK,&dummy,data);
        if(spare)
                mtd->read_oob(mtd,addr,YAFFS_BYTES_PER_SPARE,&dummy,spareAsBytes);
-
+#ifndef        CONFIG_YAFFS_USE_OLD_MTD
+       }
+#endif
        return YAFFS_OK;
 }
 
index 28ce406f45563c70ad79197637f9f9469c2f3529..1a82ae5de13fee3190d32964411f139b0135cabf 100644 (file)
@@ -15,7 +15,7 @@
  //yaffs_ramem.c
  // Since this creates the RAM block at start up it is pretty useless for testing the scanner.
 
-const char *yaffs_ramem_c_version = "$Id: yaffs_ramem.c,v 1.5 2002-09-27 20:50:50 charles Exp $";
+const char *yaffs_ramem_c_version = "$Id: yaffs_ramem.c,v 1.6 2002-11-26 01:15:37 charles Exp $";
 
 #ifndef __KERNEL__
 #define CONFIG_YAFFS_RAM_ENABLED
@@ -38,7 +38,7 @@ const char *yaffs_ramem_c_version = "$Id: yaffs_ramem.c,v 1.5 2002-09-27 20:50:5
 #define FILE_SIZE_IN_BLOCKS (FILE_SIZE_IN_MEG * BLOCKS_PER_MEG)
 #define FILE_SIZE_IN_BYTES (FILE_SIZE_IN_BLOCKS * BLOCK_SIZE)
 
-#define T(x) YPRINTF(x)
+
 
 #define DEFAULT_SIZE_IN_MB 2
 
@@ -166,7 +166,7 @@ static int  CheckInit(void)
                }
                YFREE(ned.block);
                
-               T(("Allocation failed, could only allocate %dMB of %dMB requested.\n",
+               T(YAFFS_TRACE_ALWAYS,("Allocation failed, could only allocate %dMB of %dMB requested.\n",
                   nAllocated/64,sizeInMB));
                return 0;
        }
@@ -289,11 +289,11 @@ int nandemul_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
        
        if(blockNumber < 0 || blockNumber >= ned.nBlocks)
        {
-               T(("Attempt to erase non-existant block %d\n",blockNumber));
+               T(YAFFS_TRACE_ALWAYS,("Attempt to erase non-existant block %d\n",blockNumber));
        }
        else if(ned.block[blockNumber]->damaged)
        {
-               T(("Attempt to erase damaged block %d\n",blockNumber));
+               T(YAFFS_TRACE_ALWAYS,("Attempt to erase damaged block %d\n",blockNumber));
        }
        else
        {
index a7982ec3aadaf9ae7f7c2efb96002a049bbed45d..770d67c5c763dffc2423e8bee0a725bda635b61e 100644 (file)
Binary files a/yaffsdev.proj and b/yaffsdev.proj differ
index 42af9d197a037448566017db0c7950b47dea26b1..943cffe5071b90a35636ec45779dd248faca3648 100644 (file)
-/*\r
- * YAFFS: Yet another FFS. A NAND-flash specific file system. \r
- * yportenv.h: Portable services used by yaffs. This is done to allow\r
- * simple migration from kernel space into app space for testing.\r
- *\r
- * Copyright (C) 2002 Aleph One Ltd.\r
- *   for Toby Churchill Ltd and Brightstar Engineering\r
- *\r
- * Created by Charles Manning <charles@aleph1.co.uk>\r
- *\r
- * This program is free software; you can redistribute it and/or modify\r
- * it under the terms of the GNU Lesser General Public License version 2.1 as\r
- * published by the Free Software Foundation.\r
- *\r
- *\r
- * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.\r
- *\r
- * $Id: yportenv.h,v 1.6 2002-11-08 07:19:42 charles Exp $\r
- *\r
- */\r
\r
-#ifndef __YPORTENV_H__\r
-#define __YPORTENV_H__\r
-\r
-\r
-#if defined CONFIG_YAFFS_WINCE\r
-\r
-// CONFIG_YAFFS_WINCE\r
-#include "stdlib.h"\r
-#include "stdio.h"\r
-#include "string.h"\r
-\r
-#define YMALLOC(x) malloc(x)\r
-#define YFREE(x)   free(x)\r
-\r
-\r
-#define YINFO(s) YPRINTF(( __FILE__ " %d %s\n",__LINE__,s))\r
-#define YALERT(s) YINFO(s)\r
-\r
-#include <windows.h>\r
-\r
-#define YAFFS_LOSTNFOUND_NAME          "Lost Clusters"\r
-#define YAFFS_LOSTNFOUND_PREFIX                "OBJ"\r
-\r
-#define YPRINTF(x)\r
-\r
-// Always pass the sum compare to overcome the case insensitivity issue\r
-#define yaffs_SumCompare(x,y) ((x) == (y))\r
-#define yaffs_strcmp(a,b) _stricmp(a,b)\r
-\r
-\r
-#define u_char unsigned char\r
-#define loff_t int\r
-#define S_IFDIR                                                04000\r
-\r
-#define S_ISFIFO(x) 0\r
-#define S_ISCHR(x) 0\r
-#define S_ISBLK(x) 0\r
-#define S_ISSOCK(x) 0\r
-\r
-extern unsigned yfsd_U32FileTimeNow(void);\r
-\r
-#define CURRENT_TIME                            yfsd_U32FileTimeNow()\r
-#define YAFFS_ROOT_MODE                                FILE_ATTRIBUTE_ARCHIVE\r
-#define YAFFS_LOSTNFOUND_MODE          FILE_ATTRIBUTE_HIDDEN\r
-\r
-\r
-#define TENDSTR L"\r\n"\r
-#define TSTR(x) TEXT(x)\r
-#define TOUT(x) RETAILMSG(1, x)\r
-\r
-\r
-#elif  defined __KERNEL__\r
-\r
-\r
-\r
-// Linux kernel\r
-#include "linux/kernel.h"\r
-#include "linux/mm.h"\r
-#include "linux/string.h"\r
-#include "linux/slab.h"\r
-\r
-\r
-#define YAFFS_LOSTNFOUND_NAME          "lost+found"\r
-#define YAFFS_LOSTNFOUND_PREFIX                "obj"\r
-\r
-//#define YPRINTF(x) printk x\r
-#define YMALLOC(x) kmalloc(x,GFP_KERNEL)\r
-#define YFREE(x)   kfree(x)\r
-\r
-#define YAFFS_ROOT_MODE                                0666\r
-#define YAFFS_LOSTNFOUND_MODE          0666\r
-\r
-\r
-#define yaffs_SumCompare(x,y) ((x) == (y))\r
-#define yaffs_strcmp(a,b) strcmp(a,b)\r
-\r
-#define TENDSTR "\n"\r
-#define TSTR(x) KERN_DEBUG x\r
-#define TOUT(p) printk p\r
-\r
-\r
-#else\r
-\r
-// Linux application\r
-#include "stdlib.h"\r
-#include "stdio.h"\r
-#include "string.h"\r
-\r
-#define YMALLOC(x) malloc(x)\r
-#define YFREE(x)   free(x)\r
-\r
-\r
-//#define YINFO(s) YPRINTF(( __FILE__ " %d %s\n",__LINE__,s))\r
-//#define YALERT(s) YINFO(s)\r
-\r
-\r
-#define TENDSTR "\n"\r
-#define TSTR(x) x\r
-#define TOUT(p) printf p\r
-\r
-\r
-#define YAFFS_LOSTNFOUND_NAME          "lost+found"\r
-#define YAFFS_LOSTNFOUND_PREFIX                "obj"\r
-//#define YPRINTF(x) printf x\r
-\r
-#define CURRENT_TIME 0\r
-#define YAFFS_ROOT_MODE                                0666\r
-#define YAFFS_LOSTNFOUND_MODE          0666\r
-\r
-#define yaffs_SumCompare(x,y) ((x) == (y))\r
-#define yaffs_strcmp(a,b) strcmp(a,b)\r
-\r
-#endif \r
-\r
-\r
-extern unsigned yaffs_traceMask;\r
-\r
-#define YAFFS_TRACE_ERROR              0x0001\r
-#define YAFFS_TRACE_OS                 0x0002\r
-#define YAFFS_TRACE_ALLOCATE   0x0004\r
-#define YAFFS_TRACE_SCAN               0x0008\r
-#define YAFFS_TRACE_BAD_BLOCKS 0x0010\r
-#define YAFFS_TRACE_ERASE              0x0020\r
-#define YAFFS_TRACE_TRACING            0x0100\r
-#define YAFFS_TRACE_ALWAYS             0x0200\r
-#define YAFFS_TRACE_BUG                        0x8000\r
-\r
-#define T(mask,p) do{ if((mask) & (yaffs_traceMask | YAFFS_TRACE_ERROR)) TOUT(p);} while(0) \r
-\r
-//#undef YINFO\r
-\r
-\r
-//#define YINFO(s) YPRINTF((KERN_DEBUG __FILE__ " %d %s\n",__LINE__,s))\r
-//#define YALERT(s) YINFO(s)\r
-#ifdef CONFIG_YAFFS_WINCE\r
-#define YBUG() T(YAFFS_TRACE_BUG,(TSTR("==>> yaffs bug: %s %d" TENDSTR),TEXT(__FILE__),__LINE__))\r
-#else\r
-#define YBUG() T(YAFFS_TRACE_BUG,(TSTR("==>> yaffs bug: " __FILE__ " %d" TENDSTR),__LINE__))\r
-#endif\r
-#endif\r
+/*
+ * YAFFS: Yet another FFS. A NAND-flash specific file system. 
+ * yportenv.h: Portable services used by yaffs. This is done to allow
+ * simple migration from kernel space into app space for testing.
+ *
+ * Copyright (C) 2002 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1 as
+ * published by the Free Software Foundation.
+ *
+ *
+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
+ *
+ * $Id: yportenv.h,v 1.7 2002-11-26 01:15:37 charles Exp $
+ *
+ */
+#ifndef __YPORTENV_H__
+#define __YPORTENV_H__
+
+
+#if defined CONFIG_YAFFS_WINCE
+
+// CONFIG_YAFFS_WINCE
+#include "stdlib.h"
+#include "stdio.h"
+#include "string.h"
+
+#define YMALLOC(x) malloc(x)
+#define YFREE(x)   free(x)
+
+
+#define YINFO(s) YPRINTF(( __FILE__ " %d %s\n",__LINE__,s))
+#define YALERT(s) YINFO(s)
+
+#include <windows.h>
+
+#define YAFFS_LOSTNFOUND_NAME          "Lost Clusters"
+#define YAFFS_LOSTNFOUND_PREFIX                "OBJ"
+
+#define YPRINTF(x)
+
+// Always pass the sum compare to overcome the case insensitivity issue
+#define yaffs_SumCompare(x,y) ((x) == (y))
+#define yaffs_strcmp(a,b) _stricmp(a,b)
+
+
+#define u_char unsigned char
+#define loff_t int
+#define S_IFDIR                                                04000
+
+#define S_ISFIFO(x) 0
+#define S_ISCHR(x) 0
+#define S_ISBLK(x) 0
+#define S_ISSOCK(x) 0
+
+extern unsigned yfsd_U32FileTimeNow(void);
+
+#define CURRENT_TIME                            yfsd_U32FileTimeNow()
+#define YAFFS_ROOT_MODE                                FILE_ATTRIBUTE_ARCHIVE
+#define YAFFS_LOSTNFOUND_MODE          FILE_ATTRIBUTE_HIDDEN
+
+
+#define TENDSTR L"\r\n"
+#define TSTR(x) TEXT(x)
+#define TOUT(x) RETAILMSG(1, x)
+
+
+#elif  defined __KERNEL__
+
+
+
+// Linux kernel
+#include "linux/kernel.h"
+#include "linux/mm.h"
+#include "linux/string.h"
+#include "linux/slab.h"
+
+
+#define YAFFS_LOSTNFOUND_NAME          "lost+found"
+#define YAFFS_LOSTNFOUND_PREFIX                "obj"
+
+//#define YPRINTF(x) printk x
+#define YMALLOC(x) kmalloc(x,GFP_KERNEL)
+#define YFREE(x)   kfree(x)
+
+#define YAFFS_ROOT_MODE                                0666
+#define YAFFS_LOSTNFOUND_MODE          0666
+
+
+#define yaffs_SumCompare(x,y) ((x) == (y))
+#define yaffs_strcmp(a,b) strcmp(a,b)
+
+#define TENDSTR "\n"
+#define TSTR(x) KERN_DEBUG x
+#define TOUT(p) printk p
+
+
+#else
+
+// Linux application
+#include "stdlib.h"
+#include "stdio.h"
+#include "string.h"
+
+#define YMALLOC(x) malloc(x)
+#define YFREE(x)   free(x)
+
+
+//#define YINFO(s) YPRINTF(( __FILE__ " %d %s\n",__LINE__,s))
+//#define YALERT(s) YINFO(s)
+
+
+#define TENDSTR "\n"
+#define TSTR(x) x
+#define TOUT(p) printf p
+
+
+#define YAFFS_LOSTNFOUND_NAME          "lost+found"
+#define YAFFS_LOSTNFOUND_PREFIX                "obj"
+//#define YPRINTF(x) printf x
+
+#define CURRENT_TIME 0
+#define YAFFS_ROOT_MODE                                0666
+#define YAFFS_LOSTNFOUND_MODE          0666
+
+#define yaffs_SumCompare(x,y) ((x) == (y))
+#define yaffs_strcmp(a,b) strcmp(a,b)
+
+#endif 
+
+
+extern unsigned yaffs_traceMask;
+
+#define YAFFS_TRACE_ERROR              0x0001
+#define YAFFS_TRACE_OS                 0x0002
+#define YAFFS_TRACE_ALLOCATE   0x0004
+#define YAFFS_TRACE_SCAN               0x0008
+#define YAFFS_TRACE_BAD_BLOCKS 0x0010
+#define YAFFS_TRACE_ERASE              0x0020
+#define YAFFS_TRACE_TRACING            0x0100
+#define YAFFS_TRACE_ALWAYS             0x0200
+#define YAFFS_TRACE_BUG                        0x8000
+
+#define T(mask,p) do{ if((mask) & (yaffs_traceMask | YAFFS_TRACE_ERROR)) TOUT(p);} while(0) 
+
+//#undef YINFO
+
+
+//#define YINFO(s) YPRINTF((KERN_DEBUG __FILE__ " %d %s\n",__LINE__,s))
+//#define YALERT(s) YINFO(s)
+#ifdef CONFIG_YAFFS_WINCE
+#define YBUG() T(YAFFS_TRACE_BUG,(TSTR("==>> yaffs bug: %s %d" TENDSTR),TEXT(__FILE__),__LINE__))
+#else
+#define YBUG() T(YAFFS_TRACE_BUG,(TSTR("==>> yaffs bug: " __FILE__ " %d" TENDSTR),__LINE__))
+#endif
+#endif