X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_linux_allocator.c;h=d0837f8696e946150dff107a90e4238179190be7;hp=72541326b0aee6855165863e43e5a87c644b55a4;hb=62003e4e28d993ae2182cb45276bc305ee656ce4;hpb=29e2dccbc8145ce3fd337a91a266d29e9b0f3f60

diff --git a/yaffs_linux_allocator.c b/yaffs_linux_allocator.c
index 7254132..d0837f8 100644
--- a/yaffs_linux_allocator.c
+++ b/yaffs_linux_allocator.c
@@ -11,7 +11,9 @@
  * published by the Free Software Foundation.
  *
  * 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.
  */
 
@@ -40,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;
 
@@ -100,10 +102,10 @@ 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")));
 
@@ -129,7 +131,7 @@ void yaffs_InitialiseRawTnodesAndObjects(yaffs_Device *dev)
 
 		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)
@@ -145,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]);
 
@@ -163,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){
@@ -173,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){
@@ -193,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);