X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_fs.c;h=93236e403f08030074640f810fa3ec1cb827e422;hp=3fd94df12bab57878658836f06b4a0056ce0a7e8;hb=75977b65c083566a263c252312a06093d55c86ad;hpb=3e61039bf6fc5a2f8af6a5cdd29e30b3fa10b4f5

diff --git a/yaffs_fs.c b/yaffs_fs.c
index 3fd94df..93236e4 100644
--- a/yaffs_fs.c
+++ b/yaffs_fs.c
@@ -32,7 +32,7 @@
  */
 
 const char *yaffs_fs_c_version =
-    "$Id: yaffs_fs.c,v 1.83 2009-09-23 23:24:55 charles Exp $";
+    "$Id: yaffs_fs.c,v 1.85 2009-10-15 00:45:46 charles Exp $";
 extern const char *yaffs_guts_c_version;
 
 #include <linux/version.h>
@@ -1812,6 +1812,10 @@ typedef struct {
 	int skip_checkpoint_read;
 	int skip_checkpoint_write;
 	int no_cache;
+	int tags_ecc_on;
+	int tags_ecc_overridden;
+	int lazy_load_enabled;
+	int lazy_load_overridden;
 } yaffs_options;
 
 #define MAX_OPT_LEN 20
@@ -1827,6 +1831,9 @@ static int yaffs_parse_options(yaffs_options *options, const char *options_str)
 		memset(cur_opt, 0, MAX_OPT_LEN + 1);
 		p = 0;
 
+		while(*options_str == ',')
+			options_str++;
+
 		while (*options_str && *options_str != ',') {
 			if (p < MAX_OPT_LEN) {
 				cur_opt[p] = *options_str;
@@ -1837,7 +1844,19 @@ static int yaffs_parse_options(yaffs_options *options, const char *options_str)
 
 		if (!strcmp(cur_opt, "inband-tags"))
 			options->inband_tags = 1;
-		else if (!strcmp(cur_opt, "no-cache"))
+		else if (!strcmp(cur_opt, "tags-ecc-off")){
+			options->tags_ecc_on = 0;
+			options->tags_ecc_overridden=1;
+		} else if (!strcmp(cur_opt, "tags-ecc-on")){
+			options->tags_ecc_on = 1;
+			options->tags_ecc_overridden = 1;
+		} else if (!strcmp(cur_opt, "lazy-load-off")){
+			options->lazy_load_enabled = 0;
+			options->lazy_load_overridden=1;
+		} else if (!strcmp(cur_opt, "lazy-load-on")){
+			options->lazy_load_enabled = 1;
+			options->lazy_load_overridden = 1;
+		} else if (!strcmp(cur_opt, "no-cache"))
 			options->no_cache = 1;
 		else if (!strcmp(cur_opt, "no-checkpoint-read"))
 			options->skip_checkpoint_read = 1;
@@ -2053,6 +2072,18 @@ static struct super_block *yaffs_internal_read_super(int yaffsVersion,
 	dev->nShortOpCaches = (options.no_cache) ? 0 : 10;
 	dev->inbandTags = options.inband_tags;
 
+#ifdef CONFIG_YAFFS_DISABLE_LAZY_LOAD
+	dev->disableLazyLoad = 1;
+#endif
+	if(options.lazy_load_overridden)
+		dev->disableLazyLoad = !options.lazy_load_enabled;
+
+#ifdef CONFIG_YAFFS_DISABLE_TAGS_ECC
+	dev->noTagsECC = 1;
+#endif
+	if(options.tags_ecc_overridden)
+		dev->noTagsECC = !options.tags_ecc_on;
+
 	/* ... and the functions. */
 	if (yaffsVersion == 2) {
 		dev->writeChunkWithTagsToNAND =
@@ -2289,6 +2320,7 @@ static char *yaffs_dump_dev(char *buf, yaffs_Device * dev)
 	buf +=
 	    sprintf(buf, "nBackgroudDeletions %d\n", dev->nBackgroundDeletions);
 	buf += sprintf(buf, "useNANDECC......... %d\n", dev->useNANDECC);
+	buf += sprintf(buf, "noTagsECC.......... %d\n", dev->noTagsECC);
 	buf += sprintf(buf, "isYaffs2........... %d\n", dev->isYaffs2);
 	buf += sprintf(buf, "inbandTags......... %d\n", dev->inbandTags);