X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_allocator.c;h=f9cd5becd8f470fc76302ec5498b077fa6c631d9;hp=b9fe31e70d475840e8c613d8eb2a2fa29663913e;hb=2870702e0b0f4342857222a36ffcb21886c7f4bf;hpb=1c8604a29f8ca073e1f5129c58e201a4b42bc192

diff --git a/yaffs_allocator.c b/yaffs_allocator.c
index b9fe31e..f9cd5be 100644
--- a/yaffs_allocator.c
+++ b/yaffs_allocator.c
@@ -16,7 +16,7 @@
 #include "yaffs_trace.h"
 #include "yportenv.h"
 
-#ifdef CONFIG_YAFFS_YMALLOC_ALLOCATOR
+#ifdef CONFIG_YAFFS_KMALLOC_ALLOCATOR
 
 void yaffs_deinit_raw_tnodes_and_objs(struct yaffs_dev *dev)
 {
@@ -30,13 +30,13 @@ void yaffs_init_raw_tnodes_and_objs(struct yaffs_dev *dev)
 
 struct yaffs_tnode *yaffs_alloc_raw_tnode(struct yaffs_dev *dev)
 {
-	return (struct yaffs_tnode *)YMALLOC(dev->tnode_size);
+	return (struct yaffs_tnode *)kmalloc(dev->tnode_size, GFP_NOFS);
 }
 
 void yaffs_free_raw_tnode(struct yaffs_dev *dev, struct yaffs_tnode *tn)
 {
 	dev = dev;
-	YFREE(tn);
+	kfree(tn);
 }
 
 void yaffs_init_raw_objs(struct yaffs_dev *dev)
@@ -52,14 +52,14 @@ void yaffs_deinit_raw_objs(struct yaffs_dev *dev)
 struct yaffs_obj *yaffs_alloc_raw_obj(struct yaffs_dev *dev)
 {
 	dev = dev;
-	return (struct yaffs_obj *)YMALLOC(sizeof(struct yaffs_obj));
+	return (struct yaffs_obj *)kmalloc(sizeof(struct yaffs_obj));
 }
 
 void yaffs_free_raw_obj(struct yaffs_dev *dev, struct yaffs_obj *obj)
 {
 
 	dev = dev;
-	YFREE(obj);
+	kfree(obj);
 }
 
 #else
@@ -103,8 +103,8 @@ static void yaffs_deinit_raw_tnodes(struct yaffs_dev *dev)
 	while (allocator->alloc_tnode_list) {
 		tmp = allocator->alloc_tnode_list->next;
 
-		YFREE(allocator->alloc_tnode_list->tnodes);
-		YFREE(allocator->alloc_tnode_list);
+		kfree(allocator->alloc_tnode_list->tnodes);
+		kfree(allocator->alloc_tnode_list);
 		allocator->alloc_tnode_list = tmp;
 
 	}
@@ -149,12 +149,12 @@ static int yaffs_create_tnodes(struct yaffs_dev *dev, int n_tnodes)
 
 	/* make these things */
 
-	new_tnodes = YMALLOC(n_tnodes * dev->tnode_size);
+	new_tnodes = kmalloc(n_tnodes * dev->tnode_size, GFP_NOFS);
 	mem = (u8 *) new_tnodes;
 
 	if (!new_tnodes) {
-		T(YAFFS_TRACE_ERROR,
-		  (TSTR("yaffs: Could not allocate Tnodes" TENDSTR)));
+		yaffs_trace(YAFFS_TRACE_ERROR,
+			"yaffs: Could not allocate Tnodes");
 		return YAFFS_FAIL;
 	}
 
@@ -177,11 +177,10 @@ static int yaffs_create_tnodes(struct yaffs_dev *dev, int n_tnodes)
 	 * but it just means we can't free this bunch of tnodes later.
 	 */
 
-	tnl = YMALLOC(sizeof(struct yaffs_tnode_list));
+	tnl = kmalloc(sizeof(struct yaffs_tnode_list), GFP_NOFS);
 	if (!tnl) {
-		T(YAFFS_TRACE_ERROR,
-		  (TSTR
-		   ("yaffs: Could not add tnodes to management list" TENDSTR)));
+		yaffs_trace(YAFFS_TRACE_ERROR,
+			"Could not add tnodes to management list");
 		return YAFFS_FAIL;
 	} else {
 		tnl->tnodes = new_tnodes;
@@ -189,7 +188,7 @@ static int yaffs_create_tnodes(struct yaffs_dev *dev, int n_tnodes)
 		allocator->alloc_tnode_list = tnl;
 	}
 
-	T(YAFFS_TRACE_ALLOCATE, (TSTR("yaffs: Tnodes added" TENDSTR)));
+	yaffs_trace(YAFFS_TRACE_ALLOCATE,"Tnodes added");
 
 	return YAFFS_OK;
 }
@@ -261,8 +260,8 @@ static void yaffs_deinit_raw_objs(struct yaffs_dev *dev)
 
 	while (allocator->allocated_obj_list) {
 		tmp = allocator->allocated_obj_list->next;
-		YFREE(allocator->allocated_obj_list->objects);
-		YFREE(allocator->allocated_obj_list);
+		kfree(allocator->allocated_obj_list->objects);
+		kfree(allocator->allocated_obj_list);
 
 		allocator->allocated_obj_list = tmp;
 	}
@@ -289,20 +288,20 @@ static int yaffs_create_free_objs(struct yaffs_dev *dev, int n_obj)
 		return YAFFS_OK;
 
 	/* make these things */
-	new_objs = YMALLOC(n_obj * sizeof(struct yaffs_obj));
-	list = YMALLOC(sizeof(struct yaffs_obj_list));
+	new_objs = kmalloc(n_obj * sizeof(struct yaffs_obj), GFP_NOFS);
+	list = kmalloc(sizeof(struct yaffs_obj_list), GFP_NOFS);
 
 	if (!new_objs || !list) {
 		if (new_objs) {
-			YFREE(new_objs);
+			kfree(new_objs);
 			new_objs = NULL;
 		}
 		if (list) {
-			YFREE(list);
+			kfree(list);
 			list = NULL;
 		}
-		T(YAFFS_TRACE_ALLOCATE,
-		  (TSTR("yaffs: Could not allocate more objects" TENDSTR)));
+		yaffs_trace(YAFFS_TRACE_ALLOCATE,
+			"Could not allocate more objects");
 		return YAFFS_FAIL;
 	}
 
@@ -371,7 +370,7 @@ void yaffs_deinit_raw_tnodes_and_objs(struct yaffs_dev *dev)
 		yaffs_deinit_raw_tnodes(dev);
 		yaffs_deinit_raw_objs(dev);
 
-		YFREE(dev->allocator);
+		kfree(dev->allocator);
 		dev->allocator = NULL;
 	} else {
 		YBUG();
@@ -383,7 +382,7 @@ void yaffs_init_raw_tnodes_and_objs(struct yaffs_dev *dev)
 	struct yaffs_allocator *allocator;
 
 	if (!dev->allocator) {
-		allocator = YMALLOC(sizeof(struct yaffs_allocator));
+		allocator = kmalloc(sizeof(struct yaffs_allocator), GFP_NOFS);
 		if (allocator) {
 			dev->allocator = allocator;
 			yaffs_init_raw_tnodes(dev);