X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_allocator.c;h=35d8869c88fb2e19b7a9d0b959af21fb78c0eaf9;hp=66ba5a6705fcf2eea2e8a22f8f1dac8c4944d6ac;hb=4aab7ea4c9b8fb1bb9b375476a9faf70d29871b1;hpb=1d65367807dc6c75458c2926b17727ae0765a856

diff --git a/yaffs_allocator.c b/yaffs_allocator.c
index 66ba5a6..35d8869 100644
--- a/yaffs_allocator.c
+++ b/yaffs_allocator.c
@@ -20,45 +20,45 @@
 
 #ifdef CONFIG_YAFFS_YMALLOC_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 *)YMALLOC(dev->tnode_size);
 }
 
-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);
 }
 
-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 *) YMALLOC(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;
@@ -69,39 +69,36 @@ void yaffs_free_raw_obj(yaffs_dev_t *dev, yaffs_obj_t *obj)
 
 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;
-	yaffs_tnode_t *free_tnodes;
+	struct yaffs_tnode *free_tnodes;
 	int n_free_tnodes;
-	yaffs_tnodelist_t *alloc_tnode_list;
+	struct yaffs_tnode_list *alloc_tnode_list;
 
 	int n_obj_created;
-	yaffs_obj_t *free_objs;
+	struct yaffs_obj *free_objs;
 	int n_free_objects;
 
-	yaffs_obj_list *allocated_obj_list;
+	struct yaffs_obj_list *allocated_obj_list;
 };
 
 
