yaffs Commiting some more yaffs tests showing bugs in yaffs.

[yaffs2.git] / yaffs_linux_allocator.c

diff --git a/yaffs_linux_allocator.c b/yaffs_linux_allocator.c
index 87de21bedf773d81c700c4d4af10a9a45b0241c2..d0837f8696e946150dff107a90e4238179190be7 100644 (file)
--- a/yaffs_linux_allocator.c
+++ b/yaffs_linux_allocator.c
@@ -13,6 +13,10 @@
  * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
  */
 
+/*
+ * Note: Tis code is currently unused. Being checked in in case it becomes useful.
+ */
+
 
 #include "yaffs_allocator.h"
 #include "yaffs_guts.h"
@@ -38,7 +42,7 @@ typedef struct yaffs_AllocatorStruct yaffs_Allocator;
 
 int mount_id;
 
-void yaffs_DeinitialiseRawTnodesAndObjects(yaffs_Device *dev)
+void yaffs_deinit_raw_tnodes_and_objs(yaffs_dev_t *dev)
 {
        yaffs_Allocator *allocator = (yaffs_Allocator *)dev->allocator;
 
@@ -62,14 +66,14 @@ void yaffs_DeinitialiseRawTnodesAndObjects(yaffs_Device *dev)
                                (TSTR("NULL object cache\n")));
                        YBUG();
                }
-               
+
                YFREE(allocator);
 
        } else {
                T(YAFFS_TRACE_ALWAYS,
                        (TSTR("Deinitialising NULL allocator\n")));
                YBUG();
-       }               
+       }
        dev->allocator = NULL;
 }
 
@@ -98,11 +102,11 @@ static void (*fake_ctor_list[10]) (void *) = {
        fake_ctor9,
 };
 
-void yaffs_InitialiseRawTnodesAndObjects(yaffs_Device *dev)
+void yaffs_init_raw_tnodes_and_objs(yaffs_dev_t *dev)
 {
        yaffs_Allocator *allocator;
-       unsigned mount_id = yaffs_DeviceToContext(dev)->mount_id;
-       
+       unsigned mount_id = yaffs_dev_to_lc(dev)->mount_id;
+
        T(YAFFS_TRACE_ALLOCATE,(TSTR("Initialising yaffs allocator\n")));
 
        if(dev->allocator)
@@ -113,21 +117,21 @@ void yaffs_InitialiseRawTnodesAndObjects(yaffs_Device *dev)
                 allocator = YMALLOC(sizeof(yaffs_Allocator));
                 memset(allocator,0,sizeof(yaffs_Allocator));
                 dev->allocator = allocator;
-               
+
                if(!dev->allocator){
                        T(YAFFS_TRACE_ALWAYS,
                                (TSTR("yaffs allocator creation failed\n")));
                        YBUG();
                        return;
-                       
+
                }
-               
+
                sprintf(allocator->tnode_name,"yaffs_t_%u",mount_id);
                sprintf(allocator->object_name,"yaffs_o_%u",mount_id);
-               
-               allocator->tnode_cache = 
+
+               allocator->tnode_cache =
                        kmem_cache_create(allocator->tnode_name,
-                               dev->tnodeSize,
+                               dev->tnode_size,
                                0, 0,
                                fake_ctor_list[mount_id]);
                if(allocator->tnode_cache)
@@ -143,7 +147,7 @@ void yaffs_InitialiseRawTnodesAndObjects(yaffs_Device *dev)
 
                allocator->object_cache = 
                        kmem_cache_create(allocator->object_name,
-                               sizeof(yaffs_Object),
+                               sizeof(yaffs_obj_t),
                                0, 0,
                                fake_ctor_list[mount_id]);
 
@@ -161,7 +165,7 @@ void yaffs_InitialiseRawTnodesAndObjects(yaffs_Device *dev)
 }
 
 
-yaffs_Tnode *yaffs_AllocateRawTnode(yaffs_Device *dev)
+yaffs_tnode_t *yaffs_alloc_raw_tnode(yaffs_dev_t *dev)
 {
        yaffs_Allocator *allocator = dev->allocator;
        if(!allocator || !allocator->tnode_cache){
@@ -171,13 +175,13 @@ yaffs_Tnode *yaffs_AllocateRawTnode(yaffs_Device *dev)
        return kmem_cache_alloc(allocator->tnode_cache, GFP_NOFS);
 }
 
-void yaffs_FreeRawTnode(yaffs_Device *dev, yaffs_Tnode *tn)
+void yaffs_free_raw_tnode(yaffs_dev_t *dev, yaffs_tnode_t *tn)
 {
        yaffs_Allocator *allocator = dev->allocator;
        kmem_cache_free(allocator->tnode_cache,tn);
 }
 
-yaffs_Object *yaffs_AllocateRawObject(yaffs_Device *dev)
+yaffs_obj_t *yaffs_alloc_raw_obj(yaffs_dev_t *dev)
 {
        yaffs_Allocator *allocator = dev->allocator;
        if(!allocator){
@@ -191,7 +195,7 @@ yaffs_Object *yaffs_AllocateRawObject(yaffs_Device *dev)
        return kmem_cache_alloc(allocator->object_cache, GFP_NOFS);
 }
 
-void yaffs_FreeRawObject(yaffs_Device *dev, yaffs_Object *obj)
+void yaffs_free_raw_obj(yaffs_dev_t *dev, yaffs_obj_t *obj)
 {
        yaffs_Allocator *allocator = dev->allocator;
        kmem_cache_free(allocator->object_cache,obj);