yaffs: Remove SHORT_NAMES_IN_RAM and WIDE_TNODE_DISABLE configs

[yaffs2.git] / yaffs_vfs_single.c

diff --git a/yaffs_vfs_single.c b/yaffs_vfs_single.c
index 176dea7521172b26fecc2f2394d7afb57141c419..61bf255078c53f6892f0b932e3b41d45f48f0067 100644 (file)
--- a/yaffs_vfs_single.c
+++ b/yaffs_vfs_single.c
@@ -289,14 +289,14 @@ static unsigned yaffs_gc_control_callback(struct yaffs_dev *dev)
 static void yaffs_gross_lock(struct yaffs_dev *dev)
 {
        T(YAFFS_TRACE_LOCK, (TSTR("yaffs locking %p\n"), current));
-       down(&(yaffs_dev_to_lc(dev)->gross_lock));
+       mutex_lock(&(yaffs_dev_to_lc(dev)->gross_lock));
        T(YAFFS_TRACE_LOCK, (TSTR("yaffs locked %p\n"), current));
 }
 
 static void yaffs_gross_unlock(struct yaffs_dev *dev)
 {
        T(YAFFS_TRACE_LOCK, (TSTR("yaffs unlocking %p\n"), current));
-       up(&(yaffs_dev_to_lc(dev)->gross_lock));
+       mutex_unlock(&(yaffs_dev_to_lc(dev)->gross_lock));
 }
 
 /* ExportFS support */
@@ -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;
@@ -2007,7 +2009,7 @@ static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino)
 }
 
 static LIST_HEAD(yaffs_context_list);
-struct semaphore yaffs_context_lock;
+struct mutex yaffs_context_lock;
 
 static void yaffs_put_super(struct super_block *sb)
 {
@@ -2031,10 +2033,9 @@ static void yaffs_put_super(struct super_block *sb)
        yaffs_deinitialise(dev);
 
        yaffs_gross_unlock(dev);
-
-       down(&yaffs_context_lock);
+       mutex_lock(&yaffs_context_lock);
        list_del_init(&(yaffs_dev_to_lc(dev)->context_list));
-       up(&yaffs_context_lock);
+       mutex_unlock(&yaffs_context_lock);
 
        if (yaffs_dev_to_lc(dev)->spare_buffer) {
                YFREE(yaffs_dev_to_lc(dev)->spare_buffer);
@@ -2101,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")) {
@@ -2121,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 {
@@ -2431,14 +2432,10 @@ 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;
 
-       down(&yaffs_context_lock);
+       mutex_lock(&yaffs_context_lock);
        /* Get a mount id */
        found = 0;
        for (mount_id = 0; !found; mount_id++) {
@@ -2455,13 +2452,13 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version,
 
        list_add_tail(&(yaffs_dev_to_lc(dev)->context_list),
                      &yaffs_context_list);
-       up(&yaffs_context_lock);
+       mutex_unlock(&yaffs_context_lock);
 
        /* Directory search handling... */
        INIT_LIST_HEAD(&(yaffs_dev_to_lc(dev)->search_contexts));
        param->remove_obj_fn = yaffs_remove_obj_callback;
 
-       init_MUTEX(&(yaffs_dev_to_lc(dev)->gross_lock));
+       mutex_init(&(yaffs_dev_to_lc(dev)->gross_lock));
 
        yaffs_gross_lock(dev);
 
@@ -2676,7 +2673,7 @@ static int yaffs_proc_read(char *page,
        else {
                step -= 2;
 
-               down(&yaffs_context_lock);
+               mutex_lock(&yaffs_context_lock);
 
                /* Locate and print the Nth entry.  Order N-squared but N is small. */
                list_for_each(item, &yaffs_context_list) {
@@ -2694,12 +2691,13 @@ 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;
                }
-               up(&yaffs_context_lock);
+               mutex_unlock(&yaffs_context_lock);
        }
 
        return buf - page < count ? buf - page : count;
@@ -2713,7 +2711,7 @@ static int yaffs_stats_proc_read(char *page,
        char *buf = page;
        int n = 0;
 
-       down(&yaffs_context_lock);
+       mutex_lock(&yaffs_context_lock);
 
        /* Locate and print the Nth entry.  Order N-squared but N is small. */
        list_for_each(item, &yaffs_context_list) {
@@ -2731,7 +2729,7 @@ static int yaffs_stats_proc_read(char *page,
                               dev->bg_gcs, dev->oldest_dirty_gc_count,
                               dev->n_obj, dev->n_tnodes);
        }
-       up(&yaffs_context_lock);
+       mutex_unlock(&yaffs_context_lock);
 
        return buf - page < count ? buf - page : count;
 }
@@ -2905,7 +2903,7 @@ static int __init init_yaffs_fs(void)
           (" \n\n\n\nYAFFS-WARNING CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED selected.\n\n\n\n")));
 #endif
 
-       init_MUTEX(&yaffs_context_lock);
+       mutex_init(&yaffs_context_lock);
 
        /* Install the proc_fs entries */
        my_proc_entry = create_proc_entry("yaffs",
@@ -2915,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);
@@ -2925,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 */