yaffs all timothy_tests makefiles are working. threading test is broken.
[yaffs2.git] / yaffs_verify.c
index e15bb32..e8f2f0a 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2010 Aleph One Ltd.
+ * Copyright (C) 2002-2011 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
@@ -11,7 +11,6 @@
  * published by the Free Software Foundation.
  */
 
-
 #include "yaffs_verify.h"
 #include "yaffs_trace.h"
 #include "yaffs_bitmap.h"
 
 int yaffs_skip_verification(struct yaffs_dev *dev)
 {
-       dev=dev;
-       return !(yaffs_trace_mask & (YAFFS_TRACE_VERIFY | YAFFS_TRACE_VERIFY_FULL));
+       (void) dev;
+       return !(yaffs_trace_mask &
+                (YAFFS_TRACE_VERIFY | YAFFS_TRACE_VERIFY_FULL));
 }
 
 static int yaffs_skip_full_verification(struct yaffs_dev *dev)
 {
-       dev=dev;
+       (void) dev;
        return !(yaffs_trace_mask & (YAFFS_TRACE_VERIFY_FULL));
 }
 
 static int yaffs_skip_nand_verification(struct yaffs_dev *dev)
 {
-       dev=dev;
+       (void) dev;
        return !(yaffs_trace_mask & (YAFFS_TRACE_VERIFY_NAND));
 }
 
-
-static const char *block_state_name[] = {
-"Unknown",
-"Needs scanning",
-"Scanning",
-"Empty",
-"Allocating",
-"Full",
-"Dirty",
-"Checkpoint",
-"Collecting",
-"Dead"
+static const char * const block_state_name[] = {
+       "Unknown",
+       "Needs scan",
+       "Scanning",
+       "Empty",
+       "Allocating",
+       "Full",
+       "Dirty",
+       "Checkpoint",
+       "Collecting",
+       "Dead"
 };
 
-
 void yaffs_verify_blk(struct yaffs_dev *dev, struct yaffs_block_info *bi, int n)
 {
        int actually_used;
@@ -61,47 +59,52 @@ void yaffs_verify_blk(struct yaffs_dev *dev, struct yaffs_block_info *bi, int n)
 
        /* 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]));
+       case YAFFS_BLOCK_STATE_NEEDS_SCAN:
+               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 */
 
        actually_used = bi->pages_in_use - bi->soft_del_pages;
 
-       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));
-
+       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)
+               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);
 }
 
-
-
-void yaffs_verify_collected_blk(struct yaffs_dev *dev, struct yaffs_block_info *bi, int n)
+void yaffs_verify_collected_blk(struct yaffs_dev *dev,
+                               struct yaffs_block_info *bi, int n)
 {
        yaffs_verify_blk(dev, bi, n);
 
        /* After collection the block should be in the erased state */
 
        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));
+           bi->block_state != YAFFS_BLOCK_STATE_EMPTY) {
+               yaffs_trace(YAFFS_TRACE_ERROR,
+                       "Block %d is in state %d after gc, should be erased",
+                       n, bi->block_state);
        }
 }
 
@@ -126,64 +129,65 @@ void yaffs_verify_blocks(struct yaffs_dev *dev)
                        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]);
 }
 
 /*
- * Verify the object header. oh must be valid, but obj and tags may be NULL in which
- * case those tests will not be performed.
+ * 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(struct yaffs_obj *obj, struct yaffs_obj_hdr *oh, struct yaffs_ext_tags *tags, int parent_check)
+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->my_dev))
                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));
+           oh->type > YAFFS_OBJECT_TYPE_MAX)
+               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.
@@ -192,37 +196,39 @@ void yaffs_verify_oh(struct yaffs_obj *obj, struct yaffs_obj_hdr *oh, struct yaf
         */
 
        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));
-
-       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));
-
-       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));
+           oh->parent_obj_id != obj->parent->obj_id &&
+           (oh->parent_obj_id != YAFFS_OBJECTID_UNLINKED ||
+            obj->parent->obj_id != YAFFS_OBJECTID_DELETED))
+               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 */
+               yaffs_trace(YAFFS_TRACE_VERIFY,
+                       "Obj %d header name is NULL",
+                       obj->obj_id);
+
+       if (tags->obj_id > 1 && ((u8) (oh->name[0])) == 0xff)   /* Junk name */
+               yaffs_trace(YAFFS_TRACE_VERIFY,
+                       "Obj %d header name is 0xff",
+                       obj->obj_id);
 }
 
