yaffs: More clean up

[yaffs2.git] / yaffs_verify.c

diff --git a/yaffs_verify.c b/yaffs_verify.c
index 0e2722871eacea110696eacd0f9242e755ed4e1e..e15bb321fc6d7cb762c8fdf00e5cbb86e14ee6ae 100644 (file)
--- a/yaffs_verify.c
+++ b/yaffs_verify.c
@@ -51,7 +51,7 @@ static const char *block_state_name[] = {
 };
 
 
-void yaffs_verify_blk(struct yaffs_dev *dev, yaffs_block_info_t *bi, int n)
+void yaffs_verify_blk(struct yaffs_dev *dev, struct yaffs_block_info *bi, int n)
 {
        int actually_used;
        int in_use;
@@ -92,7 +92,7 @@ void yaffs_verify_blk(struct yaffs_dev *dev, yaffs_block_info_t *bi, int n)
 
 
 
-void yaffs_verify_collected_blk(struct yaffs_dev *dev, yaffs_block_info_t *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);
 
@@ -117,7 +117,7 @@ void yaffs_verify_blocks(struct yaffs_dev *dev)
        memset(state_count, 0, sizeof(state_count));
 
        for (i = dev->internal_start_block; i <= dev->internal_end_block; i++) {
-               yaffs_block_info_t *bi = yaffs_get_block_info(dev, i);
+               struct yaffs_block_info *bi = yaffs_get_block_info(dev, i);
                yaffs_verify_blk(dev, bi, i);
 
                if (bi->block_state < YAFFS_NUMBER_OF_BLOCK_STATES)
@@ -226,7 +226,7 @@ void yaffs_verify_file(struct yaffs_obj *obj)
        u32 i;
        struct yaffs_dev *dev;
        struct yaffs_ext_tags tags;
-       yaffs_tnode_t *tn;
+       struct yaffs_tnode *tn;
        u32 obj_id;
 
        if (!obj)
@@ -403,7 +403,7 @@ void yaffs_verify_objects(struct yaffs_dev *dev)
 {
        struct yaffs_obj *obj;
        int i;
-       struct ylist_head *lh;
+       struct list_head *lh;
 
        if (yaffs_skip_verification(dev))
                return;
@@ -411,9 +411,9 @@ void yaffs_verify_objects(struct yaffs_dev *dev)
        /* Iterate through the objects in each hash entry */
 
        for (i = 0; i <  YAFFS_NOBJECT_BUCKETS; i++) {
-               ylist_for_each(lh, &dev->obj_bucket[i].list) {
+               list_for_each(lh, &dev->obj_bucket[i].list) {
                        if (lh) {
-                               obj = ylist_entry(lh, struct yaffs_obj, hash_link);
+                               obj = list_entry(lh, struct yaffs_obj, hash_link);
                                yaffs_verify_obj(obj);
                        }
                }
@@ -423,7 +423,7 @@ void yaffs_verify_objects(struct yaffs_dev *dev)
 
 void yaffs_verify_obj_in_dir(struct yaffs_obj *obj)
 {
-       struct ylist_head *lh;
+       struct list_head *lh;
        struct yaffs_obj *list_obj;
 
        int count = 0;
@@ -450,9 +450,9 @@ void yaffs_verify_obj_in_dir(struct yaffs_obj *obj)
 
        /* Iterate through the objects in each hash entry */
 
-       ylist_for_each(lh, &obj->parent->variant.dir_variant.children) {
+       list_for_each(lh, &obj->parent->variant.dir_variant.children) {
                if (lh) {
-                       list_obj = ylist_entry(lh, struct yaffs_obj, siblings);
+                       list_obj = list_entry(lh, struct yaffs_obj, siblings);
                        yaffs_verify_obj(list_obj);
                        if (obj == list_obj)
                                count++;
@@ -467,7 +467,7 @@ void yaffs_verify_obj_in_dir(struct yaffs_obj *obj)
 
 void yaffs_verify_dir(struct yaffs_obj *directory)
 {
-       struct ylist_head *lh;
+       struct list_head *lh;
        struct yaffs_obj *list_obj;
 
        if (!directory) {
@@ -487,9 +487,9 @@ void yaffs_verify_dir(struct yaffs_obj *directory)
 
        /* Iterate through the objects in each hash entry */
 
-       ylist_for_each(lh, &directory->variant.dir_variant.children) {
+       list_for_each(lh, &directory->variant.dir_variant.children) {
                if (lh) {
-                       list_obj = ylist_entry(lh, struct yaffs_obj, siblings);
+                       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),