X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_vfs_single.c;h=61bf255078c53f6892f0b932e3b41d45f48f0067;hp=a17262cef01b30628f7ad09bd4574a7ada389b19;hb=376375059d26aeb3fca08ba9dfd1f9b8b5842c75;hpb=5409719091c79983abc45bcc3070bce6786c8278

diff --git a/yaffs_vfs_single.c b/yaffs_vfs_single.c
index a17262c..61bf255 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;
 		}
@@ -2914,8 +2913,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 +2924,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 */