X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_verify.c;h=fee3a1e462f7c358022aa96e025f161ce1b2218b;hp=89e730b28a82864341c609d902a0d5d894c8bd75;hb=24c7a59d54dbe6946be101db3c8ae38f92634129;hpb=f330fefa27f2c87f7dff414fe6227261327663b7

diff --git a/yaffs_verify.c b/yaffs_verify.c
index 89e730b..fee3a1e 100644
--- a/yaffs_verify.c
+++ b/yaffs_verify.c
@@ -11,47 +11,45 @@
  * published by the Free Software Foundation.
  */
 
-
 #include "yaffs_verify.h"
 #include "yaffs_trace.h"
 #include "yaffs_bitmap.h"
 #include "yaffs_getblockinfo.h"
 #include "yaffs_nand.h"
 
-int yaffs_skip_verification(yaffs_dev_t *dev)
+int yaffs_skip_verification(struct yaffs_dev *dev)
 {
-	dev=dev;
-	return !(yaffs_trace_mask & (YAFFS_TRACE_VERIFY | YAFFS_TRACE_VERIFY_FULL));
+	dev = dev;
+	return !(yaffs_trace_mask &
+		 (YAFFS_TRACE_VERIFY | YAFFS_TRACE_VERIFY_FULL));
 }
 
-static int yaffs_skip_full_verification(yaffs_dev_t *dev)
+static int yaffs_skip_full_verification(struct yaffs_dev *dev)
 {
-	dev=dev;
+	dev = dev;
 	return !(yaffs_trace_mask & (YAFFS_TRACE_VERIFY_FULL));
 }
 
-static int yaffs_skip_nand_verification(yaffs_dev_t *dev)
+static int yaffs_skip_nand_verification(struct yaffs_dev *dev)
 {
-	dev=dev;
+	dev = 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"
+	"Unknown",
+	"Needs scanning",
+	"Scanning",
+	"Empty",
+	"Allocating",
+	"Full",
+	"Dirty",
+	"Checkpoint",
+	"Collecting",
+	"Dead"
 };
 
-
-void yaffs_verify_blk(yaffs_dev_t *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;
@@ -61,51 +59,60 @@ void yaffs_verify_blk(yaffs_dev_t *dev, yaffs_block_info_t *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));
+		T(YAFFS_TRACE_VERIFY,
+		  (TSTR("Block %d has undefined state %d" TENDSTR), 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]));
+		T(YAFFS_TRACE_VERIFY,
+		  (TSTR("Block %d has bad run-state %s" TENDSTR), 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)
+		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 */
 	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));
+		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_dev_t *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);
 
 	/* 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) {
+		T(YAFFS_TRACE_ERROR,
+		  (TSTR
+		   ("Block %d is in state %d after gc, should be erased"
+		    TENDSTR), n, bi->block_state));
 	}
 }
 
-void yaffs_verify_blocks(yaffs_dev_t *dev)
+void yaffs_verify_blocks(struct yaffs_dev *dev)
 {
 	int i;
 	int state_count[YAFFS_NUMBER_OF_BLOCK_STATES];
@@ -117,7 +124,7 @@ void yaffs_verify_blocks(yaffs_dev_t *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)
@@ -126,34 +133,37 @@ void yaffs_verify_blocks(yaffs_dev_t *dev)
 			illegal_states++;
 	}
 
-	T(YAFFS_TRACE_VERIFY, (TSTR(""TENDSTR)));
-	T(YAFFS_TRACE_VERIFY, (TSTR("Block summary"TENDSTR)));
+	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), illegal_states));
+	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)));
+		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),
-		  block_state_name[i], state_count[i]));
+		  (TSTR("%s %d blocks" TENDSTR),
+		   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]));
+		  (TSTR("Checkpoint block count wrong dev %d count %d" TENDSTR),
+		   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]));
+		  (TSTR("Erased block count wrong dev %d count %d" TENDSTR),
+		   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]));
+		  (TSTR("Too many collecting blocks %d (max is 1)" TENDSTR),
+		   state_count[YAFFS_BLOCK_STATE_COLLECTING]));
 
-	T(YAFFS_TRACE_VERIFY, (TSTR(""TENDSTR)));
+	T(YAFFS_TRACE_VERIFY, (TSTR("" TENDSTR)));
 
 }
 
@@ -161,29 +171,29 @@ void yaffs_verify_blocks(yaffs_dev_t *dev)
  * 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_obj_t *obj, yaffs_obj_header *oh, 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));
+		  (TSTR("Verifying object header tags %p obj %p oh %p" TENDSTR),
+		   tags, obj, oh));
 		return;
 	}
 
 	if (oh->type <= YAFFS_OBJECT_TYPE_UNKNOWN ||
-			oh->type > YAFFS_OBJECT_TYPE_MAX)
+	    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));
+		  (TSTR("Obj %d header type is illegal value 0x%x" TENDSTR),
+		   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));
-
+		  (TSTR("Obj %d header mismatch obj_id %d" TENDSTR),
+		   tags->obj_id, obj->obj_id));
 
 	/*
 	 * Check that the object's parent ids match if parent_check requested.
@@ -193,89 +203,40 @@ void yaffs_verify_oh(yaffs_obj_t *obj, yaffs_obj_header *oh, yaffs_ext_tags *tag
 
 	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));
+		  (TSTR
+		   ("Obj %d header mismatch parent_id %d obj->parent is NULL"
+		    TENDSTR), 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))
+	    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));
+		  (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 */
+	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));
+		  (TSTR("Obj %d header name is NULL" TENDSTR), obj->obj_id));
 
