temp revert yaffs change

diff --git a/fs/yaffs2/yaffs_fs.c b/fs/yaffs2/yaffs_fs.c
index 2910bac817b448952840fadc68be022515cbc1a1..4c155aef0a35c929f550f1aaa86a82a988af04d6 100644 (file)
--- a/fs/yaffs2/yaffs_fs.c
+++ b/fs/yaffs2/yaffs_fs.c
@@ -2189,9 +2189,6 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,
        dev->nReservedBlocks = 5;
        dev->nShortOpCaches = (options.no_cache) ? 0 : 10;
        dev->inbandTags = options.inband_tags;
-#if defined (CONFIG_ARCH_RK2818) || (CONFIG_ARCH_RK29)
-       dev->inbandTags = 1;
-#endif
 
        /* ... and the functions. */
        if (yaffsVersion == 2) {

diff --git a/fs/yaffs2/yaffs_mtdif.c b/fs/yaffs2/yaffs_mtdif.c
index ad18fd59eb1054905a9d4c25d43da18eb356b519..72f64203f31f86b90061d269b9fbb745fa2025a9 100644 (file)
--- a/fs/yaffs2/yaffs_mtdif.c
+++ b/fs/yaffs2/yaffs_mtdif.c
@@ -209,14 +209,14 @@ int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
 {
        struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
        __u32 addr =
-           ((loff_t) blockNumber) * dev->totalBytesPerChunk
+           ((loff_t) blockNumber) * dev->nDataBytesPerChunk
                * dev->nChunksPerBlock;
        struct erase_info ei;
        int retval = 0;
 
        ei.mtd = mtd;
        ei.addr = addr;
-       ei.len = dev->totalBytesPerChunk * dev->nChunksPerBlock;
+       ei.len = dev->nDataBytesPerChunk * dev->nChunksPerBlock;
        ei.time = 1000;
        ei.retries = 2;
        ei.callback = NULL;

diff --git a/fs/yaffs2/yaffs_mtdif2.c b/fs/yaffs2/yaffs_mtdif2.c
index afe076f6775ecf0a63bdc11bc5a0a888f3dfa2b2..282a093d854d43b8a7914d049b1d8654349b7dcb 100644 (file)
--- a/fs/yaffs2/yaffs_mtdif2.c
+++ b/fs/yaffs2/yaffs_mtdif2.c
@@ -173,12 +173,7 @@ 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++;
        }