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

diff --git a/yaffs_allocator.c b/yaffs_allocator.c
index 024ee2a..f9cd5be 100644
--- a/yaffs_allocator.c
+++ b/yaffs_allocator.c
@@ -11,143 +11,135 @@
  * published by the Free Software Foundation.
  */
 
-
-
 #include "yaffs_allocator.h"
 #include "yaffs_guts.h"
 #include "yaffs_trace.h"
 #include "yportenv.h"
 
-#ifdef CONFIG_YAFFS_YMALLOC_ALLOCATOR
+#ifdef CONFIG_YAFFS_KMALLOC_ALLOCATOR
 
-void yaffs_deinit_raw_tnodes_and_objs(yaffs_dev_t *dev)
+void yaffs_deinit_raw_tnodes_and_objs(struct yaffs_dev *dev)
 {
 	dev = dev;
 }
 
-void yaffs_init_raw_tnodes_and_objs(yaffs_dev_t *dev)
+void yaffs_init_raw_tnodes_and_objs(struct yaffs_dev *dev)
 {
 	dev = dev;
 }
 
-yaffs_tnode_t *yaffs_alloc_raw_tnode(yaffs_dev_t *dev)
+struct yaffs_tnode *yaffs_alloc_raw_tnode(struct yaffs_dev *dev)
 {
-	return (yaffs_tnode_t *)YMALLOC(dev->tnode_size);
+	return (struct yaffs_tnode *)kmalloc(dev->tnode_size, 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)
 {
 	dev = dev;
-	YFREE(tn);
+	kfree(tn);
 }
 
-void yaffs_init_raw_objs(yaffs_dev_t *dev)
+void yaffs_init_raw_objs(struct yaffs_dev *dev)
 {
 	dev = dev;
 }
 
-void yaffs_deinit_raw_objs(yaffs_dev_t *dev)
+void yaffs_deinit_raw_objs(struct yaffs_dev *dev)
 {
 	dev = dev;
 }
 
-yaffs_obj_t *yaffs_alloc_raw_obj(yaffs_dev_t *dev)
+struct yaffs_obj *yaffs_alloc_raw_obj(struct yaffs_dev *dev)
 {
 	dev = dev;
-	return (yaffs_obj_t *) YMALLOC(sizeof(yaffs_obj_t));
+	return (struct yaffs_obj *)kmalloc(sizeof(struct yaffs_obj));
 }
 
-
-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)
 {
 
 	dev = dev;
-	YFREE(obj);
+	kfree(obj);
 }
 
 #else
 
 struct yaffs_tnode_list {
 	struct yaffs_tnode_list *next;
-	yaffs_tnode_t *tnodes;
+	struct yaffs_tnode *tnodes;
 };
 