-	if (tags->obj_id > 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->obj_id));
+		  (TSTR("Obj %d header name is 0xFF" TENDSTR), obj->obj_id));
 }
 
-
-#if 0
-/* Not being used, but don't want to throw away yet */
-int yaffs_verify_tnode_worker(yaffs_obj_t *obj, yaffs_tnode_t *tn,
-					__u32 level, int chunk_offset)
-{
-	int i;
-	yaffs_dev_t *dev = obj->my_dev;
-	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,
-							(chunk_offset<<YAFFS_TNODES_INTERNAL_BITS) + i);
-				}
-			}
-		} else if (level == 0) {
-			yaffs_ext_tags tags;
-			__u32 obj_id = obj->obj_id;
-
-			chunk_offset <<=  YAFFS_TNODES_LEVEL0_BITS;
-
-			for (i = 0; i < YAFFS_NTNODES_LEVEL0; i++) {
-				__u32 the_chunk = yaffs_get_group_base(dev, tn, i);
-
-				if (the_chunk > 0) {
-					/* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),tags.obj_id,tags.chunk_id,the_chunk)); */
-					yaffs_rd_chunk_tags_nand(dev, the_chunk, NULL, &tags);
-					if (tags.obj_id != obj_id || tags.chunk_id != chunk_offset) {
-						T(~0, (TSTR("Object %d chunk_id %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
-							obj_id, chunk_offset, the_chunk,
-							tags.obj_id, tags.chunk_id));
-					}
-				}
-				chunk_offset++;
-			}
-		}
-	}
-
-	return ok;
-
-}
-
-#endif
-
-void yaffs_verify_file(yaffs_obj_t *obj)
+void yaffs_verify_file(struct yaffs_obj *obj)
 {
 	int required_depth;
 	int actual_depth;
-	__u32 last_chunk;
-	__u32 x;
-	__u32 i;
-	yaffs_dev_t *dev;
-	yaffs_ext_tags tags;
-	yaffs_tnode_t *tn;
-	__u32 obj_id;
+	u32 last_chunk;
+	u32 x;
+	u32 i;
+	struct yaffs_dev *dev;
+	struct yaffs_ext_tags tags;
+	struct yaffs_tnode *tn;
+	u32 obj_id;
 
 	if (!obj)
 		return;
@@ -287,7 +248,8 @@ void yaffs_verify_file(yaffs_obj_t *obj)
 	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;
+	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) {
@@ -309,22 +271,24 @@ void yaffs_verify_file(yaffs_obj_t *obj)
 		tn = yaffs_find_tnode_0(dev, &obj->variant.file_variant, i);
 
 		if (tn) {
-			__u32 the_chunk = yaffs_get_group_base(dev, tn, i);
+			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);
+				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));
+					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_obj_t *obj)
+void yaffs_verify_link(struct yaffs_obj *obj)
 {
 	if (obj && yaffs_skip_verification(obj->my_dev))
 		return;
@@ -332,7 +296,7 @@ void yaffs_verify_link(yaffs_obj_t *obj)
 	/* Verify sane equivalent object */
 }
 
