github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 22:52:35 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Revert "temp revert yaffs change"

Browse Source 
This reverts commit 3349399fd5.

Conflicts:

	fs/yaffs2/yaffs_fs.c
	fs/yaffs2/yaffs_mtdif.c
This commit is contained in:
黄涛 2011-08-01 00:29:04 +08:00
parent 1c1c6123f4
commit 7f56e24137
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/yaffs2/yaffs_fs.c
View File

@ -2633,6 +2633,9 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,
param->nReservedBlocks = 5;
param->nShortOpCaches = (options.no_cache) ? 0 : 10;
param->inbandTags = options.inband_tags;
#if defined (CONFIG_ARCH_RK2818) || (CONFIG_ARCH_RK29)
dev->inbandTags = 1;
#endif
#ifdef CONFIG_YAFFS_DISABLE_LAZY_LOAD
param->disableLazyLoad = 1;

5
fs/yaffs2/yaffs_mtdif2.c
View File

@ -179,7 +179,12 @@ int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
if (localData)
yaffs_ReleaseTempBuffer(dev, data, __LINE__);
#ifdef CONFIG_MTD_NAND_RK29
//dxj 20101221@ if return -EBADMSG then i think the page is badchunk so just set the eccResult=YAFFS_ECC_RESULT_NO_ERROR
if (tags && retval == -EBADMSG /*&& tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR*/) {
#else
if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR) {
#endif
tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
dev->eccUnfixed++;
}