yaffs direct: Prevent yaffs_start_up being called twice.

It is OK to add more devices on the fly, but the yaffs_start_up function
memsets the device back to 0 which nukes the list head and breaks the list.

Signed-off-by: Charles Manning <cdhmanning@gmail.com>

diff --git a/direct/basic-test/dtest.c b/direct/basic-test/dtest.c
index 0a54bd42b847677be1690c27236fcd4ec5fe8bb0..35354232883e837e768f80378722f438731b3c65 100644 (file)
--- a/direct/basic-test/dtest.c
+++ b/direct/basic-test/dtest.c
@@ -2797,6 +2797,18 @@ void max_files_test(const char *mountpt)
 
 }
 
+void start_twice(const char *mountpt)
+{
+         printf("About to do first yaffs_start\n");
+         yaffs_start_up();
+         printf("started\n");
+         printf("First mount returns %d\n", yaffs_mount(mountpt));
+         printf("About to do second yaffs_start\n");
+         yaffs_start_up();
+         printf("started\n");
+         printf("Second mount returns %d\n", yaffs_mount(mountpt));
+}
+
 int random_seed;
 int simulate_power_failure;
 
@@ -2864,7 +2876,9 @@ int main(int argc, char *argv[])
         // link_follow_test("/yaffs2");
         //basic_utime_test("/yaffs2");
 
-        max_files_test("/yaffs2");
+        //max_files_test("/yaffs2");
+        
+        start_twice("/yaffs2");
 
 
         return 0;

diff --git a/direct/basic-test/yaffscfg2k.c b/direct/basic-test/yaffscfg2k.c
index 441ee05fe6a7839ae450042c853d955be80f4048..b857479940e83e4eb9b0b65c107898543082e9bf 100644 (file)
--- a/direct/basic-test/yaffscfg2k.c
+++ b/direct/basic-test/yaffscfg2k.c
@@ -30,19 +30,19 @@
 
 #include <errno.h>
 
-unsigned yaffs_trace_mask = 
+unsigned yaffs_trace_mask =
 
-       YAFFS_TRACE_SCAN |  
+       YAFFS_TRACE_SCAN |
        YAFFS_TRACE_GC |
-       YAFFS_TRACE_ERASE | 
-       YAFFS_TRACE_ERROR | 
-       YAFFS_TRACE_TRACING | 
-       YAFFS_TRACE_ALLOCATE | 
+       YAFFS_TRACE_ERASE |
+       YAFFS_TRACE_ERROR |
+       YAFFS_TRACE_TRACING |
+       YAFFS_TRACE_ALLOCATE |
        YAFFS_TRACE_BAD_BLOCKS |
-       YAFFS_TRACE_VERIFY | 
-       
+       YAFFS_TRACE_VERIFY |
+
        0;
-        
+
 
 
 // Configuration
@@ -58,10 +58,16 @@ struct yaffs_dev m18_1Dev;
 
 int yaffs_start_up(void)
 {
+       static int start_up_called = 0;
+
+       if(start_up_called)
+               return;
+       start_up_called = 1;
+
        // Stuff to configure YAFFS
        // Stuff to initialise anything special (eg lock semaphore).
        yaffsfs_OSInitialisation();
-       
+
        // Set up devices
        // /ram1   ram, yaffs1
        memset(&ram1Dev,0,sizeof(ram1Dev));
@@ -70,7 +76,7 @@ int yaffs_start_up(void)
        ram1Dev.param.chunks_per_block = 32;
        ram1Dev.param.n_reserved_blocks = 2; // Set this smaller for RAM
        ram1Dev.param.start_block = 0; // Can use block 0
-       ram1Dev.param.end_block = 127; // Last block in 2MB.    
+       ram1Dev.param.end_block = 127; // Last block in 2MB.
        //ram1Dev.param.use_nand_ecc = 1;
        ram1Dev.param.n_caches = 0;     // Disable caching on this device.
        ram1Dev.driver_context = (void *) 0;    // Used to identify the device in fstat.
@@ -78,7 +84,7 @@ int yaffs_start_up(void)
        ram1Dev.param.read_chunk_tags_fn = yramdisk_rd_chunk;
        ram1Dev.param.erase_fn = yramdisk_erase;
        ram1Dev.param.initialise_flash_fn = yramdisk_initialise;
-       
+
        yaffs_add_device(&ram1Dev);
 
        // /M18-1 yaffs1 on M18 nor sim
@@ -130,7 +136,7 @@ int yaffs_start_up(void)
        yaffs_add_device(&flashDev);
 
 // todo        yaffs_initialise(yaffsfs_config);
-       
+
        return 0;
 }
 

diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c
index 2668b22daf46eeb36b3720847aecb75735535a54..37d6cae1d0cce812d4217f6444c06fbaf8360dd5 100644 (file)
--- a/direct/yaffsfs.c
+++ b/direct/yaffsfs.c
@@ -2720,6 +2720,14 @@ int yaffs_inodecount(const YCHAR *path)
 
 void yaffs_add_device(struct yaffs_dev *dev)
 {
+       struct list_head *cfg;
+       /* First check that the device is not in the list. */
+
+       list_for_each(cfg, &yaffsfs_deviceList){
+               if(dev == list_entry(cfg, struct yaffs_dev, dev_list))
+                       return;
+       }
+
        dev->is_mounted = 0;
        dev->param.remove_obj_fn = yaffsfs_RemoveObjectCallback;