projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Only subtract softDeletions once ber block gc.
[yaffs2.git]
/
yaffs_nand.c
diff --git
a/yaffs_nand.c
b/yaffs_nand.c
index 989e8d91c43979220d1128949ed9f94e60e12393..bd815cb7af92b7dea0940e25ecd0daf9c19ebb58 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>
* for Toby Churchill Ltd and Brightstar Engineering
*
* Created by Charles Manning <charles@aleph1.co.uk>
@@
-9,25
+9,30
@@
* 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.
* 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 =
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.10 2009-03-06 17:20:54 wookey
Exp $";
#include "yaffs_nand.h"
#include "yaffs_tagscompat.h"
#include "yaffs_tagsvalidity.h"
#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,
- yaffs_ExtendedTags *
tags)
+int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
+ __u8 *buffer,
+ yaffs_ExtendedTags *tags)
{
int result;
{
int result;
-
+ yaffs_ExtendedTags localTags;
+
int realignedChunkInNAND = chunkInNAND - dev->chunkOffset;
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);
if (dev->readChunkWithTagsFromNAND)
result = dev->readChunkWithTagsFromNAND(dev, realignedChunkInNAND, buffer,
tags);
@@
-35,25
+40,25
@@
int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
result = yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(dev,
realignedChunkInNAND,
buffer,
result = yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(dev,
realignedChunkInNAND,
buffer,
- tags);
- if
(tags &&
- tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR){
-
+ tags);
+ if
(tags &&
+ tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR)
{
+
yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, chunkInNAND/dev->nChunksPerBlock);
yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, chunkInNAND/dev->nChunksPerBlock);
-
bi->gcPrioritise = 1
;
+
yaffs_HandleChunkError(dev, bi)
;
}
}
-
+
return result;
}
return result;
}
-int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *
dev,
+int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,
int chunkInNAND,
int chunkInNAND,
- const __u8 *
buffer,
- yaffs_ExtendedTags *
tags)
+ const __u8 *buffer,
+ yaffs_ExtendedTags *tags)
{
chunkInNAND -= dev->chunkOffset;
{
chunkInNAND -= dev->chunkOffset;
-
+
if (tags) {
tags->sequenceNumber = dev->sequenceNumber;
tags->chunkUsed = 1;
if (tags) {
tags->sequenceNumber = dev->sequenceNumber;
tags->chunkUsed = 1;
@@
-80,7
+85,7
@@
int yaffs_WriteChunkWithTagsToNAND(yaffs_Device * dev,
tags);
}
tags);
}
-int yaffs_MarkBlockBad(yaffs_Device *
dev, int blockNo)
+int yaffs_MarkBlockBad(yaffs_Device *dev, int blockNo)
{
blockNo -= dev->blockOffset;
{
blockNo -= dev->blockOffset;
@@
-91,10
+96,10
@@
int yaffs_MarkBlockBad(yaffs_Device * dev, int blockNo)
return yaffs_TagsCompatabilityMarkNANDBlockBad(dev, blockNo);
}
return yaffs_TagsCompatabilityMarkNANDBlockBad(dev, blockNo);
}
-int yaffs_QueryInitialBlockState(yaffs_Device *
dev,
+int yaffs_QueryInitialBlockState(yaffs_Device *dev,
int blockNo,
int blockNo,
- yaffs_BlockState *
state,
-
unsigned
*sequenceNumber)
+ yaffs_BlockState *state,
+
__u32
*sequenceNumber)
{
blockNo -= dev->blockOffset;
{
blockNo -= dev->blockOffset;
@@
-118,9
+123,6
@@
int yaffs_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
dev->nBlockErasures++;
result = dev->eraseBlockInNAND(dev, blockInNAND);
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;
}
return result;
}
@@
-130,4
+132,4
@@
int yaffs_InitialiseNAND(struct yaffs_DeviceStruct *dev)
}
}
-
+