#include "yaffs_getblockinfo.h"
#include "yaffs_nand.h"
-int yaffs_skip_verification(yaffs_Device *dev)
+int yaffs_skip_verification(struct yaffs_dev *dev)
{
dev=dev;
return !(yaffs_trace_mask & (YAFFS_TRACE_VERIFY | YAFFS_TRACE_VERIFY_FULL));
}
-static int yaffs_skip_full_verification(yaffs_Device *dev)
+static int yaffs_skip_full_verification(struct yaffs_dev *dev)
{
dev=dev;
return !(yaffs_trace_mask & (YAFFS_TRACE_VERIFY_FULL));
}
-static int yaffs_skip_nand_verification(yaffs_Device *dev)
+static int yaffs_skip_nand_verification(struct yaffs_dev *dev)
{
dev=dev;
return !(yaffs_trace_mask & (YAFFS_TRACE_VERIFY_NAND));
}
-static const char *blockStateName[] = {
+static const char *block_state_name[] = {
"Unknown",
"Needs scanning",
"Scanning",
};
-void yaffs_verify_blk(yaffs_Device *dev, yaffs_BlockInfo *bi, int n)
+void yaffs_verify_blk(struct yaffs_dev *dev, yaffs_block_info_t *bi, int n)
{
- int actuallyUsed;
- int inUse;
+ int actually_used;
+ int in_use;
if (yaffs_skip_verification(dev))
return;
/* Report illegal runtime states */
- if (bi->blockState >= YAFFS_NUMBER_OF_BLOCK_STATES)
- T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has undefined state %d"TENDSTR), n, bi->blockState));
+ if (bi->block_state >= YAFFS_NUMBER_OF_BLOCK_STATES)
+ T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has undefined state %d"TENDSTR), n, bi->block_state));
- switch (bi->blockState) {
+ switch (bi->block_state) {
case YAFFS_BLOCK_STATE_UNKNOWN:
case YAFFS_BLOCK_STATE_SCANNING:
case YAFFS_BLOCK_STATE_NEEDS_SCANNING:
T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has bad run-state %s"TENDSTR),
- n, blockStateName[bi->blockState]));
+ n, block_state_name[bi->block_state]));
}
/* Check pages in use and soft deletions are legal */
- actuallyUsed = bi->pagesInUse - bi->softDeletions;
+ actually_used = bi->pages_in_use - bi->soft_del_pages;
- if (bi->pagesInUse < 0 || bi->pagesInUse > dev->param.nChunksPerBlock ||
- bi->softDeletions < 0 || bi->softDeletions > dev->param.nChunksPerBlock ||
- actuallyUsed < 0 || actuallyUsed > dev->param.nChunksPerBlock)
- T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has illegal values pagesInUsed %d softDeletions %d"TENDSTR),
- n, bi->pagesInUse, bi->softDeletions));
+ if (bi->pages_in_use < 0 || bi->pages_in_use > dev->param.chunks_per_block ||
+ bi->soft_del_pages < 0 || bi->soft_del_pages > dev->param.chunks_per_block ||
+ actually_used < 0 || actually_used > dev->param.chunks_per_block)
+ T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has illegal values pages_in_used %d soft_del_pages %d"TENDSTR),
+ n, bi->pages_in_use, bi->soft_del_pages));
/* Check chunk bitmap legal */
- inUse = yaffs_count_chunk_bits(dev, n);
- if (inUse != bi->pagesInUse)
- T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has inconsistent values pagesInUse %d counted chunk bits %d"TENDSTR),
- n, bi->pagesInUse, inUse));
+ in_use = yaffs_count_chunk_bits(dev, n);
+ if (in_use != bi->pages_in_use)
+ T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has inconsistent values pages_in_use %d counted chunk bits %d"TENDSTR),
+ n, bi->pages_in_use, in_use));
}
-void yaffs_verify_collected_blk(yaffs_Device *dev, yaffs_BlockInfo *bi, int n)
+void yaffs_verify_collected_blk(struct yaffs_dev *dev, yaffs_block_info_t *bi, int n)
{
yaffs_verify_blk(dev, bi, n);
/* After collection the block should be in the erased state */
- if (bi->blockState != YAFFS_BLOCK_STATE_COLLECTING &&
- bi->blockState != YAFFS_BLOCK_STATE_EMPTY) {
+ if (bi->block_state != YAFFS_BLOCK_STATE_COLLECTING &&
+ bi->block_state != YAFFS_BLOCK_STATE_EMPTY) {
T(YAFFS_TRACE_ERROR, (TSTR("Block %d is in state %d after gc, should be erased"TENDSTR),
- n, bi->blockState));
+ n, bi->block_state));
}
}
-void yaffs_verify_blocks(yaffs_Device *dev)
+void yaffs_verify_blocks(struct yaffs_dev *dev)
{
int i;
- int nBlocksPerState[YAFFS_NUMBER_OF_BLOCK_STATES];
- int nIllegalBlockStates = 0;
+ int state_count[YAFFS_NUMBER_OF_BLOCK_STATES];
+ int illegal_states = 0;
if (yaffs_skip_verification(dev))
return;
- memset(nBlocksPerState, 0, sizeof(nBlocksPerState));
+ memset(state_count, 0, sizeof(state_count));
- for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
- yaffs_BlockInfo *bi = yaffs_get_block_info(dev, i);
+ for (i = dev->internal_start_block; i <= dev->internal_end_block; i++) {
+ yaffs_block_info_t *bi = yaffs_get_block_info(dev, i);
yaffs_verify_blk(dev, bi, i);
- if (bi->blockState < YAFFS_NUMBER_OF_BLOCK_STATES)
- nBlocksPerState[bi->blockState]++;
+ if (bi->block_state < YAFFS_NUMBER_OF_BLOCK_STATES)
+ state_count[bi->block_state]++;
else
- nIllegalBlockStates++;
+ illegal_states++;
}
T(YAFFS_TRACE_VERIFY, (TSTR(""TENDSTR)));
T(YAFFS_TRACE_VERIFY, (TSTR("Block summary"TENDSTR)));
- T(YAFFS_TRACE_VERIFY, (TSTR("%d blocks have illegal states"TENDSTR), nIllegalBlockStates));
- if (nBlocksPerState[YAFFS_BLOCK_STATE_ALLOCATING] > 1)
+ T(YAFFS_TRACE_VERIFY, (TSTR("%d blocks have illegal states"TENDSTR), illegal_states));
+ if (state_count[YAFFS_BLOCK_STATE_ALLOCATING] > 1)
T(YAFFS_TRACE_VERIFY, (TSTR("Too many allocating blocks"TENDSTR)));
for (i = 0; i < YAFFS_NUMBER_OF_BLOCK_STATES; i++)
T(YAFFS_TRACE_VERIFY,
(TSTR("%s %d blocks"TENDSTR),
- blockStateName[i], nBlocksPerState[i]));
+ block_state_name[i], state_count[i]));
- if (dev->blocksInCheckpoint != nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT])
+ if (dev->blocks_in_checkpt != state_count[YAFFS_BLOCK_STATE_CHECKPOINT])
T(YAFFS_TRACE_VERIFY,
(TSTR("Checkpoint block count wrong dev %d count %d"TENDSTR),
- dev->blocksInCheckpoint, nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT]));
+ dev->blocks_in_checkpt, state_count[YAFFS_BLOCK_STATE_CHECKPOINT]));
- if (dev->nErasedBlocks != nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY])
+ if (dev->n_erased_blocks != state_count[YAFFS_BLOCK_STATE_EMPTY])
T(YAFFS_TRACE_VERIFY,
(TSTR("Erased block count wrong dev %d count %d"TENDSTR),
- dev->nErasedBlocks, nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY]));
+ dev->n_erased_blocks, state_count[YAFFS_BLOCK_STATE_EMPTY]));
- if (nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING] > 1)
+ if (state_count[YAFFS_BLOCK_STATE_COLLECTING] > 1)
T(YAFFS_TRACE_VERIFY,
(TSTR("Too many collecting blocks %d (max is 1)"TENDSTR),
- nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING]));
+ state_count[YAFFS_BLOCK_STATE_COLLECTING]));
T(YAFFS_TRACE_VERIFY, (TSTR(""TENDSTR)));
* Verify the object header. oh must be valid, but obj and tags may be NULL in which
* case those tests will not be performed.
*/
-void yaffs_verify_oh(yaffs_Object *obj, yaffs_ObjectHeader *oh, yaffs_ExtendedTags *tags, int parentCheck)
+void yaffs_verify_oh(struct yaffs_obj *obj, struct yaffs_obj_hdr *oh, struct yaffs_ext_tags *tags, int parent_check)
{
- if (obj && yaffs_skip_verification(obj->myDev))
+ if (obj && yaffs_skip_verification(obj->my_dev))
return;
if (!(tags && obj && oh)) {
oh->type > YAFFS_OBJECT_TYPE_MAX)
T(YAFFS_TRACE_VERIFY,
(TSTR("Obj %d header type is illegal value 0x%x"TENDSTR),
- tags->objectId, oh->type));
+ tags->obj_id, oh->type));
- if (tags->objectId != obj->objectId)
+ if (tags->obj_id != obj->obj_id)
T(YAFFS_TRACE_VERIFY,
- (TSTR("Obj %d header mismatch objectId %d"TENDSTR),
- tags->objectId, obj->objectId));
+ (TSTR("Obj %d header mismatch obj_id %d"TENDSTR),
+ tags->obj_id, obj->obj_id));
/*
- * Check that the object's parent ids match if parentCheck requested.
+ * Check that the object's parent ids match if parent_check requested.
*
* Tests do not apply to the root object.
*/
- if (parentCheck && tags->objectId > 1 && !obj->parent)
+ if (parent_check && tags->obj_id > 1 && !obj->parent)
T(YAFFS_TRACE_VERIFY,
- (TSTR("Obj %d header mismatch parentId %d obj->parent is NULL"TENDSTR),
- tags->objectId, oh->parentObjectId));
+ (TSTR("Obj %d header mismatch parent_id %d obj->parent is NULL"TENDSTR),
+ tags->obj_id, oh->parent_obj_id));
- if (parentCheck && obj->parent &&
- oh->parentObjectId != obj->parent->objectId &&
- (oh->parentObjectId != YAFFS_OBJECTID_UNLINKED ||
- obj->parent->objectId != YAFFS_OBJECTID_DELETED))
+ if (parent_check && obj->parent &&
+ oh->parent_obj_id != obj->parent->obj_id &&
+ (oh->parent_obj_id != YAFFS_OBJECTID_UNLINKED ||
+ obj->parent->obj_id != YAFFS_OBJECTID_DELETED))
T(YAFFS_TRACE_VERIFY,
- (TSTR("Obj %d header mismatch parentId %d parentObjectId %d"TENDSTR),
- tags->objectId, oh->parentObjectId, obj->parent->objectId));
+ (TSTR("Obj %d header mismatch parent_id %d parent_obj_id %d"TENDSTR),
+ tags->obj_id, oh->parent_obj_id, obj->parent->obj_id));
- if (tags->objectId > 1 && oh->name[0] == 0) /* Null name */
+ if (tags->obj_id > 1 && oh->name[0] == 0) /* Null name */
T(YAFFS_TRACE_VERIFY,
(TSTR("Obj %d header name is NULL"TENDSTR),
- obj->objectId));
+ obj->obj_id));
- if (tags->objectId > 1 && ((__u8)(oh->name[0])) == 0xff) /* Trashed name */
+ if (tags->obj_id > 1 && ((u8)(oh->name[0])) == 0xff) /* Trashed name */
T(YAFFS_TRACE_VERIFY,
(TSTR("Obj %d header name is 0xFF"TENDSTR),
- obj->objectId));
+ obj->obj_id));
}
-#if 0
-/* Not being used, but don't want to throw away yet */
-int yaffs_verify_tnode_worker(yaffs_Object *obj, yaffs_tnode_t *tn,
- __u32 level, int chunkOffset)
-{
- int i;
- yaffs_Device *dev = obj->myDev;
- int ok = 1;
-
- if (tn) {
- if (level > 0) {
-
- for (i = 0; i < YAFFS_NTNODES_INTERNAL && ok; i++) {
- if (tn->internal[i]) {
- ok = yaffs_verify_tnode_worker(obj,
- tn->internal[i],
- level - 1,
- (chunkOffset<<YAFFS_TNODES_INTERNAL_BITS) + i);
- }
- }
- } else if (level == 0) {
- yaffs_ExtendedTags tags;
- __u32 objectId = obj->objectId;
-
- chunkOffset <<= YAFFS_TNODES_LEVEL0_BITS;
-
- for (i = 0; i < YAFFS_NTNODES_LEVEL0; i++) {
- __u32 theChunk = yaffs_get_group_base(dev, tn, i);
-
- if (theChunk > 0) {
- /* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),tags.objectId,tags.chunkId,theChunk)); */
- yaffs_rd_chunk_tags_nand(dev, theChunk, NULL, &tags);
- if (tags.objectId != objectId || tags.chunkId != chunkOffset) {
- T(~0, (TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
- objectId, chunkOffset, theChunk,
- tags.objectId, tags.chunkId));
- }
- }
- chunkOffset++;
- }
- }
- }
- return ok;
-
-}
-
-#endif
-
-void yaffs_verify_file(yaffs_Object *obj)
+void yaffs_verify_file(struct yaffs_obj *obj)
{
- int requiredTallness;
- int actualTallness;
- __u32 lastChunk;
- __u32 x;
- __u32 i;
- yaffs_Device *dev;
- yaffs_ExtendedTags tags;
+ int required_depth;
+ int actual_depth;
+ u32 last_chunk;
+ u32 x;
+ u32 i;
+ struct yaffs_dev *dev;
+ struct yaffs_ext_tags tags;
yaffs_tnode_t *tn;
- __u32 objectId;
+ u32 obj_id;
if (!obj)
return;
- if (yaffs_skip_verification(obj->myDev))
+ if (yaffs_skip_verification(obj->my_dev))
return;
- dev = obj->myDev;
- objectId = obj->objectId;
+ dev = obj->my_dev;
+ obj_id = obj->obj_id;
/* Check file size is consistent with tnode depth */
- lastChunk = obj->variant.fileVariant.fileSize / dev->nDataBytesPerChunk + 1;
- x = lastChunk >> YAFFS_TNODES_LEVEL0_BITS;
- requiredTallness = 0;
+ last_chunk = obj->variant.file_variant.file_size / dev->data_bytes_per_chunk + 1;
+ x = last_chunk >> YAFFS_TNODES_LEVEL0_BITS;
+ required_depth = 0;
while (x > 0) {
x >>= YAFFS_TNODES_INTERNAL_BITS;
- requiredTallness++;
+ required_depth++;
}
- actualTallness = obj->variant.fileVariant.topLevel;
+ actual_depth = obj->variant.file_variant.top_level;
/* Check that the chunks in the tnode tree are all correct.
* We do this by scanning through the tnode tree and
if (yaffs_skip_nand_verification(dev))
return;
- for (i = 1; i <= lastChunk; i++) {
- tn = yaffs_find_tnode_0(dev, &obj->variant.fileVariant, i);
+ for (i = 1; i <= last_chunk; i++) {
+ tn = yaffs_find_tnode_0(dev, &obj->variant.file_variant, i);
if (tn) {
- __u32 theChunk = yaffs_get_group_base(dev, tn, i);
- if (theChunk > 0) {
- /* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),objectId,i,theChunk)); */
- yaffs_rd_chunk_tags_nand(dev, theChunk, NULL, &tags);
- if (tags.objectId != objectId || tags.chunkId != i) {
- T(~0, (TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
- objectId, i, theChunk,
- tags.objectId, tags.chunkId));
+ u32 the_chunk = yaffs_get_group_base(dev, tn, i);
+ if (the_chunk > 0) {
+ /* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),obj_id,i,the_chunk)); */
+ yaffs_rd_chunk_tags_nand(dev, the_chunk, NULL, &tags);
+ if (tags.obj_id != obj_id || tags.chunk_id != i) {
+ T(~0, (TSTR("Object %d chunk_id %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
+ obj_id, i, the_chunk,
+ tags.obj_id, tags.chunk_id));
}
}
}
}
-void yaffs_verify_link(yaffs_Object *obj)
+void yaffs_verify_link(struct yaffs_obj *obj)
{
- if (obj && yaffs_skip_verification(obj->myDev))
+ if (obj && yaffs_skip_verification(obj->my_dev))
return;
/* Verify sane equivalent object */
}
-void yaffs_verify_symlink(yaffs_Object *obj)
+void yaffs_verify_symlink(struct yaffs_obj *obj)
{
- if (obj && yaffs_skip_verification(obj->myDev))
+ if (obj && yaffs_skip_verification(obj->my_dev))
return;
/* Verify symlink string */
}
-void yaffs_verify_special(yaffs_Object *obj)
+void yaffs_verify_special(struct yaffs_obj *obj)
{
- if (obj && yaffs_skip_verification(obj->myDev))
+ if (obj && yaffs_skip_verification(obj->my_dev))
return;
}
-void yaffs_verify_obj(yaffs_Object *obj)
+void yaffs_verify_obj(struct yaffs_obj *obj)
{
- yaffs_Device *dev;
+ struct yaffs_dev *dev;
- __u32 chunkMin;
- __u32 chunkMax;
+ u32 chunk_min;
+ u32 chunk_max;
- __u32 chunkIdOk;
- __u32 chunkInRange;
- __u32 chunkShouldNotBeDeleted;
- __u32 chunkValid;
+ u32 chunk_id_ok;
+ u32 chunk_in_range;
+ u32 chunk_wrongly_deleted;
+ u32 chunk_valid;
if (!obj)
return;
- if (obj->beingCreated)
+ if (obj->being_created)
return;
- dev = obj->myDev;
+ dev = obj->my_dev;
if (yaffs_skip_verification(dev))
return;
/* Check sane object header chunk */
- chunkMin = dev->internalStartBlock * dev->param.nChunksPerBlock;
- chunkMax = (dev->internalEndBlock+1) * dev->param.nChunksPerBlock - 1;
+ chunk_min = dev->internal_start_block * dev->param.chunks_per_block;
+ chunk_max = (dev->internal_end_block+1) * dev->param.chunks_per_block - 1;
- chunkInRange = (((unsigned)(obj->hdrChunk)) >= chunkMin && ((unsigned)(obj->hdrChunk)) <= chunkMax);
- chunkIdOk = chunkInRange || (obj->hdrChunk == 0);
- chunkValid = chunkInRange &&
+ chunk_in_range = (((unsigned)(obj->hdr_chunk)) >= chunk_min &&
+ ((unsigned)(obj->hdr_chunk)) <= chunk_max);
+ chunk_id_ok = chunk_in_range || (obj->hdr_chunk == 0);
+ chunk_valid = chunk_in_range &&
yaffs_check_chunk_bit(dev,
- obj->hdrChunk / dev->param.nChunksPerBlock,
- obj->hdrChunk % dev->param.nChunksPerBlock);
- chunkShouldNotBeDeleted = chunkInRange && !chunkValid;
+ obj->hdr_chunk / dev->param.chunks_per_block,
+ obj->hdr_chunk % dev->param.chunks_per_block);
+ chunk_wrongly_deleted = chunk_in_range && !chunk_valid;
if (!obj->fake &&
- (!chunkIdOk || chunkShouldNotBeDeleted)) {
+ (!chunk_id_ok || chunk_wrongly_deleted)) {
T(YAFFS_TRACE_VERIFY,
- (TSTR("Obj %d has chunkId %d %s %s"TENDSTR),
- obj->objectId, obj->hdrChunk,
- chunkIdOk ? "" : ",out of range",
- chunkShouldNotBeDeleted ? ",marked as deleted" : ""));
+ (TSTR("Obj %d has chunk_id %d %s %s"TENDSTR),
+ obj->obj_id, obj->hdr_chunk,
+ chunk_id_ok ? "" : ",out of range",
+ chunk_wrongly_deleted ? ",marked as deleted" : ""));
}
- if (chunkValid && !yaffs_skip_nand_verification(dev)) {
- yaffs_ExtendedTags tags;
- yaffs_ObjectHeader *oh;
- __u8 *buffer = yaffs_get_temp_buffer(dev, __LINE__);
+ if (chunk_valid && !yaffs_skip_nand_verification(dev)) {
+ struct yaffs_ext_tags tags;
+ struct yaffs_obj_hdr *oh;
+ u8 *buffer = yaffs_get_temp_buffer(dev, __LINE__);
- oh = (yaffs_ObjectHeader *)buffer;
+ oh = (struct yaffs_obj_hdr *)buffer;
- yaffs_rd_chunk_tags_nand(dev, obj->hdrChunk, buffer,
+ yaffs_rd_chunk_tags_nand(dev, obj->hdr_chunk, buffer,
&tags);
yaffs_verify_oh(obj, oh, &tags, 1);
/* Verify it has a parent */
if (obj && !obj->fake &&
- (!obj->parent || obj->parent->myDev != dev)) {
+ (!obj->parent || obj->parent->my_dev != dev)) {
T(YAFFS_TRACE_VERIFY,
(TSTR("Obj %d has parent pointer %p which does not look like an object"TENDSTR),
- obj->objectId, obj->parent));
+ obj->obj_id, obj->parent));
}
/* Verify parent is a directory */
- if (obj->parent && obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
+ if (obj->parent && obj->parent->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
T(YAFFS_TRACE_VERIFY,
(TSTR("Obj %d's parent is not a directory (type %d)"TENDSTR),
- obj->objectId, obj->parent->variantType));
+ obj->obj_id, obj->parent->variant_type));
}
- switch (obj->variantType) {
+ switch (obj->variant_type) {
case YAFFS_OBJECT_TYPE_FILE:
yaffs_verify_file(obj);
break;
default:
T(YAFFS_TRACE_VERIFY,
(TSTR("Obj %d has illegaltype %d"TENDSTR),
- obj->objectId, obj->variantType));
+ obj->obj_id, obj->variant_type));
break;
}
}
-void yaffs_verify_objects(yaffs_Device *dev)
+void yaffs_verify_objects(struct yaffs_dev *dev)
{
- yaffs_Object *obj;
+ struct yaffs_obj *obj;
int i;
struct ylist_head *lh;
/* Iterate through the objects in each hash entry */
for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) {
- ylist_for_each(lh, &dev->objectBucket[i].list) {
+ ylist_for_each(lh, &dev->obj_bucket[i].list) {
if (lh) {
- obj = ylist_entry(lh, yaffs_Object, hashLink);
+ obj = ylist_entry(lh, struct yaffs_obj, hash_link);
yaffs_verify_obj(obj);
}
}
}
-void yaffs_verify_obj_in_dir(yaffs_Object *obj)
+void yaffs_verify_obj_in_dir(struct yaffs_obj *obj)
{
struct ylist_head *lh;
- yaffs_Object *listObj;
+ struct yaffs_obj *list_obj;
int count = 0;
return;
}
- if (yaffs_skip_verification(obj->myDev))
+ if (yaffs_skip_verification(obj->my_dev))
return;
if (!obj->parent) {
return;
}
- if (obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
+ if (obj->parent->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
T(YAFFS_TRACE_ALWAYS, (TSTR("Parent is not directory" TENDSTR)));
YBUG();
}
/* Iterate through the objects in each hash entry */
- ylist_for_each(lh, &obj->parent->variant.directoryVariant.children) {
+ ylist_for_each(lh, &obj->parent->variant.dir_variant.children) {
if (lh) {
- listObj = ylist_entry(lh, yaffs_Object, siblings);
- yaffs_verify_obj(listObj);
- if (obj == listObj)
+ list_obj = ylist_entry(lh, struct yaffs_obj, siblings);
+ yaffs_verify_obj(list_obj);
+ if (obj == list_obj)
count++;
}
}
}
}
-void yaffs_verify_dir(yaffs_Object *directory)
+void yaffs_verify_dir(struct yaffs_obj *directory)
{
struct ylist_head *lh;
- yaffs_Object *listObj;
+ struct yaffs_obj *list_obj;
if (!directory) {
YBUG();
return;
}
- if (yaffs_skip_full_verification(directory->myDev))
+ if (yaffs_skip_full_verification(directory->my_dev))
return;
- if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
- T(YAFFS_TRACE_ALWAYS, (TSTR("Directory has wrong type: %d" TENDSTR), directory->variantType));
+ if (directory->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
+ T(YAFFS_TRACE_ALWAYS,
+ (TSTR("Directory has wrong type: %d" TENDSTR),
+ directory->variant_type));
YBUG();
}
/* Iterate through the objects in each hash entry */
- ylist_for_each(lh, &directory->variant.directoryVariant.children) {
+ ylist_for_each(lh, &directory->variant.dir_variant.children) {
if (lh) {
- listObj = ylist_entry(lh, yaffs_Object, siblings);
- if (listObj->parent != directory) {
- T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory list has wrong parent %p" TENDSTR), listObj->parent));
+ list_obj = ylist_entry(lh, struct yaffs_obj, siblings);
+ if (list_obj->parent != directory) {
+ T(YAFFS_TRACE_ALWAYS, (
+ TSTR("Object in directory list has wrong parent %p" TENDSTR),
+ list_obj->parent));
YBUG();
}
- yaffs_verify_obj_in_dir(listObj);
+ yaffs_verify_obj_in_dir(list_obj);
}
}
}
static int yaffs_free_verification_failures;
-void yaffs_verify_free_chunks(yaffs_Device *dev)
+void yaffs_verify_free_chunks(struct yaffs_dev *dev)
{
int counted;
int difference;
counted = yaffs_count_free_chunks(dev);
- difference = dev->nFreeChunks - counted;
+ difference = dev->n_free_chunks - counted;
if (difference) {
T(YAFFS_TRACE_ALWAYS,
(TSTR("Freechunks verification failure %d %d %d" TENDSTR),
- dev->nFreeChunks, counted, difference));
+ dev->n_free_chunks, counted, difference));
yaffs_free_verification_failures++;
}
}
-int yaffs_verify_file_sane(yaffs_Object *in)
+int yaffs_verify_file_sane(struct yaffs_obj *in)
{
-#if 0
- int chunk;
- int nChunks;
- int fSize;
- int failed = 0;
- int objId;
- yaffs_tnode_t *tn;
- yaffs_Tags localTags;
- yaffs_Tags *tags = &localTags;
- int theChunk;
- int chunkDeleted;
-
- if (in->variantType != YAFFS_OBJECT_TYPE_FILE)
- return YAFFS_FAIL;
-
- objId = in->objectId;
- fSize = in->variant.fileVariant.fileSize;
- nChunks =
- (fSize + in->myDev->nDataBytesPerChunk - 1) / in->myDev->nDataBytesPerChunk;
-
- for (chunk = 1; chunk <= nChunks; chunk++) {
- tn = yaffs_find_tnode_0(in->myDev, &in->variant.fileVariant,
- chunk);
-
- if (tn) {
-
- theChunk = yaffs_get_group_base(dev, tn, chunk);
-
- if (yaffs_check_chunk_bits
- (dev, theChunk / dev->param.nChunksPerBlock,
- theChunk % dev->param.nChunksPerBlock)) {
-
- yaffs_rd_chunk_tags_nand(in->myDev, theChunk,
- tags,
- &chunkDeleted);
- if (yaffs_tags_match
- (tags, in->objectId, chunk, chunkDeleted)) {
- /* found it; */
-
- }
- } else {
-
- failed = 1;
- }
-
- } else {
- /* T(("No level 0 found for %d\n", chunk)); */
- }
- }
-
- return failed ? YAFFS_FAIL : YAFFS_OK;
-#else
in=in;
return YAFFS_OK;
-#endif
}
projects / yaffs2.git / blobdiff