-
-
 void yaffs_verify_file(struct yaffs_obj *obj)
 {
+       u32 x;
        int required_depth;
        int actual_depth;
-       u32 last_chunk;
-       u32 x;
+       int last_chunk;
+       u32 offset_in_chunk;
+       u32 the_chunk;
+
        u32 i;
        struct yaffs_dev *dev;
        struct yaffs_ext_tags tags;
@@ -238,8 +244,11 @@ void yaffs_verify_file(struct yaffs_obj *obj)
        dev = obj->my_dev;
        obj_id = obj->obj_id;
 
+
        /* Check file size is consistent with tnode depth */
-       last_chunk =  obj->variant.file_variant.file_size / dev->data_bytes_per_chunk + 1;
+       yaffs_addr_to_chunk(dev, obj->variant.file_variant.file_size,
+                               &last_chunk, &offset_in_chunk);
+       last_chunk++;
        x = last_chunk >> YAFFS_TNODES_LEVEL0_BITS;
        required_depth = 0;
        while (x > 0) {
@@ -260,22 +269,22 @@ void yaffs_verify_file(struct yaffs_obj *obj)
        for (i = 1; i <= last_chunk; i++) {
                tn = yaffs_find_tnode_0(dev, &obj->variant.file_variant, i);
 
-               if (tn) {
-                       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));
-                               }
-                       }
+               if (!tn)
+                       continue;
+
+               the_chunk = yaffs_get_group_base(dev, tn, i);
+               if (the_chunk > 0) {
+                       yaffs_rd_chunk_tags_nand(dev, the_chunk, NULL,
+                                                &tags);
+                       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);
                }
        }
 }
 
-
 void yaffs_verify_link(struct yaffs_obj *obj)
 {
        if (obj && yaffs_skip_verification(obj->my_dev))
@@ -301,10 +310,8 @@ void yaffs_verify_special(struct yaffs_obj *obj)
 void yaffs_verify_obj(struct yaffs_obj *obj)
 {
        struct yaffs_dev *dev;
-
        u32 chunk_min;
        u32 chunk_max;
-
        u32 chunk_id_ok;
        u32 chunk_in_range;
        u32 chunk_wrongly_deleted;
@@ -324,54 +331,52 @@ void yaffs_verify_obj(struct yaffs_obj *obj)
        /* Check sane object header chunk */
 
        chunk_min = dev->internal_start_block * dev->param.chunks_per_block;
-       chunk_max = (dev->internal_end_block+1) * dev->param.chunks_per_block - 1;
+       chunk_max =
+           (dev->internal_end_block + 1) * dev->param.chunks_per_block - 1;
 
-       chunk_in_range = (((unsigned)(obj->hdr_chunk)) >= chunk_min && 
-                       ((unsigned)(obj->hdr_chunk)) <= chunk_max);
+       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->hdr_chunk / dev->param.chunks_per_block,
-                                       obj->hdr_chunk % dev->param.chunks_per_block);
+           yaffs_check_chunk_bit(dev,
+                                 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 &&
-                       (!chunk_id_ok || chunk_wrongly_deleted)) {
-               T(YAFFS_TRACE_VERIFY,
-                       (TSTR("Obj %d has chunk_id %d %s %s"TENDSTR),
+       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" : ""));
-       }
+                       chunk_wrongly_deleted ? ",marked as deleted" : "");
 
        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__);
+               u8 *buffer = yaffs_get_temp_buffer(dev);
 
                oh = (struct yaffs_obj_hdr *)buffer;
 
-               yaffs_rd_chunk_tags_nand(dev, obj->hdr_chunk, buffer,
-                               &tags);
+               yaffs_rd_chunk_tags_nand(dev, obj->hdr_chunk, buffer, &tags);
 
                yaffs_verify_oh(obj, oh, &tags, 1);
 
-               yaffs_release_temp_buffer(dev, buffer, __LINE__);
+               yaffs_release_temp_buffer(dev, buffer);
        }
 
        /* 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));
+       if (obj && !obj->fake && (!obj->parent || obj->parent->my_dev != dev)) {
+               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));
+       if (obj->parent &&
+           obj->parent->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
+               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) {
@@ -392,9 +397,9 @@ void yaffs_verify_obj(struct yaffs_obj *obj)
                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;
        }
 }
@@ -410,27 +415,23 @@ void yaffs_verify_objects(struct yaffs_dev *dev)
 
        /* Iterate through the objects in each hash entry */
 
