diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2012-10-30 14:58:17 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2012-10-30 14:58:17 +0000 |
commit | 449f88df0f02fea3a7206d44daf62a553f9e819e (patch) | |
tree | ffd5be768cbfd686f28bba684734db5b9faf0829 /target/linux/generic/files/fs/yaffs2/yaffs_packedtags2.c | |
parent | 56190ed0fcdb453b218be4fcefa938850a81c83e (diff) | |
download | upstream-449f88df0f02fea3a7206d44daf62a553f9e819e.tar.gz upstream-449f88df0f02fea3a7206d44daf62a553f9e819e.tar.bz2 upstream-449f88df0f02fea3a7206d44daf62a553f9e819e.zip |
generic: fold yaffs_git_2010_10_20 patch to generic/files
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 34013
Diffstat (limited to 'target/linux/generic/files/fs/yaffs2/yaffs_packedtags2.c')
-rw-r--r-- | target/linux/generic/files/fs/yaffs2/yaffs_packedtags2.c | 182 |
1 files changed, 87 insertions, 95 deletions
diff --git a/target/linux/generic/files/fs/yaffs2/yaffs_packedtags2.c b/target/linux/generic/files/fs/yaffs2/yaffs_packedtags2.c index a78c03c9d6..6b854cb0eb 100644 --- a/target/linux/generic/files/fs/yaffs2/yaffs_packedtags2.c +++ b/target/linux/generic/files/fs/yaffs2/yaffs_packedtags2.c @@ -1,7 +1,7 @@ /* * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. * - * Copyright (C) 2002-2007 Aleph One Ltd. + * Copyright (C) 2002-2010 Aleph One Ltd. * for Toby Churchill Ltd and Brightstar Engineering * * Created by Charles Manning <charles@aleph1.co.uk> @@ -13,6 +13,7 @@ #include "yaffs_packedtags2.h" #include "yportenv.h" +#include "yaffs_trace.h" #include "yaffs_tagsvalidity.h" /* This code packs a set of extended tags into a binary structure for @@ -24,7 +25,7 @@ * This is defined by having the EXTRA_HEADER_INFO_FLAG set. */ -/* Extra flags applied to chunkId */ +/* Extra flags applied to chunk_id */ #define EXTRA_HEADER_INFO_FLAG 0x80000000 #define EXTRA_SHRINK_FLAG 0x40000000 @@ -42,53 +43,53 @@ static void yaffs_DumpPackedTags2TagsPart(const yaffs_PackedTags2TagsPart *ptt) { T(YAFFS_TRACE_MTD, (TSTR("packed tags obj %d chunk %d byte %d seq %d" TENDSTR), - ptt->objectId, ptt->chunkId, ptt->byteCount, - ptt->sequenceNumber)); + ptt->obj_id, ptt->chunk_id, ptt->n_bytes, + ptt->seq_number)); } static void yaffs_DumpPackedTags2(const yaffs_PackedTags2 *pt) { yaffs_DumpPackedTags2TagsPart(&pt->t); } -static void yaffs_DumpTags2(const yaffs_ExtendedTags *t) +static void yaffs_DumpTags2(const yaffs_ext_tags *t) { T(YAFFS_TRACE_MTD, (TSTR ("ext.tags eccres %d blkbad %d chused %d obj %d chunk%d byte %d del %d ser %d seq %d" - TENDSTR), t->eccResult, t->blockBad, t->chunkUsed, t->objectId, - t->chunkId, t->byteCount, t->chunkDeleted, t->serialNumber, - t->sequenceNumber)); + TENDSTR), t->ecc_result, t->block_bad, t->chunk_used, t->obj_id, + t->chunk_id, t->n_bytes, t->is_deleted, t->serial_number, + t->seq_number)); } void yaffs_PackTags2TagsPart(yaffs_PackedTags2TagsPart *ptt, - const yaffs_ExtendedTags *t) + const yaffs_ext_tags *t) { - ptt->chunkId = t->chunkId; - ptt->sequenceNumber = t->sequenceNumber; - ptt->byteCount = t->byteCount; - ptt->objectId = t->objectId; + ptt->chunk_id = t->chunk_id; + ptt->seq_number = t->seq_number; + ptt->n_bytes = t->n_bytes; + ptt->obj_id = t->obj_id; - if (t->chunkId == 0 && t->extraHeaderInfoAvailable) { + if (t->chunk_id == 0 && t->extra_available) { /* Store the extra header info instead */ - /* We save the parent object in the chunkId */ - ptt->chunkId = EXTRA_HEADER_INFO_FLAG - | t->extraParentObjectId; - if (t->extraIsShrinkHeader) - ptt->chunkId |= EXTRA_SHRINK_FLAG; - if (t->extraShadows) - ptt->chunkId |= EXTRA_SHADOWS_FLAG; - - ptt->objectId &= ~EXTRA_OBJECT_TYPE_MASK; - ptt->objectId |= - (t->extraObjectType << EXTRA_OBJECT_TYPE_SHIFT); - - if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK) - ptt->byteCount = t->extraEquivalentObjectId; - else if (t->extraObjectType == YAFFS_OBJECT_TYPE_FILE) - ptt->byteCount = t->extraFileLength; + /* We save the parent object in the chunk_id */ + ptt->chunk_id = EXTRA_HEADER_INFO_FLAG + | t->extra_parent_id; + if (t->extra_is_shrink) + ptt->chunk_id |= EXTRA_SHRINK_FLAG; + if (t->extra_shadows) + ptt->chunk_id |= EXTRA_SHADOWS_FLAG; + + ptt->obj_id &= ~EXTRA_OBJECT_TYPE_MASK; + ptt->obj_id |= + (t->extra_obj_type << EXTRA_OBJECT_TYPE_SHIFT); + + if (t->extra_obj_type == YAFFS_OBJECT_TYPE_HARDLINK) + ptt->n_bytes = t->extra_equiv_id; + else if (t->extra_obj_type == YAFFS_OBJECT_TYPE_FILE) + ptt->n_bytes = t->extra_length; else - ptt->byteCount = 0; + ptt->n_bytes = 0; } yaffs_DumpPackedTags2TagsPart(ptt); @@ -96,59 +97,56 @@ void yaffs_PackTags2TagsPart(yaffs_PackedTags2TagsPart *ptt, } -void yaffs_PackTags2(yaffs_PackedTags2 *pt, const yaffs_ExtendedTags *t) +void yaffs_PackTags2(yaffs_PackedTags2 *pt, const yaffs_ext_tags *t, int tagsECC) { yaffs_PackTags2TagsPart(&pt->t, t); -#ifndef YAFFS_IGNORE_TAGS_ECC - { - yaffs_ECCCalculateOther((unsigned char *)&pt->t, + if(tagsECC) + yaffs_ecc_calc_other((unsigned char *)&pt->t, sizeof(yaffs_PackedTags2TagsPart), &pt->ecc); - } -#endif } -void yaffs_UnpackTags2TagsPart(yaffs_ExtendedTags *t, +void yaffs_unpack_tags2tags_part(yaffs_ext_tags *t, yaffs_PackedTags2TagsPart *ptt) { - memset(t, 0, sizeof(yaffs_ExtendedTags)); + memset(t, 0, sizeof(yaffs_ext_tags)); - yaffs_InitialiseTags(t); + yaffs_init_tags(t); - if (ptt->sequenceNumber != 0xFFFFFFFF) { - t->blockBad = 0; - t->chunkUsed = 1; - t->objectId = ptt->objectId; - t->chunkId = ptt->chunkId; - t->byteCount = ptt->byteCount; - t->chunkDeleted = 0; - t->serialNumber = 0; - t->sequenceNumber = ptt->sequenceNumber; + if (ptt->seq_number != 0xFFFFFFFF) { + t->block_bad = 0; + t->chunk_used = 1; + t->obj_id = ptt->obj_id; + t->chunk_id = ptt->chunk_id; + t->n_bytes = ptt->n_bytes; + t->is_deleted = 0; + t->serial_number = 0; + t->seq_number = ptt->seq_number; /* Do extra header info stuff */ - if (ptt->chunkId & EXTRA_HEADER_INFO_FLAG) { - t->chunkId = 0; - t->byteCount = 0; - - t->extraHeaderInfoAvailable = 1; - t->extraParentObjectId = - ptt->chunkId & (~(ALL_EXTRA_FLAGS)); - t->extraIsShrinkHeader = - (ptt->chunkId & EXTRA_SHRINK_FLAG) ? 1 : 0; - t->extraShadows = - (ptt->chunkId & EXTRA_SHADOWS_FLAG) ? 1 : 0; - t->extraObjectType = - ptt->objectId >> EXTRA_OBJECT_TYPE_SHIFT; - t->objectId &= ~EXTRA_OBJECT_TYPE_MASK; - - if (t->extraObjectType == YAFFS_OBJECT_TYPE_HARDLINK) - t->extraEquivalentObjectId = ptt->byteCount; + if (ptt->chunk_id & EXTRA_HEADER_INFO_FLAG) { + t->chunk_id = 0; + t->n_bytes = 0; + + t->extra_available = 1; + t->extra_parent_id = + ptt->chunk_id & (~(ALL_EXTRA_FLAGS)); + t->extra_is_shrink = + (ptt->chunk_id & EXTRA_SHRINK_FLAG) ? 1 : 0; + t->extra_shadows = + (ptt->chunk_id & EXTRA_SHADOWS_FLAG) ? 1 : 0; + t->extra_obj_type = + ptt->obj_id >> EXTRA_OBJECT_TYPE_SHIFT; + t->obj_id &= ~EXTRA_OBJECT_TYPE_MASK; + + if (t->extra_obj_type == YAFFS_OBJECT_TYPE_HARDLINK) + t->extra_equiv_id = ptt->n_bytes; else - t->extraFileLength = ptt->byteCount; + t->extra_length = ptt->n_bytes; } } @@ -158,49 +156,43 @@ void yaffs_UnpackTags2TagsPart(yaffs_ExtendedTags *t, } -void yaffs_UnpackTags2(yaffs_ExtendedTags *t, yaffs_PackedTags2 *pt) +void yaffs_unpack_tags2(yaffs_ext_tags *t, yaffs_PackedTags2 *pt, int tagsECC) { - yaffs_ECCResult eccResult = YAFFS_ECC_RESULT_NO_ERROR; - - if (pt->t.sequenceNumber != 0xFFFFFFFF) { - /* Page is in use */ -#ifndef YAFFS_IGNORE_TAGS_ECC - { - yaffs_ECCOther ecc; - int result; - yaffs_ECCCalculateOther((unsigned char *)&pt->t, - sizeof - (yaffs_PackedTags2TagsPart), - &ecc); - result = - yaffs_ECCCorrectOther((unsigned char *)&pt->t, - sizeof - (yaffs_PackedTags2TagsPart), - &pt->ecc, &ecc); - switch (result) { + yaffs_ecc_result ecc_result = YAFFS_ECC_RESULT_NO_ERROR; + + if (pt->t.seq_number != 0xFFFFFFFF && + tagsECC){ + /* Chunk is in use and we need to do ECC */ + + yaffs_ECCOther ecc; + int result; + yaffs_ecc_calc_other((unsigned char *)&pt->t, + sizeof(yaffs_PackedTags2TagsPart), + &ecc); + result = yaffs_ecc_correct_other((unsigned char *)&pt->t, + sizeof(yaffs_PackedTags2TagsPart), + &pt->ecc, &ecc); + switch (result) { case 0: - eccResult = YAFFS_ECC_RESULT_NO_ERROR; + ecc_result = YAFFS_ECC_RESULT_NO_ERROR; break; case 1: - eccResult = YAFFS_ECC_RESULT_FIXED; + ecc_result = YAFFS_ECC_RESULT_FIXED; break; case -1: - eccResult = YAFFS_ECC_RESULT_UNFIXED; + ecc_result = YAFFS_ECC_RESULT_UNFIXED; break; default: - eccResult = YAFFS_ECC_RESULT_UNKNOWN; - } + ecc_result = YAFFS_ECC_RESULT_UNKNOWN; } -#endif } - yaffs_UnpackTags2TagsPart(t, &pt->t); + yaffs_unpack_tags2tags_part(t, &pt->t); - t->eccResult = eccResult; + t->ecc_result = ecc_result; yaffs_DumpPackedTags2(pt); yaffs_DumpTags2(t); - } |