X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_tagsmarshall.c;h=4a120d86825a4405969d73b251655bf527581c8a;hp=401a7561520195493fc5bcb7748c799f78ef0f1b;hb=c8f0255026354753fa51468c85346b4074af6c4f;hpb=df88cf1097f3b7012fc1010cccd4e682fb13de97

diff --git a/yaffs_tagsmarshall.c b/yaffs_tagsmarshall.c
index 401a756..4a120d8 100644
--- a/yaffs_tagsmarshall.c
+++ b/yaffs_tagsmarshall.c
@@ -9,6 +9,10 @@
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
+ *
+ * This file handles the marshalling (ie internal<-->external structure
+ * translation between the internal tags and the stored tags in Yaffs2-style
+ * tags storage.
  */
 
 #include "yaffs_guts.h"
@@ -43,9 +47,9 @@ static int yaffs_tags_marshall_write(struct yaffs_dev *dev,
 		    (struct yaffs_packed_tags2_tags_only *)(data +
 							dev->
 							data_bytes_per_chunk);
-		yaffs_pack_tags2_tags_only(pt2tp, tags);
+		yaffs_pack_tags2_tags_only(dev, pt2tp, tags);
 	} else {
-		yaffs_pack_tags2(&pt, tags, !dev->param.no_tags_ecc);
+		yaffs_pack_tags2(dev, &pt, tags, !dev->param.no_tags_ecc);
 	}
 
 	retval = dev->drv.drv_write_chunk_fn(dev, nand_chunk,
@@ -97,17 +101,20 @@ static int yaffs_tags_marshall_read(struct yaffs_dev *dev,
 		BUG();
 
 
+	if (retval == YAFFS_FAIL)
+		return YAFFS_FAIL;
+
 	if (dev->param.inband_tags) {
 		if (tags) {
 			struct yaffs_packed_tags2_tags_only *pt2tp;
 			pt2tp =
 				(struct yaffs_packed_tags2_tags_only *)
 				&data[dev->data_bytes_per_chunk];
-			yaffs_unpack_tags2_tags_only(tags, pt2tp);
+			yaffs_unpack_tags2_tags_only(dev, tags, pt2tp);
 		}
 	} else if (tags) {
 		memcpy(packed_tags_ptr, spare_buffer, packed_tags_size);
-		yaffs_unpack_tags2(tags, &pt, !dev->param.no_tags_ecc);
+		yaffs_unpack_tags2(dev, tags, &pt, !dev->param.no_tags_ecc);
 	}
 
 	if (local_data)
@@ -118,7 +125,7 @@ static int yaffs_tags_marshall_read(struct yaffs_dev *dev,
 		dev->n_ecc_unfixed++;
 	}
 
-	if (tags && ecc_result == -YAFFS_ECC_RESULT_FIXED) {
+	if (tags && ecc_result == YAFFS_ECC_RESULT_FIXED) {
 		if (tags->ecc_result <= YAFFS_ECC_RESULT_NO_ERROR)
 			tags->ecc_result = YAFFS_ECC_RESULT_FIXED;
 		dev->n_ecc_fixed++;
@@ -184,16 +191,16 @@ void yaffs_tags_marshall_install(struct yaffs_dev *dev)
 	if (!dev->param.is_yaffs2)
 		return;
 
-	if (!dev->th.write_chunk_tags_fn)
-		dev->th.write_chunk_tags_fn = yaffs_tags_marshall_write;
+	if (!dev->tagger.write_chunk_tags_fn)
+		dev->tagger.write_chunk_tags_fn = yaffs_tags_marshall_write;
 
-	if (!dev->th.read_chunk_tags_fn)
-		dev->th.read_chunk_tags_fn = yaffs_tags_marshall_read;
+	if (!dev->tagger.read_chunk_tags_fn)
+		dev->tagger.read_chunk_tags_fn = yaffs_tags_marshall_read;
 
-	if (!dev->th.query_block_fn)
-		dev->th.query_block_fn = yaffs_tags_marshall_query_block;
+	if (!dev->tagger.query_block_fn)
+		dev->tagger.query_block_fn = yaffs_tags_marshall_query_block;
 
-	if (!dev->th.mark_bad_fn)
-		dev->th.mark_bad_fn = yaffs_tags_marshall_mark_bad;
+	if (!dev->tagger.mark_bad_fn)
+		dev->tagger.mark_bad_fn = yaffs_tags_marshall_mark_bad;
 
 }