-       for (i = 0; i <  YAFFS_NOBJECT_BUCKETS; i++) {
+       for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) {
                list_for_each(lh, &dev->obj_bucket[i].list) {
-                       if (lh) {
-                               obj = list_entry(lh, struct yaffs_obj, hash_link);
-                               yaffs_verify_obj(obj);
-                       }
+                       obj = list_entry(lh, struct yaffs_obj, hash_link);
+                       yaffs_verify_obj(obj);
                }
        }
 }
 
-
 void yaffs_verify_obj_in_dir(struct yaffs_obj *obj)
 {
        struct list_head *lh;
        struct yaffs_obj *list_obj;
-
        int count = 0;
 
        if (!obj) {
-               T(YAFFS_TRACE_ALWAYS, (TSTR("No object to verify" TENDSTR)));
-               YBUG();
+               yaffs_trace(YAFFS_TRACE_ALWAYS, "No object to verify");
+               BUG();
                return;
        }
 
@@ -438,30 +439,30 @@ void yaffs_verify_obj_in_dir(struct yaffs_obj *obj)
                return;
 
        if (!obj->parent) {
-               T(YAFFS_TRACE_ALWAYS, (TSTR("Object does not have parent" TENDSTR)));
-               YBUG();
+               yaffs_trace(YAFFS_TRACE_ALWAYS, "Object does not have parent");
+               BUG();
                return;
        }
 
        if (obj->parent->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
-               T(YAFFS_TRACE_ALWAYS, (TSTR("Parent is not directory" TENDSTR)));
-               YBUG();
+               yaffs_trace(YAFFS_TRACE_ALWAYS, "Parent is not directory");
+               BUG();
        }
 
        /* Iterate through the objects in each hash entry */
 
        list_for_each(lh, &obj->parent->variant.dir_variant.children) {
-               if (lh) {
-                       list_obj = list_entry(lh, struct yaffs_obj, siblings);
-                       yaffs_verify_obj(list_obj);
-                       if (obj == list_obj)
-                               count++;
-               }
-        }
+               list_obj = list_entry(lh, struct yaffs_obj, siblings);
+               yaffs_verify_obj(list_obj);
+               if (obj == list_obj)
+                       count++;
+       }
 
        if (count != 1) {
-               T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory %d times" TENDSTR), count));
-               YBUG();
+               yaffs_trace(YAFFS_TRACE_ALWAYS,
+                       "Object in directory %d times",
+                       count);
+               BUG();
        }
 }
 
@@ -471,7 +472,7 @@ void yaffs_verify_dir(struct yaffs_obj *directory)
        struct yaffs_obj *list_obj;
 
        if (!directory) {
-               YBUG();
+               BUG();
                return;
        }
 
@@ -479,25 +480,23 @@ void yaffs_verify_dir(struct yaffs_obj *directory)
                return;
 
        if (directory->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
-               T(YAFFS_TRACE_ALWAYS,
-               (TSTR("Directory has wrong type: %d" TENDSTR),
-               directory->variant_type));
-               YBUG();
+               yaffs_trace(YAFFS_TRACE_ALWAYS,
+                       "Directory has wrong type: %d",
+                       directory->variant_type);
+               BUG();
        }
 
        /* Iterate through the objects in each hash entry */
 
        list_for_each(lh, &directory->variant.dir_variant.children) {
-               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));
-                               YBUG();
-                       }
-                       yaffs_verify_obj_in_dir(list_obj);
+               list_obj = list_entry(lh, struct yaffs_obj, siblings);
+               if (list_obj->parent != directory) {
+                       yaffs_trace(YAFFS_TRACE_ALWAYS,
+                               "Object in directory list has wrong parent %p",
+                               list_obj->parent);
+                       BUG();
                }
+               yaffs_verify_obj_in_dir(list_obj);
        }
 }
 
@@ -516,15 +515,15 @@ void yaffs_verify_free_chunks(struct yaffs_dev *dev)
        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++;
        }
 }
 
 int yaffs_verify_file_sane(struct yaffs_obj *in)
 {
-       in=in;
+       (void) in;
        return YAFFS_OK;
 }