X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_yaffs2.c;h=f2f98a4c08770e8d3542de0f24a4f40fa6c51072;hp=f1dc972276f78091b14a45e4ecfd54d1c406a5b1;hb=33308768bd24abe4e1f59c5025a3dd824119ae1d;hpb=07353dd87a46afc753441028af8f5e8629b13bdc

diff --git a/yaffs_yaffs2.c b/yaffs_yaffs2.c
index f1dc972..f2f98a4 100644
--- a/yaffs_yaffs2.c
+++ b/yaffs_yaffs2.c
@@ -432,11 +432,12 @@ static int yaffs2_checkpt_obj_to_obj(struct yaffs_obj *obj,
 	obj->serial = cp->serial;
 	obj->n_data_chunks = cp->n_data_chunks;
 
-	if (obj->variant_type == YAFFS_OBJECT_TYPE_FILE)
+	if (obj->variant_type == YAFFS_OBJECT_TYPE_FILE) {
 		obj->variant.file_variant.file_size = cp->size_or_equiv_obj;
-	else if (obj->variant_type == YAFFS_OBJECT_TYPE_HARDLINK)
+		obj->variant.file_variant.stored_size = cp->size_or_equiv_obj;
+	} else if (obj->variant_type == YAFFS_OBJECT_TYPE_HARDLINK) {
 		obj->variant.hardlink_variant.equiv_id = cp->size_or_equiv_obj;
-
+	}
 	if (obj->hdr_chunk > 0)
 		obj->lazy_loaded = 1;
 	return 1;
@@ -1068,9 +1069,9 @@ static inline int yaffs2_scan_chunk(struct yaffs_dev *dev,
 			endpos = chunk_base + tags.n_bytes;
 
 			if (!in->valid &&
-			    in->variant.file_variant.scanned_size < endpos) {
+			    in->variant.file_variant.stored_size < endpos) {
 				in->variant.file_variant.
-				    scanned_size = endpos;
+				    stored_size = endpos;
 				in->variant.file_variant.
 				    file_size = endpos;
 			}
@@ -1193,12 +1194,14 @@ static inline int yaffs2_scan_chunk(struct yaffs_dev *dev,
 		}
 
 		if (!in->valid && in->variant_type !=
-		    (oh ? oh->type : tags.extra_obj_type))
+		    (oh ? oh->type : tags.extra_obj_type)) {
 			yaffs_trace(YAFFS_TRACE_ERROR,
-				"yaffs tragedy: Bad object type, %d != %d, for object %d at chunk %d during scan",
+				"yaffs tragedy: Bad type, %d != %d, for object %d at chunk %d during scan",
 				oh ? oh->type : tags.extra_obj_type,
 				in->variant_type, tags.obj_id,
 				chunk);
+			in = yaffs_retype_obj(in, oh ? oh->type : tags.extra_obj_type);
+		}
 
 		if (!in->valid &&
 		    (tags.obj_id == YAFFS_OBJECTID_ROOT ||
@@ -1297,7 +1300,7 @@ static inline int yaffs2_scan_chunk(struct yaffs_dev *dev,
 				break;
 			case YAFFS_OBJECT_TYPE_FILE:
 				file_var = &in->variant.file_variant;
-				if (file_var->scanned_size < file_size) {
+				if (file_var->stored_size < file_size) {
 					/* This covers the case where the file
 					 * size is greater than the data held.
 					 * This will happen if the file is
@@ -1305,7 +1308,7 @@ static inline int yaffs2_scan_chunk(struct yaffs_dev *dev,
 					 * current data extents.
 					 */
 					file_var->file_size = file_size;
-					file_var->scanned_size = file_size;
+					file_var->stored_size = file_size;
 				}
 
 				if (file_var->shrink_size > file_size)
@@ -1349,7 +1352,6 @@ int yaffs2_scan_backwards(struct yaffs_dev *dev)
 	int n_to_scan = 0;
 	enum yaffs_block_state state;
 	int c;
-	int deleted;
 	LIST_HEAD(hard_list);
 	struct yaffs_block_info *bi;
 	u32 seq_number;
@@ -1439,7 +1441,7 @@ int yaffs2_scan_backwards(struct yaffs_dev *dev)
 		bi++;
 	}
 
-	yaffs_trace(YAFFS_TRACE_SCAN, "%d blocks to be sorted...", n_to_scan);
+	yaffs_trace(YAFFS_TRACE_ALWAYS, "%d blocks to be sorted...", n_to_scan);
 
 	cond_resched();
 
@@ -1467,7 +1469,6 @@ int yaffs2_scan_backwards(struct yaffs_dev *dev)
 		/* get the block to scan in the correct order */
 		blk = block_index[block_iter].block;
 		bi = yaffs_get_block_info(dev, blk);
-		deleted = 0;
 
 		summary_available = yaffs_summary_read(dev, dev->sum_tags, blk);