Change kernel patchin script for 2.6.28 friendliness

[yaffs2.git] / yaffs_nand.c

diff --git a/yaffs_nand.c b/yaffs_nand.c
index 26acf201d76cfd2e6ee09795328b87b45b47d873..af4215772482a2b11db0c77ad1885f75180f0712 100644 (file)
--- a/yaffs_nand.c
+++ b/yaffs_nand.c
@@ -1,7 +1,7 @@
 /*
- * YAFFS: Yet another FFS. A NAND-flash specific file system. 
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
- * Copyright (C) 2002 Aleph One Ltd.
+ * Copyright (C) 2002-2007 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
@@ -9,16 +9,16 @@
  * 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.
- *
  */
- 
+
 const char *yaffs_nand_c_version =
-    "$Id: yaffs_nand.c,v 1.3 2006-10-03 10:13:03 charles Exp $";
+    "$Id: yaffs_nand.c,v 1.9 2008-05-05 07:58:58 charles Exp $";
 
 #include "yaffs_nand.h"
 #include "yaffs_tagscompat.h"
 #include "yaffs_tagsvalidity.h"
 
+#include "yaffs_getblockinfo.h"
 
 int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
                                           __u8 * buffer,
@@ -26,9 +26,9 @@ int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
 {
        int result;
        yaffs_ExtendedTags localTags;
-       
+
        int realignedChunkInNAND = chunkInNAND - dev->chunkOffset;
-       
+
        /* If there are no tags provided, use local tags to get prioritised gc working */
        if(!tags)
                tags = &localTags;
@@ -40,15 +40,14 @@ int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
                result = yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(dev,
                                                                        realignedChunkInNAND,
                                                                        buffer,
-                                                                       tags);  
-       if(tags && 
+                                                                       tags);
+       if(tags &&
           tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR){
-       
+
                yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, chunkInNAND/dev->nChunksPerBlock);
-               bi->gcPrioritise = 1;
-               dev->hasPendingPrioritisedGCs = 1;
+                yaffs_HandleChunkError(dev,bi);
        }
-                                                               
+
        return result;
 }
 
@@ -59,7 +58,7 @@ int yaffs_WriteChunkWithTagsToNAND(yaffs_Device * dev,
 {
        chunkInNAND -= dev->chunkOffset;
 
-       
+
        if (tags) {
                tags->sequenceNumber = dev->sequenceNumber;
                tags->chunkUsed = 1;
@@ -100,7 +99,7 @@ int yaffs_MarkBlockBad(yaffs_Device * dev, int blockNo)
 int yaffs_QueryInitialBlockState(yaffs_Device * dev,
                                                 int blockNo,
                                                 yaffs_BlockState * state,
-                                                unsigned *sequenceNumber)
+                                                __u32 *sequenceNumber)
 {
        blockNo -= dev->blockOffset;
 
@@ -124,9 +123,6 @@ int yaffs_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
        dev->nBlockErasures++;
        result = dev->eraseBlockInNAND(dev, blockInNAND);
 
-       /* If at first we don't succeed, try again *once*.*/
-       if (!result)
-               result = dev->eraseBlockInNAND(dev, blockInNAND);       
        return result;
 }
 
@@ -136,4 +132,4 @@ int yaffs_InitialiseNAND(struct yaffs_DeviceStruct *dev)
 }
 
 
- 
+