X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_yaffs2.c;h=f1dc972276f78091b14a45e4ecfd54d1c406a5b1;hp=34c0bde985cb5d972624d31b9e905b5aa489511d;hb=c83e416cba6748e7a436c5df6a202349ff4d0fe2;hpb=1570788072c1154eff93282e0bb8564de40bd8aa

diff --git a/yaffs_yaffs2.c b/yaffs_yaffs2.c
index 34c0bde..f1dc972 100644
--- a/yaffs_yaffs2.c
+++ b/yaffs_yaffs2.c
@@ -836,7 +836,7 @@ int yaffs2_handle_hole(struct yaffs_obj *obj, loff_t new_size)
 	 * of hole marker.
 	 */
 	loff_t old_file_size;
-	int increase;
+	loff_t increase;
 	int small_hole;
 	int result = YAFFS_OK;
 	struct yaffs_dev *dev = NULL;
@@ -873,7 +873,7 @@ int yaffs2_handle_hole(struct yaffs_obj *obj, loff_t new_size)
 
 	if (local_buffer) {
 		/* fill hole with zero bytes */
-		int pos = old_file_size;
+		loff_t pos = old_file_size;
 		int this_write;
 		int written;
 		memset(local_buffer, 0, dev->data_bytes_per_chunk);
@@ -942,7 +942,7 @@ static inline int yaffs2_scan_chunk(struct yaffs_dev *dev,
 	struct yaffs_obj *in;
 	struct yaffs_obj *parent;
 	int equiv_id;
-	int file_size;
+	loff_t file_size;
 	int is_shrink;
 	int is_unlinked;
 	struct yaffs_ext_tags tags;
@@ -957,9 +957,13 @@ static inline int yaffs2_scan_chunk(struct yaffs_dev *dev,
 		result = yaffs_summary_fetch(dev, &tags, chunk_in_block);
 		tags.seq_number = bi->seq_number;
 	}
-	
-	if (!summary_available || tags.obj_id == 0)
+
+	if (!summary_available || tags.obj_id == 0) {
 		result = yaffs_rd_chunk_tags_nand(dev, chunk, NULL, &tags);
+		dev->tags_used++;
+	} else {
+		dev->summary_used++;
+	}
 
 	/* Let's have a good look at this chunk... */
 
@@ -1019,6 +1023,7 @@ static inline int yaffs2_scan_chunk(struct yaffs_dev *dev,
 			dev->n_free_chunks++;
 	} else if (tags.obj_id > YAFFS_MAX_OBJECT_ID ||
 		   tags.chunk_id > YAFFS_MAX_CHUNK_ID ||
+		   tags.obj_id == YAFFS_OBJECTID_SUMMARY ||
 		   (tags.chunk_id > 0 &&
 		     tags.n_bytes > dev->data_bytes_per_chunk) ||
 		   tags.seq_number != bi->seq_number) {
@@ -1029,8 +1034,8 @@ static inline int yaffs2_scan_chunk(struct yaffs_dev *dev,
 		dev->n_free_chunks++;
 	} else if (tags.chunk_id > 0) {
 		/* chunk_id > 0 so it is a data chunk... */
-		unsigned int endpos;
-		u32 chunk_base = (tags.chunk_id - 1) *
+		loff_t endpos;
+		loff_t chunk_base = (tags.chunk_id - 1) *
 					dev->data_bytes_per_chunk;
 
 		*found_chunks = 1;
@@ -1152,9 +1157,9 @@ static inline int yaffs2_scan_chunk(struct yaffs_dev *dev,
 				 (tags.extra_available &&
 				  tags.extra_obj_type == YAFFS_OBJECT_TYPE_FILE)
 				)) {
-				u32 this_size = (oh) ?
-					oh->file_size :
-					tags.extra_length;
+				loff_t this_size = (oh) ?
+					yaffs_oh_to_size(oh) :
+					tags.extra_file_size;
 				u32 parent_obj_id = (oh) ?
 					oh->parent_obj_id :
 					tags.extra_parent_id;
@@ -1228,7 +1233,7 @@ static inline int yaffs2_scan_chunk(struct yaffs_dev *dev,
 				parent = yaffs_find_or_create_by_number(dev,
 						oh->parent_obj_id,
 						YAFFS_OBJECT_TYPE_DIRECTORY);
-				file_size = oh->file_size;
+				file_size = yaffs_oh_to_size(oh);
 				is_shrink = oh->is_shrink;
 				equiv_id = oh->equiv_id;
 			} else {
@@ -1236,7 +1241,7 @@ static inline int yaffs2_scan_chunk(struct yaffs_dev *dev,
 				parent = yaffs_find_or_create_by_number(dev,
 						tags.extra_parent_id,
 						YAFFS_OBJECT_TYPE_DIRECTORY);
-				file_size = tags.extra_length;
+				file_size = tags.extra_file_size;
 				is_shrink = tags.extra_is_shrink;
 				equiv_id = tags.extra_equiv_id;
 				in->lazy_loaded = 1;
@@ -1464,11 +1469,11 @@ int yaffs2_scan_backwards(struct yaffs_dev *dev)
 		bi = yaffs_get_block_info(dev, blk);
 		deleted = 0;
 
-		summary_available = yaffs_summary_read(dev, blk);
+		summary_available = yaffs_summary_read(dev, dev->sum_tags, blk);
 
 		/* For each chunk in each block that needs scanning.... */
 		found_chunks = 0;
-		if(summary_available)
+		if (summary_available)
 			c = dev->chunks_per_summary - 1;
 		else
 			c = dev->param.chunks_per_block - 1;