X-Git-Url: http://www.aleph1.co.uk/gitweb/?a=blobdiff_plain;f=patches%2Fyaffs_linux_allocator.c;h=9cbb5892ba2ec87adbf465653be57cd7324b8c06;hb=57c033480ccc5f019bd4ae738702456aacd02465;hp=d0837f8696e946150dff107a90e4238179190be7;hpb=1d65367807dc6c75458c2926b17727ae0765a856;p=yaffs2.git

diff --git a/patches/yaffs_linux_allocator.c b/patches/yaffs_linux_allocator.c
index d0837f8..9cbb589 100644
--- a/patches/yaffs_linux_allocator.c
+++ b/patches/yaffs_linux_allocator.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2010 Aleph One Ltd.
+ * Copyright (C) 2002-2011 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
@@ -42,7 +42,7 @@ typedef struct yaffs_AllocatorStruct yaffs_Allocator;
 
 int mount_id;
 
-void yaffs_deinit_raw_tnodes_and_objs(yaffs_dev_t *dev)
+void yaffs_deinit_raw_tnodes_and_objs(struct yaffs_dev *dev)
 {
 	yaffs_Allocator *allocator = (yaffs_Allocator *)dev->allocator;
 
@@ -55,7 +55,7 @@ void yaffs_deinit_raw_tnodes_and_objs(yaffs_dev_t *dev)
 		} else {
 			T(YAFFS_TRACE_ALWAYS,
 				(TSTR("NULL tnode cache\n")));
-			YBUG();
+			BUG();
 		}
 
 		if(allocator->object_cache){
@@ -64,15 +64,15 @@ void yaffs_deinit_raw_tnodes_and_objs(yaffs_dev_t *dev)
 		} else {
 			T(YAFFS_TRACE_ALWAYS,
 				(TSTR("NULL object cache\n")));
-			YBUG();
+			BUG();
 		}
 
-		YFREE(allocator);
+		kfree(allocator);
 
 	} else {
 		T(YAFFS_TRACE_ALWAYS,
 			(TSTR("Deinitialising NULL allocator\n")));
-		YBUG();
+		BUG();
 	}
 	dev->allocator = NULL;
 }
@@ -102,26 +102,26 @@ static void (*fake_ctor_list[10]) (void *) = {
 	fake_ctor9,
 };
 
-void yaffs_init_raw_tnodes_and_objs(yaffs_dev_t *dev)
+void yaffs_init_raw_tnodes_and_objs(struct yaffs_dev *dev)
 {
 	yaffs_Allocator *allocator;
-	unsigned mount_id = yaffs_dev_to_lc(dev)->mount_id;
+	unsigned mount_id = struct yaffs_devo_lc(dev)->mount_id;
 
 	T(YAFFS_TRACE_ALLOCATE,(TSTR("Initialising yaffs allocator\n")));
 
 	if(dev->allocator)
-		YBUG();
+		BUG();
 	else if(mount_id >= 10){
 		T(YAFFS_TRACE_ALWAYS,(TSTR("Bad mount_id %u\n"),mount_id));
 	} else {
-		 allocator = YMALLOC(sizeof(yaffs_Allocator));
+		 allocator = kmalloc(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();
+			BUG();
 			return;
 
 		}
@@ -141,13 +141,13 @@ void yaffs_init_raw_tnodes_and_objs(yaffs_dev_t *dev)
 		else {
 			T(YAFFS_TRACE_ALWAYS,
 				(TSTR("yaffs cache creation failed\n")));
-			YBUG();
+			BUG();
 		}
 
 
 		allocator->object_cache = 
 			kmem_cache_create(allocator->object_name,
-				sizeof(yaffs_obj_t),
+				sizeof(struct yaffs_obj),
 				0, 0,
 				fake_ctor_list[mount_id]);
 
@@ -159,43 +159,43 @@ void yaffs_init_raw_tnodes_and_objs(yaffs_dev_t *dev)
 		else {
 			T(YAFFS_TRACE_ALWAYS,
 				(TSTR("yaffs cache creation failed\n")));
-			YBUG();
+			BUG();
 		}
 	} 
 }
 
 
-yaffs_tnode_t *yaffs_alloc_raw_tnode(yaffs_dev_t *dev)
+struct yaffs_tnode *yaffs_alloc_raw_tnode(struct yaffs_dev *dev)
 {
 	yaffs_Allocator *allocator = dev->allocator;
 	if(!allocator || !allocator->tnode_cache){
-		YBUG();
+		BUG();
 		return NULL;
 	}
 	return kmem_cache_alloc(allocator->tnode_cache, GFP_NOFS);
 }
 
-void yaffs_free_raw_tnode(yaffs_dev_t *dev, yaffs_tnode_t *tn)
+void yaffs_free_raw_tnode(struct yaffs_dev *dev, struct yaffs_tnode *tn)
 {
 	yaffs_Allocator *allocator = dev->allocator;
 	kmem_cache_free(allocator->tnode_cache,tn);
 }
 
-yaffs_obj_t *yaffs_alloc_raw_obj(yaffs_dev_t *dev)
+struct yaffs_obj *yaffs_alloc_raw_obj(struct yaffs_dev *dev)
 {
 	yaffs_Allocator *allocator = dev->allocator;
 	if(!allocator){
-		YBUG();
+		BUG();
 		return NULL;
 	}
 	if(!allocator->object_cache){
-		YBUG();
+		BUG();
 		return NULL;
 	}
 	return kmem_cache_alloc(allocator->object_cache, GFP_NOFS);
 }
 
-void yaffs_free_raw_obj(yaffs_dev_t *dev, yaffs_obj_t *obj)
+void yaffs_free_raw_obj(struct yaffs_dev *dev, struct yaffs_obj *obj)
 {
 	yaffs_Allocator *allocator = dev->allocator;
 	kmem_cache_free(allocator->object_cache,obj);