X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_nand.c;h=38989851ed7f24f4267f74a7fccd6af8a1e8327d;hp=989e8d91c43979220d1128949ed9f94e60e12393;hb=e6104fde6ee694e807c19a3bb7ba52b50cfb55af;hpb=a8e9cfa2968a5f16ff9ae578cc1d3202ebef8725

diff --git a/yaffs_nand.c b/yaffs_nand.c
index 989e8d9..3898985 100644
--- 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,11 +9,10 @@
  * 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.2 2006-09-21 08:13:59 charles Exp $";
+    "$Id: yaffs_nand.c,v 1.8 2007-12-13 15:35:18 wookey Exp $";
 
 #include "yaffs_nand.h"
 #include "yaffs_tagscompat.h"
@@ -25,9 +24,14 @@ int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
 					   yaffs_ExtendedTags * tags)
 {
 	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;
+
 	if (dev->readChunkWithTagsFromNAND)
 		result = dev->readChunkWithTagsFromNAND(dev, realignedChunkInNAND, buffer,
 						      tags);
@@ -35,14 +39,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;
+                yaffs_HandleChunkError(dev,bi);
 	}
-								
+
 	return result;
 }
 
@@ -53,7 +57,7 @@ int yaffs_WriteChunkWithTagsToNAND(yaffs_Device * dev,
 {
 	chunkInNAND -= dev->chunkOffset;
 
-	
+
 	if (tags) {
 		tags->sequenceNumber = dev->sequenceNumber;
 		tags->chunkUsed = 1;
@@ -118,9 +122,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;
 }
 
@@ -130,4 +131,4 @@ int yaffs_InitialiseNAND(struct yaffs_DeviceStruct *dev)
 }
 
 
- 
+