-typedef struct yaffs_tnode_list yaffs_tnodelist_t;
-
-struct yaffs_obj_list_struct {
-	yaffs_obj_t *objects;
-	struct yaffs_obj_list_struct *next;
+struct yaffs_obj_list {
+	struct yaffs_obj_list *next;
+	struct yaffs_obj *objects;
 };
 
-typedef struct yaffs_obj_list_struct yaffs_obj_list;
+struct yaffs_allocator {
+	int n_tnodes_created;
+	struct yaffs_tnode *free_tnodes;
+	int n_free_tnodes;
+	struct yaffs_tnode_list *alloc_tnode_list;
 
+	int n_obj_created;
+	struct yaffs_obj *free_objs;
+	int n_free_objects;
 
-struct yaffs_AllocatorStruct {
-	int n_tnodesCreated;
-	yaffs_tnode_t *freeTnodes;
-	int nFreeTnodes;
-	yaffs_tnodelist_t *allocatedTnodeList;
-
-	int n_objCreated;
-	yaffs_obj_t *freeObjects;
-	int nFreeObjects;
-
-	yaffs_obj_list *allocated_list;
+	struct yaffs_obj_list *allocated_obj_list;
 };
 
-typedef struct yaffs_AllocatorStruct yaffs_Allocator;
-
-
-static void yaffs_deinit_raw_tnodes(yaffs_dev_t *dev)
+static void yaffs_deinit_raw_tnodes(struct yaffs_dev *dev)
 {
 
-	yaffs_Allocator *allocator = (yaffs_Allocator *)dev->allocator;
+	struct yaffs_allocator *allocator =
+	    (struct yaffs_allocator *)dev->allocator;
 
-	yaffs_tnodelist_t *tmp;
+	struct yaffs_tnode_list *tmp;
 
-	if(!allocator){
+	if (!allocator) {
 		YBUG();
 		return;
 	}
 
-	while (allocator->allocatedTnodeList) {
-		tmp = allocator->allocatedTnodeList->next;
+	while (allocator->alloc_tnode_list) {
+		tmp = allocator->alloc_tnode_list->next;
 
-		YFREE(allocator->allocatedTnodeList->tnodes);
-		YFREE(allocator->allocatedTnodeList);
-		allocator->allocatedTnodeList = tmp;
+		kfree(allocator->alloc_tnode_list->tnodes);
+		kfree(allocator->alloc_tnode_list);
+		allocator->alloc_tnode_list = tmp;
 
 	}
 
-	allocator->freeTnodes = NULL;
-	allocator->nFreeTnodes = 0;
-	allocator->n_tnodesCreated = 0;
+	allocator->free_tnodes = NULL;
+	allocator->n_free_tnodes = 0;
+	allocator->n_tnodes_created = 0;
 }
 
-static void yaffs_init_raw_tnodes(yaffs_dev_t *dev)
+static void yaffs_init_raw_tnodes(struct yaffs_dev *dev)
 {
-	yaffs_Allocator *allocator = dev->allocator;
-
-	if(allocator){
-		allocator->allocatedTnodeList = NULL;
-		allocator->freeTnodes = NULL;
-		allocator->nFreeTnodes = 0;
-		allocator->n_tnodesCreated = 0;
-	} else
+	struct yaffs_allocator *allocator = dev->allocator;
+
+	if (allocator) {
+		allocator->alloc_tnode_list = NULL;
+		allocator->free_tnodes = NULL;
+		allocator->n_free_tnodes = 0;
+		allocator->n_tnodes_created = 0;
+	} else {
 		YBUG();
+	}
 }
 
-static int yaffs_create_tnodes(yaffs_dev_t *dev, int n_tnodes)
+static int yaffs_create_tnodes(struct yaffs_dev *dev, int n_tnodes)
 {
-	yaffs_Allocator *allocator = (yaffs_Allocator *)dev->allocator;
+	struct yaffs_allocator *allocator =
+	    (struct yaffs_allocator *)dev->allocator;
 	int i;
-	yaffs_tnode_t *newTnodes;
-	__u8 *mem;
-	yaffs_tnode_t *curr;
-	yaffs_tnode_t *next;
-	yaffs_tnodelist_t *tnl;
+	struct yaffs_tnode *new_tnodes;
+	u8 *mem;
+	struct yaffs_tnode *curr;
+	struct yaffs_tnode *next;
+	struct yaffs_tnode_list *tnl;
 
-	if(!allocator){
+	if (!allocator) {
 		YBUG();
 		return YAFFS_FAIL;
 	}
@@ -155,143 +147,139 @@ static int yaffs_create_tnodes(yaffs_dev_t *dev, int n_tnodes)
 	if (n_tnodes < 1)
 		return YAFFS_OK;
 
-
 	/* make these things */
 
-	newTnodes = YMALLOC(n_tnodes * dev->tnode_size);
-	mem = (__u8 *)newTnodes;
+	new_tnodes = kmalloc(n_tnodes * dev->tnode_size, GFP_NOFS);
+	mem = (u8 *) new_tnodes;
 
-	if (!newTnodes) {
-		T(YAFFS_TRACE_ERROR,
-			(TSTR("yaffs: Could not allocate Tnodes" TENDSTR)));
+	if (!new_tnodes) {
+		yaffs_trace(YAFFS_TRACE_ERROR,
+			"yaffs: Could not allocate Tnodes");
 		return YAFFS_FAIL;
 	}
 
 	/* New hookup for wide tnodes */
 	for (i = 0; i < n_tnodes - 1; i++) {
-		curr = (yaffs_tnode_t *) &mem[i * dev->tnode_size];
-		next = (yaffs_tnode_t *) &mem[(i+1) * dev->tnode_size];
+		curr = (struct yaffs_tnode *)&mem[i * dev->tnode_size];
+		next = (struct yaffs_tnode *)&mem[(i + 1) * dev->tnode_size];
 		curr->internal[0] = next;
 	}
 
-	curr = (yaffs_tnode_t *) &mem[(n_tnodes - 1) * dev->tnode_size];
-	curr->internal[0] = allocator->freeTnodes;
-	allocator->freeTnodes = (yaffs_tnode_t *)mem;
+	curr = (struct yaffs_tnode *)&mem[(n_tnodes - 1) * dev->tnode_size];
+	curr->internal[0] = allocator->free_tnodes;
+	allocator->free_tnodes = (struct yaffs_tnode *)mem;
 
-	allocator->nFreeTnodes += n_tnodes;
-	allocator->n_tnodesCreated += n_tnodes;
+	allocator->n_free_tnodes += n_tnodes;
+	allocator->n_tnodes_created += n_tnodes;
 
 	/* Now add this bunch of tnodes to a list for freeing up.
 	 * NB If we can't add this to the management list it isn't fatal
 	 * but it just means we can't free this bunch of tnodes later.
 	 */
 
-	tnl = YMALLOC(sizeof(yaffs_tnodelist_t));
+	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)));
-		   return YAFFS_FAIL;
+		yaffs_trace(YAFFS_TRACE_ERROR,
+			"Could not add tnodes to management list");
+		return YAFFS_FAIL;
 	} else {
-		tnl->tnodes = newTnodes;
-		tnl->next = allocator->allocatedTnodeList;
-		allocator->allocatedTnodeList = tnl;
+		tnl->tnodes = new_tnodes;
+		tnl->next = allocator->alloc_tnode_list;
+		allocator->alloc_tnode_list = tnl;
 	}
 
-	T(YAFFS_TRACE_ALLOCATE, (TSTR("yaffs: Tnodes added" TENDSTR)));
+	yaffs_trace(YAFFS_TRACE_ALLOCATE,"Tnodes added");
 
 	return YAFFS_OK;
 }
 
-
-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 = (yaffs_Allocator *)dev->allocator;
-	yaffs_tnode_t *tn = NULL;
+	struct yaffs_allocator *allocator =
+	    (struct yaffs_allocator *)dev->allocator;
+	struct yaffs_tnode *tn = NULL;
 
-	if(!allocator){
+	if (!allocator) {
 		YBUG();
 		return NULL;
 	}
 
 	/* If there are none left make more */
-	if (!allocator->freeTnodes)
+	if (!allocator->free_tnodes)
 		yaffs_create_tnodes(dev, YAFFS_ALLOCATION_NTNODES);
 
-	if (allocator->freeTnodes) {
-		tn = allocator->freeTnodes;
-		allocator->freeTnodes = allocator->freeTnodes->internal[0];
-		allocator->nFreeTnodes--;
+	if (allocator->free_tnodes) {
+		tn = allocator->free_tnodes;
+		allocator->free_tnodes = allocator->free_tnodes->internal[0];
+		allocator->n_free_tnodes--;
 	}
 
 	return tn;
 }
 
 /* FreeTnode frees up a tnode and puts it back on the free list */
-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;
+	struct yaffs_allocator *allocator = dev->allocator;
 
-	if(!allocator){
+	if (!allocator) {
 		YBUG();
 		return;
 	}
 
 	if (tn) {
-		tn->internal[0] = allocator->freeTnodes;
-		allocator->freeTnodes = tn;
-		allocator->nFreeTnodes++;
+		tn->internal[0] = allocator->free_tnodes;
+		allocator->free_tnodes = tn;
+		allocator->n_free_tnodes++;
 	}
-	dev->checkpoint_blocks_required = 0; /* force recalculation*/
+	dev->checkpoint_blocks_required = 0;	/* force recalculation */
 }
 
-
-
-static void yaffs_init_raw_objs(yaffs_dev_t *dev)
+static void yaffs_init_raw_objs(struct yaffs_dev *dev)
 {
-	yaffs_Allocator *allocator = dev->allocator;
+	struct yaffs_allocator *allocator = dev->allocator;
 
-	if(allocator) {
-		allocator->allocated_list = NULL;
-		allocator->freeObjects = NULL;
-		allocator->nFreeObjects = 0;
-	} else
+	if (allocator) {
+		allocator->allocated_obj_list = NULL;
+		allocator->free_objs = NULL;
+		allocator->n_free_objects = 0;
+	} else {
 		YBUG();
+	}
 }
 
-static void yaffs_deinit_raw_objs(yaffs_dev_t *dev)
+static void yaffs_deinit_raw_objs(struct yaffs_dev *dev)
 {
-	yaffs_Allocator *allocator = dev->allocator;
-	yaffs_obj_list *tmp;
+	struct yaffs_allocator *allocator = dev->allocator;
+	struct yaffs_obj_list *tmp;
 
-	if(!allocator){
+	if (!allocator) {
 		YBUG();
 		return;
 	}
 
-	while (allocator->allocated_list) {
-		tmp = allocator->allocated_list->next;
-		YFREE(allocator->allocated_list->objects);
-		YFREE(allocator->allocated_list);
+	while (allocator->allocated_obj_list) {
+		tmp = allocator->allocated_obj_list->next;
+		kfree(allocator->allocated_obj_list->objects);
+		kfree(allocator->allocated_obj_list);
 
-		allocator->allocated_list = tmp;
+		allocator->allocated_obj_list = tmp;
 	}
 
-	allocator->freeObjects = NULL;
-	allocator->nFreeObjects = 0;
-	allocator->n_objCreated = 0;
+	allocator->free_objs = NULL;
+	allocator->n_free_objects = 0;
+	allocator->n_obj_created = 0;
 }
 
-
-static int yaffs_create_free_objs(yaffs_dev_t *dev, int n_obj)
+static int yaffs_create_free_objs(struct yaffs_dev *dev, int n_obj)
 {
-	yaffs_Allocator *allocator = dev->allocator;
+	struct yaffs_allocator *allocator = dev->allocator;
 
 	int i;
-	yaffs_obj_t *newObjects;
-	yaffs_obj_list *list;
+	struct yaffs_obj *new_objs;
+	struct yaffs_obj_list *list;
 
-	if(!allocator){
+	if (!allocator) {
 		YBUG();
 		return YAFFS_FAIL;
 	}
@@ -300,109 +288,109 @@ static int yaffs_create_free_objs(yaffs_dev_t *dev, int n_obj)
 		return YAFFS_OK;
 
 	/* make these things */
-	newObjects = YMALLOC(n_obj * sizeof(yaffs_obj_t));
-	list = YMALLOC(sizeof(yaffs_obj_list));
+	new_objs = kmalloc(n_obj * sizeof(struct yaffs_obj), GFP_NOFS);
+	list = kmalloc(sizeof(struct yaffs_obj_list), GFP_NOFS);
 
-	if (!newObjects || !list) {
-		if (newObjects){
-			YFREE(newObjects);
-			newObjects = NULL;
+	if (!new_objs || !list) {
+		if (new_objs) {
+			kfree(new_objs);
+			new_objs = NULL;
 		}
-		if (list){
-			YFREE(list);
+		if (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;
 	}
 
 	/* Hook them into the free list */
 	for (i = 0; i < n_obj - 1; i++) {
-		newObjects[i].siblings.next =
-				(struct ylist_head *)(&newObjects[i + 1]);
+		new_objs[i].siblings.next =
+		    (struct list_head *)(&new_objs[i + 1]);
 	}
 
-	newObjects[n_obj - 1].siblings.next = (void *)allocator->freeObjects;
-	allocator->freeObjects = newObjects;
-	allocator->nFreeObjects += n_obj;
-	allocator->n_objCreated += n_obj;
+	new_objs[n_obj - 1].siblings.next = (void *)allocator->free_objs;
+	allocator->free_objs = new_objs;
+	allocator->n_free_objects += n_obj;
+	allocator->n_obj_created += n_obj;
 
 	/* Now add this bunch of Objects to a list for freeing up. */
 
-	list->objects = newObjects;
-	list->next = allocator->allocated_list;
-	allocator->allocated_list = list;
+	list->objects = new_objs;
+	list->next = allocator->allocated_obj_list;
+	allocator->allocated_obj_list = list;
 
 	return YAFFS_OK;
 }
 
-yaffs_obj_t *yaffs_alloc_raw_obj(yaffs_dev_t *dev)
+struct yaffs_obj *yaffs_alloc_raw_obj(struct yaffs_dev *dev)
 {
-	yaffs_obj_t *obj = NULL;
-	yaffs_Allocator *allocator = dev->allocator;
+	struct yaffs_obj *obj = NULL;
+	struct yaffs_allocator *allocator = dev->allocator;
 
-	if(!allocator) {
+	if (!allocator) {
 		YBUG();
 		return obj;
 	}
 
 	/* If there are none left make more */
-	if (!allocator->freeObjects)
+	if (!allocator->free_objs)
 		yaffs_create_free_objs(dev, YAFFS_ALLOCATION_NOBJECTS);
 
-	if (allocator->freeObjects) {
-		obj = allocator->freeObjects;
-		allocator->freeObjects =
-			(yaffs_obj_t *) (allocator->freeObjects->siblings.next);
-		allocator->nFreeObjects--;
+	if (allocator->free_objs) {
+		obj = allocator->free_objs;
+		allocator->free_objs =
+		    (struct yaffs_obj *)(allocator->free_objs->siblings.next);
+		allocator->n_free_objects--;
 	}
 
 	return obj;
 }
 
-
-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;
+	struct yaffs_allocator *allocator = dev->allocator;
 
-	if(!allocator)
+	if (!allocator)
 		YBUG();
 	else {
 		/* Link into the free list. */
-		obj->siblings.next = (struct ylist_head *)(allocator->freeObjects);
-		allocator->freeObjects = obj;
-		allocator->nFreeObjects++;
+		obj->siblings.next = (struct list_head *)(allocator->free_objs);
+		allocator->free_objs = obj;
+		allocator->n_free_objects++;
 	}
 }
 
-void yaffs_deinit_raw_tnodes_and_objs(yaffs_dev_t *dev)
+void yaffs_deinit_raw_tnodes_and_objs(struct yaffs_dev *dev)
 {
-	if(dev->allocator){
+	if (dev->allocator) {
 		yaffs_deinit_raw_tnodes(dev);
 		yaffs_deinit_raw_objs(dev);
 
-		YFREE(dev->allocator);
-		dev->allocator=NULL;
-	} else
+		kfree(dev->allocator);
+		dev->allocator = NULL;
+	} else {
 		YBUG();
+	}
 }
 
-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;
+	struct yaffs_allocator *allocator;
 
-	if(!dev->allocator){
-		allocator = YMALLOC(sizeof(yaffs_Allocator));
-		if(allocator){
+	if (!dev->allocator) {
+		allocator = kmalloc(sizeof(struct yaffs_allocator), GFP_NOFS);
+		if (allocator) {
 			dev->allocator = allocator;
 			yaffs_init_raw_tnodes(dev);
 			yaffs_init_raw_objs(dev);
 		}
-	} else
+	} else {
 		YBUG();
+	}
 }
 
-
 #endif