/* Report illegal runtime states */
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));
+ yaffs_trace(YAFFS_TRACE_VERIFY,
+ "Block %d has undefined state %d",
+ n, bi->block_state);
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,
- block_state_name[bi->block_state]));
+ yaffs_trace(YAFFS_TRACE_VERIFY,
+ "Block %d has bad run-state %s",
+ n, block_state_name[bi->block_state]);
}
/* Check pages in use and soft deletions are legal */
|| 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));
+ yaffs_trace(YAFFS_TRACE_VERIFY,
+ "Block %d has illegal values pages_in_used %d soft_del_pages %d",
+ n, bi->pages_in_use, bi->soft_del_pages);
/* Check chunk bitmap legal */
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));
+ yaffs_trace(YAFFS_TRACE_VERIFY,
+ "Block %d has inconsistent values pages_in_use %d counted chunk bits %d",
+ n, bi->pages_in_use, in_use);
}
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->block_state));
+ yaffs_trace(YAFFS_TRACE_ERROR,
+ "Block %d is in state %d after gc, should be erased",
+ n, bi->block_state);
}
}
illegal_states++;
}
- T(YAFFS_TRACE_VERIFY, (TSTR("" TENDSTR)));
- T(YAFFS_TRACE_VERIFY, (TSTR("Block summary" TENDSTR)));
+ yaffs_trace(YAFFS_TRACE_VERIFY, "Block summary");
- T(YAFFS_TRACE_VERIFY,
- (TSTR("%d blocks have illegal states" TENDSTR), illegal_states));
+ yaffs_trace(YAFFS_TRACE_VERIFY,
+ "%d blocks have illegal states",
+ illegal_states);
if (state_count[YAFFS_BLOCK_STATE_ALLOCATING] > 1)
- T(YAFFS_TRACE_VERIFY,
- (TSTR("Too many allocating blocks" TENDSTR)));
+ yaffs_trace(YAFFS_TRACE_VERIFY,
+ "Too many allocating blocks");
for (i = 0; i < YAFFS_NUMBER_OF_BLOCK_STATES; i++)
- T(YAFFS_TRACE_VERIFY,
- (TSTR("%s %d blocks" TENDSTR),
- block_state_name[i], state_count[i]));
+ yaffs_trace(YAFFS_TRACE_VERIFY,
+ "%s %d blocks",
+ block_state_name[i], state_count[i]);
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->blocks_in_checkpt,
- state_count[YAFFS_BLOCK_STATE_CHECKPOINT]));
+ yaffs_trace(YAFFS_TRACE_VERIFY,
+ "Checkpoint block count wrong dev %d count %d",
+ dev->blocks_in_checkpt,
+ state_count[YAFFS_BLOCK_STATE_CHECKPOINT]);
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->n_erased_blocks, state_count[YAFFS_BLOCK_STATE_EMPTY]));
+ yaffs_trace(YAFFS_TRACE_VERIFY,
+ "Erased block count wrong dev %d count %d",
+ dev->n_erased_blocks,
+ state_count[YAFFS_BLOCK_STATE_EMPTY]);
if (state_count[YAFFS_BLOCK_STATE_COLLECTING] > 1)
- T(YAFFS_TRACE_VERIFY,
- (TSTR("Too many collecting blocks %d (max is 1)" TENDSTR),
- state_count[YAFFS_BLOCK_STATE_COLLECTING]));
-
- T(YAFFS_TRACE_VERIFY, (TSTR("" TENDSTR)));
-
+ yaffs_trace(YAFFS_TRACE_VERIFY,
+ "Too many collecting blocks %d (max is 1)",
+ state_count[YAFFS_BLOCK_STATE_COLLECTING]);
}
/*
return;
if (!(tags && obj && oh)) {
- T(YAFFS_TRACE_VERIFY,
- (TSTR("Verifying object header tags %p obj %p oh %p" TENDSTR),
- tags, obj, oh));
+ yaffs_trace(YAFFS_TRACE_VERIFY,
+ "Verifying object header tags %p obj %p oh %p",
+ tags, obj, oh);
return;
}
if (oh->type <= YAFFS_OBJECT_TYPE_UNKNOWN ||
oh->type > YAFFS_OBJECT_TYPE_MAX)
- T(YAFFS_TRACE_VERIFY,
- (TSTR("Obj %d header type is illegal value 0x%x" TENDSTR),
- tags->obj_id, oh->type));
+ yaffs_trace(YAFFS_TRACE_VERIFY,
+ "Obj %d header type is illegal value 0x%x",
+ tags->obj_id, oh->type);
if (tags->obj_id != obj->obj_id)
- T(YAFFS_TRACE_VERIFY,
- (TSTR("Obj %d header mismatch obj_id %d" TENDSTR),
- tags->obj_id, obj->obj_id));
+ yaffs_trace(YAFFS_TRACE_VERIFY,
+ "Obj %d header mismatch obj_id %d",
+ tags->obj_id, obj->obj_id);
/*
* Check that the object's parent ids match if parent_check requested.
*/
if (parent_check && tags->obj_id > 1 && !obj->parent)
- T(YAFFS_TRACE_VERIFY,
- (TSTR
- ("Obj %d header mismatch parent_id %d obj->parent is NULL"
- TENDSTR), tags->obj_id, oh->parent_obj_id));
+ yaffs_trace(YAFFS_TRACE_VERIFY,
+ "Obj %d header mismatch parent_id %d obj->parent is NULL",
+ tags->obj_id, oh->parent_obj_id);
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 parent_id %d parent_obj_id %d"
- TENDSTR), tags->obj_id, oh->parent_obj_id,
- obj->parent->obj_id));
+ yaffs_trace(YAFFS_TRACE_VERIFY,
+ "Obj %d header mismatch parent_id %d parent_obj_id %d",
+ tags->obj_id, oh->parent_obj_id,
+ obj->parent->obj_id);
if (tags->obj_id > 1 && oh->name[0] == 0) /* Null name */
- T(YAFFS_TRACE_VERIFY,
- (TSTR("Obj %d header name is NULL" TENDSTR), obj->obj_id));
+ yaffs_trace(YAFFS_TRACE_VERIFY,
+ "Obj %d header name is NULL",
+ obj->obj_id);
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->obj_id));
+ yaffs_trace(YAFFS_TRACE_VERIFY,
+ "Obj %d header name is 0xFF",
+ obj->obj_id);
}
void yaffs_verify_file(struct yaffs_obj *obj)
/* 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));
- }
+ if (tags.obj_id != obj_id || tags.chunk_id != i)
+ yaffs_trace(YAFFS_TRACE_VERIFY,
+ "Object %d chunk_id %d NAND mismatch chunk %d tags (%d:%d)",
+ obj_id, i, the_chunk,
+ tags.obj_id, tags.chunk_id);
}
}
}
obj->hdr_chunk % dev->param.chunks_per_block);
chunk_wrongly_deleted = chunk_in_range && !chunk_valid;
- if (!obj->fake && (!chunk_id_ok || chunk_wrongly_deleted)) {
- T(YAFFS_TRACE_VERIFY,
- (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 (!obj->fake && (!chunk_id_ok || chunk_wrongly_deleted))
+ yaffs_trace(YAFFS_TRACE_VERIFY,
+ "Obj %d has chunk_id %d %s %s",
+ obj->obj_id, obj->hdr_chunk,
+ chunk_id_ok ? "" : ",out of range",
+ chunk_wrongly_deleted ? ",marked as deleted" : "");
if (chunk_valid && !yaffs_skip_nand_verification(dev)) {
struct yaffs_ext_tags tags;
/* Verify it has a parent */
if (obj && !obj->fake && (!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->obj_id, obj->parent));
+ yaffs_trace(YAFFS_TRACE_VERIFY,
+ "Obj %d has parent pointer %p which does not look like an object",
+ obj->obj_id, obj->parent);
}
/* Verify parent is a 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->obj_id, obj->parent->variant_type));
+ yaffs_trace(YAFFS_TRACE_VERIFY,
+ "Obj %d's parent is not a directory (type %d)",
+ obj->obj_id, obj->parent->variant_type);
}
switch (obj->variant_type) {
break;
case YAFFS_OBJECT_TYPE_UNKNOWN:
default:
- T(YAFFS_TRACE_VERIFY,
- (TSTR("Obj %d has illegaltype %d" TENDSTR),
- obj->obj_id, obj->variant_type));
+ yaffs_trace(YAFFS_TRACE_VERIFY,
+ "Obj %d has illegaltype %d",
+ obj->obj_id, obj->variant_type);
break;
}
}
int count = 0;
if (!obj) {
- T(YAFFS_TRACE_ALWAYS, (TSTR("No object to verify" TENDSTR)));
+ yaffs_trace(YAFFS_TRACE_ALWAYS, "No object to verify");
YBUG();
return;
}
return;
if (!obj->parent) {
- T(YAFFS_TRACE_ALWAYS,
- (TSTR("Object does not have parent" TENDSTR)));
+ yaffs_trace(YAFFS_TRACE_ALWAYS, "Object does not have parent" );
YBUG();
return;
}
if (obj->parent->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
- T(YAFFS_TRACE_ALWAYS,
- (TSTR("Parent is not directory" TENDSTR)));
+ yaffs_trace(YAFFS_TRACE_ALWAYS, "Parent is not directory");
YBUG();
}
}
if (count != 1) {
- T(YAFFS_TRACE_ALWAYS,
- (TSTR("Object in directory %d times" TENDSTR), count));
+ yaffs_trace(YAFFS_TRACE_ALWAYS,
+ "Object in directory %d times",
+ count);
YBUG();
}
}
return;
if (directory->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
- T(YAFFS_TRACE_ALWAYS,
- (TSTR("Directory has wrong type: %d" TENDSTR),
- directory->variant_type));
+ yaffs_trace(YAFFS_TRACE_ALWAYS,
+ "Directory has wrong type: %d",
+ directory->variant_type);
YBUG();
}
if (lh) {
list_obj = list_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));
+ yaffs_trace(YAFFS_TRACE_ALWAYS,
+ "Object in directory list has wrong parent %p",
+ list_obj->parent);
YBUG();
}
yaffs_verify_obj_in_dir(list_obj);
difference = dev->n_free_chunks - counted;
if (difference) {
- T(YAFFS_TRACE_ALWAYS,
- (TSTR("Freechunks verification failure %d %d %d" TENDSTR),
- dev->n_free_chunks, counted, difference));
+ yaffs_trace(YAFFS_TRACE_ALWAYS,
+ "Freechunks verification failure %d %d %d",
+ dev->n_free_chunks, counted, difference);
yaffs_free_verification_failures++;
}
}
in = in;
return YAFFS_OK;
}
+
projects / yaffs2.git / blobdiff