-void yaffs_verify_symlink(yaffs_obj_t *obj)
+void yaffs_verify_symlink(struct yaffs_obj *obj)
 {
 	if (obj && yaffs_skip_verification(obj->my_dev))
 		return;
@@ -340,23 +304,23 @@ void yaffs_verify_symlink(yaffs_obj_t *obj)
 	/* Verify symlink string */
 }
 
-void yaffs_verify_special(yaffs_obj_t *obj)
+void yaffs_verify_special(struct yaffs_obj *obj)
 {
 	if (obj && yaffs_skip_verification(obj->my_dev))
 		return;
 }
 
-void yaffs_verify_obj(yaffs_obj_t *obj)
+void yaffs_verify_obj(struct yaffs_obj *obj)
 {
-	yaffs_dev_t *dev;
+	struct yaffs_dev *dev;
 
-	__u32 chunk_min;
-	__u32 chunk_max;
+	u32 chunk_min;
+	u32 chunk_max;
 
-	__u32 chunk_id_ok;
-	__u32 chunk_in_range;
-	__u32 chunk_wrongly_deleted;
-	__u32 chunk_valid;
+	u32 chunk_id_ok;
+	u32 chunk_in_range;
+	u32 chunk_wrongly_deleted;
+	u32 chunk_valid;
 
 	if (!obj)
 		return;
@@ -372,35 +336,34 @@ void yaffs_verify_obj(yaffs_obj_t *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)) {
+	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" : ""));
+		  (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 (chunk_valid && !yaffs_skip_nand_verification(dev)) {
-		yaffs_ext_tags tags;
-		yaffs_obj_header *oh;
-		__u8 *buffer = yaffs_get_temp_buffer(dev, __LINE__);
+		struct yaffs_ext_tags tags;
+		struct yaffs_obj_hdr *oh;
+		u8 *buffer = yaffs_get_temp_buffer(dev, __LINE__);
 
-		oh = (yaffs_obj_header *)buffer;
+		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);
 
@@ -408,18 +371,19 @@ void yaffs_verify_obj(yaffs_obj_t *obj)
 	}
 
 	/* Verify it has a parent */
-	if (obj && !obj->fake &&
-			(!obj->parent || obj->parent->my_dev != dev)) {
+	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));
+		  (TSTR
+		   ("Obj %d has parent pointer %p which does not look like an object"
+		    TENDSTR), obj->obj_id, obj->parent));
 	}
 
 	/* Verify parent is a directory */
-	if (obj->parent && obj->parent->variant_type != 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->obj_id, obj->parent->variant_type));
+		  (TSTR("Obj %d's parent is not a directory (type %d)" TENDSTR),
+		   obj->obj_id, obj->parent->variant_type));
 	}
 
 	switch (obj->variant_type) {
@@ -441,38 +405,38 @@ void yaffs_verify_obj(yaffs_obj_t *obj)
 	case YAFFS_OBJECT_TYPE_UNKNOWN:
 	default:
 		T(YAFFS_TRACE_VERIFY,
-		(TSTR("Obj %d has illegaltype %d"TENDSTR),
-		obj->obj_id, obj->variant_type));
+		  (TSTR("Obj %d has illegaltype %d" TENDSTR),
+		   obj->obj_id, obj->variant_type));
 		break;
 	}
 }
 
