X-Git-Url: http://aleph1.co.uk/gitweb/?a=blobdiff_plain;f=yaffs_guts.c;fp=yaffs_guts.c;h=3c1aa105f35fcf18f1cb73cbe06f4dd0e3e20c7d;hb=87b33ecd1898c99b9aa2b0abcbb3e6002d6b3532;hp=ce5f2387ab0aad483d8c403c15e69dcc7be663b3;hpb=df88cf1097f3b7012fc1010cccd4e682fb13de97;p=yaffs2.git

diff --git a/yaffs_guts.c b/yaffs_guts.c
index ce5f238..3c1aa10 100644
--- a/yaffs_guts.c
+++ b/yaffs_guts.c
@@ -609,7 +609,7 @@ static void yaffs_retire_block(struct yaffs_dev *dev, int flash_block)
 			memset(buffer, 0xff, dev->data_bytes_per_chunk);
 			memset(&tags, 0, sizeof(tags));
 			tags.seq_number = YAFFS_SEQUENCE_BAD_BLOCK;
-			if (dev->th.write_chunk_tags_fn(dev, chunk_id -
+			if (dev->tagger.write_chunk_tags_fn(dev, chunk_id -
 							dev->chunk_offset,
 							buffer,
 							&tags) != YAFFS_OK)
@@ -4536,7 +4536,7 @@ YCHAR *yaffs_get_symlink_alias(struct yaffs_obj *obj)
 static int yaffs_check_dev_fns(struct yaffs_dev *dev)
 {
 	struct yaffs_driver *drv = &dev->drv;
-	struct yaffs_tags_handler *th = &dev->th;
+	struct yaffs_tags_handler *tagger = &dev->tagger;
 
 	/* Common functions, gotta have */
 	if (!drv->drv_read_chunk_fn ||
@@ -4553,10 +4553,10 @@ static int yaffs_check_dev_fns(struct yaffs_dev *dev)
 	yaffs_tags_marshall_install(dev);
 
 	/* Check we now have the marshalling functions required. */
-	if (!th->write_chunk_tags_fn ||
-	    !th->read_chunk_tags_fn ||
-	    !th->query_block_fn ||
-	    !th->mark_bad_fn)
+	if (!tagger->write_chunk_tags_fn ||
+	    !tagger->read_chunk_tags_fn ||
+	    !tagger->query_block_fn ||
+	    !tagger->mark_bad_fn)
 		return 0;
 
 	return 1;