yaffs Fix incorrect handling of deletion flag

[yaffs2.git] / yaffs_nand.c

diff --git a/yaffs_nand.c b/yaffs_nand.c
index bd815cb7af92b7dea0940e25ecd0daf9c19ebb58..6964ad18c0d567a04ddf404e4d5dcaf09e720a17 100644 (file)
--- a/yaffs_nand.c
+++ b/yaffs_nand.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
@@ -11,9 +11,6 @@
  * published by the Free Software Foundation.
  */
 
-const char *yaffs_nand_c_version =
-       "$Id: yaffs_nand.c,v 1.10 2009-03-06 17:20:54 wookey Exp $";
-
 #include "yaffs_nand.h"
 #include "yaffs_tagscompat.h"
 #include "yaffs_tagsvalidity.h"
@@ -29,12 +26,14 @@ int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
 
        int realignedChunkInNAND = chunkInNAND - dev->chunkOffset;
 
+       dev->nPageReads++;
+
        /* If there are no tags provided, use local tags to get prioritised gc working */
        if (!tags)
                tags = &localTags;
 
-       if (dev->readChunkWithTagsFromNAND)
-               result = dev->readChunkWithTagsFromNAND(dev, realignedChunkInNAND, buffer,
+       if (dev->param.readChunkWithTagsFromNAND)
+               result = dev->param.readChunkWithTagsFromNAND(dev, realignedChunkInNAND, buffer,
                                                      tags);
        else
                result = yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(dev,
@@ -44,7 +43,8 @@ int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
        if (tags &&
           tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR) {
 
-               yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, chunkInNAND/dev->nChunksPerBlock);
+               yaffs_BlockInfo *bi;
+               bi = yaffs_GetBlockInfo(dev, chunkInNAND/dev->param.nChunksPerBlock);
                yaffs_HandleChunkError(dev, bi);
        }
 
@@ -56,6 +56,9 @@ int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,
                                                   const __u8 *buffer,
                                                   yaffs_ExtendedTags *tags)
 {
+
+       dev->nPageWrites++;
+
        chunkInNAND -= dev->chunkOffset;
 
 
@@ -75,8 +78,8 @@ int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,
                YBUG();
        }
 
-       if (dev->writeChunkWithTagsToNAND)
-               return dev->writeChunkWithTagsToNAND(dev, chunkInNAND, buffer,
+       if (dev->param.writeChunkWithTagsToNAND)
+               return dev->param.writeChunkWithTagsToNAND(dev, chunkInNAND, buffer,
                                                     tags);
        else
                return yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(dev,
@@ -89,9 +92,9 @@ int yaffs_MarkBlockBad(yaffs_Device *dev, int blockNo)
 {
        blockNo -= dev->blockOffset;
 
-;
-       if (dev->markNANDBlockBad)
-               return dev->markNANDBlockBad(dev, blockNo);
+
+       if (dev->param.markNANDBlockBad)
+               return dev->param.markNANDBlockBad(dev, blockNo);
        else
                return yaffs_TagsCompatabilityMarkNANDBlockBad(dev, blockNo);
 }
@@ -103,8 +106,8 @@ int yaffs_QueryInitialBlockState(yaffs_Device *dev,
 {
        blockNo -= dev->blockOffset;
 
-       if (dev->queryNANDBlock)
-               return dev->queryNANDBlock(dev, blockNo, state, sequenceNumber);
+       if (dev->param.queryNANDBlock)
+               return dev->param.queryNANDBlock(dev, blockNo, state, sequenceNumber);
        else
                return yaffs_TagsCompatabilityQueryNANDBlock(dev, blockNo,
                                                             state,
@@ -119,16 +122,18 @@ int yaffs_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
 
        blockInNAND -= dev->blockOffset;
 
-
        dev->nBlockErasures++;
-       result = dev->eraseBlockInNAND(dev, blockInNAND);
+
+       result = dev->param.eraseBlockInNAND(dev, blockInNAND);
 
        return result;
 }
 
 int yaffs_InitialiseNAND(struct yaffs_DeviceStruct *dev)
 {
-       return dev->initialiseNAND(dev);
+       if(dev->param.initialiseNAND)
+               return dev->param.initialiseNAND(dev);
+       return YAFFS_OK;
 }