-static void yaffs_deinit_raw_tnodes(yaffs_dev_t *dev)
+static void yaffs_deinit_raw_tnodes(struct yaffs_dev *dev)
 {
 
 	struct yaffs_allocator *allocator = (struct yaffs_allocator *)dev->allocator;
 
-	yaffs_tnodelist_t *tmp;
+	struct yaffs_tnode_list *tmp;
 
 	if(!allocator){
 		YBUG();
@@ -122,7 +119,7 @@ static void yaffs_deinit_raw_tnodes(yaffs_dev_t *dev)
 	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)
 {
 	struct yaffs_allocator *allocator = dev->allocator;
 
@@ -135,15 +132,15 @@ static void yaffs_init_raw_tnodes(yaffs_dev_t *dev)
 		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)
 {
 	struct yaffs_allocator *allocator = (struct yaffs_allocator *)dev->allocator;
 	int i;
-	yaffs_tnode_t *new_tnodes;
-	__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){
 		YBUG();
@@ -157,7 +154,7 @@ static int yaffs_create_tnodes(yaffs_dev_t *dev, int n_tnodes)
 	/* make these things */
 
 	new_tnodes = YMALLOC(n_tnodes * dev->tnode_size);
-	mem = (__u8 *)new_tnodes;
+	mem = (u8 *)new_tnodes;
 
 	if (!new_tnodes) {
 		T(YAFFS_TRACE_ERROR,
@@ -167,14 +164,14 @@ static int yaffs_create_tnodes(yaffs_dev_t *dev, int n_tnodes)
 
 	/* 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 = (struct yaffs_tnode *) &mem[(n_tnodes - 1) * dev->tnode_size];
 	curr->internal[0] = allocator->free_tnodes;
-	allocator->free_tnodes = (yaffs_tnode_t *)mem;
+	allocator->free_tnodes = (struct yaffs_tnode *)mem;
 
 	allocator->n_free_tnodes += n_tnodes;
 	allocator->n_tnodes_created += n_tnodes;
@@ -184,7 +181,7 @@ static int yaffs_create_tnodes(yaffs_dev_t *dev, int n_tnodes)
 	 * but it just means we can't free this bunch of tnodes later.
 	 */
 
-	tnl = YMALLOC(sizeof(yaffs_tnodelist_t));
+	tnl = YMALLOC(sizeof(struct yaffs_tnode_list));
 	if (!tnl) {
 		T(YAFFS_TRACE_ERROR,
 		  (TSTR
@@ -202,10 +199,10 @@ static int yaffs_create_tnodes(yaffs_dev_t *dev, int n_tnodes)
 }
 
 
-yaffs_tnode_t *yaffs_alloc_raw_tnode(yaffs_dev_t *dev)
+struct yaffs_tnode *yaffs_alloc_raw_tnode(struct yaffs_dev *dev)
 {
 	struct yaffs_allocator *allocator = (struct yaffs_allocator *)dev->allocator;
-	yaffs_tnode_t *tn = NULL;
+	struct yaffs_tnode *tn = NULL;
 
 	if(!allocator){
 		YBUG();
@@ -226,7 +223,7 @@ yaffs_tnode_t *yaffs_alloc_raw_tnode(yaffs_dev_t *dev)
 }
 
 /* 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)
 {
 	struct yaffs_allocator *allocator = dev->allocator;
 
@@ -245,7 +242,7 @@ void yaffs_free_raw_tnode(yaffs_dev_t *dev, yaffs_tnode_t *tn)
 
 
 
-static void yaffs_init_raw_objs(yaffs_dev_t *dev)
+static void yaffs_init_raw_objs(struct yaffs_dev *dev)
 {
 	struct yaffs_allocator *allocator = dev->allocator;
 
@@ -257,10 +254,10 @@ static void yaffs_init_raw_objs(yaffs_dev_t *dev)
 		YBUG();
 }
 
-static void yaffs_deinit_raw_objs(yaffs_dev_t *dev)
+static void yaffs_deinit_raw_objs(struct yaffs_dev *dev)
 {
 	struct yaffs_allocator *allocator = dev->allocator;
-	yaffs_obj_list *tmp;
+	struct yaffs_obj_list *tmp;
 
 	if(!allocator){
 		YBUG();
@@ -281,13 +278,13 @@ static void yaffs_deinit_raw_objs(yaffs_dev_t *dev)
 }
 
 
-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)
 {
 	struct yaffs_allocator *allocator = dev->allocator;
 
 	int i;
-	yaffs_obj_t *new_objs;
-	yaffs_obj_list *list;
+	struct yaffs_obj *new_objs;
+	struct yaffs_obj_list *list;
 
 	if(!allocator){
 		YBUG();
@@ -298,8 +295,8 @@ static int yaffs_create_free_objs(yaffs_dev_t *dev, int n_obj)
 		return YAFFS_OK;
 
 	/* make these things */
-	new_objs = YMALLOC(n_obj * sizeof(yaffs_obj_t));
-	list = YMALLOC(sizeof(yaffs_obj_list));
+	new_objs = YMALLOC(n_obj * sizeof(struct yaffs_obj));
+	list = YMALLOC(sizeof(struct yaffs_obj_list));
 
 	if (!new_objs || !list) {
 		if (new_objs){
@@ -318,7 +315,7 @@ static int yaffs_create_free_objs(yaffs_dev_t *dev, int n_obj)
 	/* Hook them into the free list */
 	for (i = 0; i < n_obj - 1; i++) {
 		new_objs[i].siblings.next =
-				(struct ylist_head *)(&new_objs[i + 1]);
+				(struct list_head *)(&new_objs[i + 1]);
 	}
 
 	new_objs[n_obj - 1].siblings.next = (void *)allocator->free_objs;
@@ -335,9 +332,9 @@ static int yaffs_create_free_objs(yaffs_dev_t *dev, int n_obj)
 	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;
+	struct yaffs_obj *obj = NULL;
 	struct yaffs_allocator *allocator = dev->allocator;
 
 	if(!allocator) {
@@ -352,7 +349,7 @@ yaffs_obj_t *yaffs_alloc_raw_obj(yaffs_dev_t *dev)
 	if (allocator->free_objs) {
 		obj = allocator->free_objs;
 		allocator->free_objs =
-			(yaffs_obj_t *) (allocator->free_objs->siblings.next);
+			(struct yaffs_obj *) (allocator->free_objs->siblings.next);
 		allocator->n_free_objects--;
 	}
 
@@ -360,7 +357,7 @@ yaffs_obj_t *yaffs_alloc_raw_obj(yaffs_dev_t *dev)
 }
 
 
-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)
 {
 
 	struct yaffs_allocator *allocator = dev->allocator;
@@ -369,13 +366,13 @@ void yaffs_free_raw_obj(yaffs_dev_t *dev, yaffs_obj_t *obj)
 		YBUG();
 	else {
 		/* Link into the free list. */
-		obj->siblings.next = (struct ylist_head *)(allocator->free_objs);
+		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){
 		yaffs_deinit_raw_tnodes(dev);
@@ -387,7 +384,7 @@ void yaffs_deinit_raw_tnodes_and_objs(yaffs_dev_t *dev)
 		YBUG();
 }
 
-void yaffs_init_raw_tnodes_and_objs(yaffs_dev_t *dev)
+void yaffs_init_raw_tnodes_and_objs(struct yaffs_dev *dev)
 {
 	struct yaffs_allocator *allocator;