X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_vfs_single.c;h=c5376e947785231003ed2e397d48c09f40155d87;hp=a17262cef01b30628f7ad09bd4574a7ada389b19;hb=8b7bb68127f6074218a368f8059e844ab51536c1;hpb=73c54aa8c1de3f61a4c211cd47431293a6092f18

diff --git a/yaffs_vfs_single.c b/yaffs_vfs_single.c
index a17262c..c5376e9 100644
--- a/yaffs_vfs_single.c
+++ b/yaffs_vfs_single.c
@@ -1890,11 +1890,13 @@ static int yaffs_bg_thread_fn(void *data)
 					next_gc = now + HZ / 10 + 1;
 				else
 					next_gc = now + HZ * 2;
-			} else	/*
+			} else	{
+			        /*
 				 * gc not running so set to next_dir_update
 				 * to cut down on wake ups
 				 */
 				next_gc = next_dir_update;
+                        }
 		}
 		yaffs_gross_unlock(dev);
 		expires = next_dir_update;
@@ -2100,9 +2102,9 @@ static int yaffs_parse_options(struct yaffs_options *options,
 			options_str++;
 		}
 
-		if (!strcmp(cur_opt, "inband-tags"))
+		if (!strcmp(cur_opt, "inband-tags")) {
 			options->inband_tags = 1;
-		else if (!strcmp(cur_opt, "tags-ecc-off")) {
+		} 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")) {
@@ -2120,13 +2122,13 @@ static int yaffs_parse_options(struct yaffs_options *options,
 		} else if (!strcmp(cur_opt, "empty-lost-and-found-on")) {
 			options->empty_lost_and_found = 1;
 			options->empty_lost_and_found_overridden = 1;
-		} else if (!strcmp(cur_opt, "no-cache"))
+		} else if (!strcmp(cur_opt, "no-cache")) {
 			options->no_cache = 1;
-		else if (!strcmp(cur_opt, "no-checkpoint-read"))
+		} else if (!strcmp(cur_opt, "no-checkpoint-read")) {
 			options->skip_checkpoint_read = 1;
-		else if (!strcmp(cur_opt, "no-checkpoint-write"))
+		} else if (!strcmp(cur_opt, "no-checkpoint-write")) {
 			options->skip_checkpoint_write = 1;
-		else if (!strcmp(cur_opt, "no-checkpoint")) {
+		} else if (!strcmp(cur_opt, "no-checkpoint")) {
 			options->skip_checkpoint_read = 1;
 			options->skip_checkpoint_write = 1;
 		} else {
@@ -2430,10 +2432,6 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version,
 	param->use_nand_ecc = 1;
 #endif
 
-#ifdef CONFIG_YAFFS_DISABLE_WIDE_TNODES
-	param->wide_tnodes_disabled = 1;
-#endif
-
 	param->skip_checkpt_rd = options.skip_checkpoint_read;
 	param->skip_checkpt_wr = options.skip_checkpoint_write;
 
@@ -2693,8 +2691,9 @@ static int yaffs_proc_read(char *page,
 				    sprintf(buf, "\nDevice %d \"%s\"\n", n,
 					    dev->param.name);
 				buf = yaffs_dump_dev_part0(buf, dev);
-			} else
+			} else {
 				buf = yaffs_dump_dev_part1(buf, dev);
+                        }
 
 			break;
 		}