-void yaffs_verify_objects(yaffs_dev_t *dev)
+void yaffs_verify_objects(struct yaffs_dev *dev)
 {
-	yaffs_obj_t *obj;
+	struct yaffs_obj *obj;
 	int i;
-	struct ylist_head *lh;
+	struct list_head *lh;
 
 	if (yaffs_skip_verification(dev))
 		return;
 
 	/* 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) {
+	for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) {
+		list_for_each(lh, &dev->obj_bucket[i].list) {
 			if (lh) {
-				obj = ylist_entry(lh, yaffs_obj_t, hash_link);
+				obj =
+				    list_entry(lh, struct yaffs_obj, hash_link);
 				yaffs_verify_obj(obj);
 			}
 		}
 	}
 }
 
-
-void yaffs_verify_obj_in_dir(yaffs_obj_t *obj)
+void yaffs_verify_obj_in_dir(struct yaffs_obj *obj)
 {
-	struct ylist_head *lh;
-	yaffs_obj_t *list_obj;
+	struct list_head *lh;
+	struct yaffs_obj *list_obj;
 
 	int count = 0;
 
@@ -486,37 +450,40 @@ void yaffs_verify_obj_in_dir(yaffs_obj_t *obj)
 		return;
 
 	if (!obj->parent) {
-		T(YAFFS_TRACE_ALWAYS, (TSTR("Object does not have parent" TENDSTR)));
+		T(YAFFS_TRACE_ALWAYS,
+		  (TSTR("Object does not have parent" TENDSTR)));
 		YBUG();
 		return;
 	}
 
 	if (obj->parent->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
-		T(YAFFS_TRACE_ALWAYS, (TSTR("Parent is not directory" TENDSTR)));
+		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.dir_variant.children) {
+	list_for_each(lh, &obj->parent->variant.dir_variant.children) {
 		if (lh) {
-			list_obj = ylist_entry(lh, yaffs_obj_t, siblings);
+			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));
+		T(YAFFS_TRACE_ALWAYS,
+		  (TSTR("Object in directory %d times" TENDSTR), count));
 		YBUG();
 	}
 }
 
-void yaffs_verify_dir(yaffs_obj_t *directory)
+void yaffs_verify_dir(struct yaffs_obj *directory)
 {
-	struct ylist_head *lh;
-	yaffs_obj_t *list_obj;
+	struct list_head *lh;
+	struct yaffs_obj *list_obj;
 
 	if (!directory) {
 		YBUG();
@@ -528,20 +495,21 @@ void yaffs_verify_dir(yaffs_obj_t *directory)
 
 	if (directory->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
 		T(YAFFS_TRACE_ALWAYS,
-		(TSTR("Directory has wrong type: %d" TENDSTR),
-		directory->variant_type));
+		  (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.dir_variant.children) {
+	list_for_each(lh, &directory->variant.dir_variant.children) {
 		if (lh) {
-			list_obj = ylist_entry(lh, yaffs_obj_t, 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),
-				list_obj->parent));
+				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);
@@ -551,7 +519,7 @@ void yaffs_verify_dir(yaffs_obj_t *directory)
 
 static int yaffs_free_verification_failures;
 
-void yaffs_verify_free_chunks(yaffs_dev_t *dev)
+void yaffs_verify_free_chunks(struct yaffs_dev *dev)
 {
 	int counted;
 	int difference;
@@ -571,61 +539,8 @@ void yaffs_verify_free_chunks(yaffs_dev_t *dev)
 	}
 }
 
-int yaffs_verify_file_sane(yaffs_obj_t *in)
+int yaffs_verify_file_sane(struct yaffs_obj *in)
 {
-#if 0
-	int chunk;
-	int n_chunks;
-	int file_size;
-	int failed = 0;
-	int obj_id;
-	yaffs_tnode_t *tn;
-	yaffs_tags_t local_tags;
-	yaffs_tags_t *tags = &local_tags;
-	int the_chunk;
-	int is_deleted;
-
-	if (in->variant_type != YAFFS_OBJECT_TYPE_FILE)
-		return YAFFS_FAIL;
-
-	obj_id = in->obj_id;
-	file_size = in->variant.file_variant.file_size;
-	n_chunks =
-	    (file_size + in->my_dev->data_bytes_per_chunk - 1) / in->my_dev->data_bytes_per_chunk;
-
-	for (chunk = 1; chunk <= n_chunks; chunk++) {
-		tn = yaffs_find_tnode_0(in->my_dev, &in->variant.file_variant,
-					   chunk);
-
-		if (tn) {
-
-			the_chunk = yaffs_get_group_base(dev, tn, chunk);
-
-			if (yaffs_check_chunk_bits
-			    (dev, the_chunk / dev->param.chunks_per_block,
-			     the_chunk % dev->param.chunks_per_block)) {
-
-				yaffs_rd_chunk_tags_nand(in->my_dev, the_chunk,
-							    tags,
-							    &is_deleted);
-				if (yaffs_tags_match
-				    (tags, in->obj_id, chunk, is_deleted)) {
-					/* found it; */
-
-				}
-			} else {
-
-				failed = 1;
-			}
-
-		} else {
-			/* T(("No level 0 found for %d\n", chunk)); */
-		}
-	}
-
-	return failed ? YAFFS_FAIL : YAFFS_OK;
-#else
-	in=in;
+	in = in;
 	return YAFFS_OK;
-#endif
 }