@@ -2745,35 +2744,36 @@ static struct {
 	char *mask_name;
 	unsigned mask_bitfield;
 } mask_flags[] = {
-	{
-	"allocate", YAFFS_TRACE_ALLOCATE}, {
-	"always", YAFFS_TRACE_ALWAYS}, {
-	"background", YAFFS_TRACE_BACKGROUND}, {
-	"bad_blocks", YAFFS_TRACE_BAD_BLOCKS}, {
-	"buffers", YAFFS_TRACE_BUFFERS}, {
-	"bug", YAFFS_TRACE_BUG}, {
-	"checkpt", YAFFS_TRACE_CHECKPOINT}, {
-	"deletion", YAFFS_TRACE_DELETION}, {
-	"erase", YAFFS_TRACE_ERASE}, {
-	"error", YAFFS_TRACE_ERROR}, {
-	"gc_detail", YAFFS_TRACE_GC_DETAIL}, {
-	"gc", YAFFS_TRACE_GC}, {
-	"lock", YAFFS_TRACE_LOCK}, {
-	"mtd", YAFFS_TRACE_MTD}, {
-	"nandaccess", YAFFS_TRACE_NANDACCESS}, {
-	"os", YAFFS_TRACE_OS}, {
-	"scan_debug", YAFFS_TRACE_SCAN_DEBUG}, {
-	"scan", YAFFS_TRACE_SCAN}, {
-	"tracing", YAFFS_TRACE_TRACING}, {
-	"sync", YAFFS_TRACE_SYNC}, {
-	"write", YAFFS_TRACE_WRITE}, {
-	"verify", YAFFS_TRACE_VERIFY}, {
-	"verify_nand", YAFFS_TRACE_VERIFY_NAND}, {
-	"verify_full", YAFFS_TRACE_VERIFY_FULL}, {
-	"verify_all", YAFFS_TRACE_VERIFY_ALL}, {
-	"all", 0xffffffff}, {
-	"none", 0}, {
-NULL, 0},};
+	{"allocate", YAFFS_TRACE_ALLOCATE}, 
+	{"always", YAFFS_TRACE_ALWAYS},
+	{"background", YAFFS_TRACE_BACKGROUND},
+	{"bad_blocks", YAFFS_TRACE_BAD_BLOCKS},
+	{"buffers", YAFFS_TRACE_BUFFERS},
+	{"bug", YAFFS_TRACE_BUG},
+	{"checkpt", YAFFS_TRACE_CHECKPOINT},
+	{"deletion", YAFFS_TRACE_DELETION},
+	{"erase", YAFFS_TRACE_ERASE},
+	{"error", YAFFS_TRACE_ERROR},
+	{"gc_detail", YAFFS_TRACE_GC_DETAIL},
+	{"gc", YAFFS_TRACE_GC},
+	{"lock", YAFFS_TRACE_LOCK},
+	{"mtd", YAFFS_TRACE_MTD},
+	{"nandaccess", YAFFS_TRACE_NANDACCESS},
+	{"os", YAFFS_TRACE_OS},
+	{"scan_debug", YAFFS_TRACE_SCAN_DEBUG},
+	{"scan", YAFFS_TRACE_SCAN},
+	{"mount", YAFFS_TRACE_MOUNT},
+	{"tracing", YAFFS_TRACE_TRACING},
+	{"sync", YAFFS_TRACE_SYNC},
+	{"write", YAFFS_TRACE_WRITE},
+	{"verify", YAFFS_TRACE_VERIFY},
+	{"verify_nand", YAFFS_TRACE_VERIFY_NAND},
+	{"verify_full", YAFFS_TRACE_VERIFY_FULL},
+	{"verify_all", YAFFS_TRACE_VERIFY_ALL},
+	{"all", 0xffffffff},
+	{"none", 0},
+	{NULL, 0},
+};
 
 #define MAX_MASK_NAME_LENGTH 40
 static int yaffs_proc_write_trace_options(struct file *file, const char *buf,
@@ -2914,8 +2914,9 @@ static int __init init_yaffs_fs(void)
 		my_proc_entry->write_proc = yaffs_proc_write;
 		my_proc_entry->read_proc = yaffs_proc_read;
 		my_proc_entry->data = NULL;
-	} else
+	} else {
 		return -ENOMEM;
+        }
 
 	debug_proc_entry = create_proc_entry("yaffs_stats",
 					     S_IRUGO | S_IFREG, YPROC_ROOT);
@@ -2924,8 +2925,9 @@ static int __init init_yaffs_fs(void)
 		debug_proc_entry->write_proc = NULL;
 		debug_proc_entry->read_proc = yaffs_stats_proc_read;
 		debug_proc_entry->data = NULL;
-	} else
+	} else {
 		return -ENOMEM;
+        }
 
 	/* Now add the file system entries */