Fix type cacl -> calc

[yaffs2.git] / patches / yaffs_linux_allocator.c

diff --git a/patches/yaffs_linux_allocator.c b/patches/yaffs_linux_allocator.c
index 82ae3dfdbe355cbe1253a4f70c3f9aabb1c7efb5..9cbb5892ba2ec87adbf465653be57cd7324b8c06 100644 (file)
--- 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>
@@ -55,7 +55,7 @@ void yaffs_deinit_raw_tnodes_and_objs(struct yaffs_dev *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(struct yaffs_dev *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;
 }
@@ -110,18 +110,18 @@ void yaffs_init_raw_tnodes_and_objs(struct yaffs_dev *dev)
        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,7 +141,7 @@ void yaffs_init_raw_tnodes_and_objs(struct yaffs_dev *dev)
                else {
                        T(YAFFS_TRACE_ALWAYS,
                                (TSTR("yaffs cache creation failed\n")));
-                       YBUG();
+                       BUG();
                }
 
 
@@ -159,23 +159,23 @@ void yaffs_init_raw_tnodes_and_objs(struct yaffs_dev *dev)
                else {
                        T(YAFFS_TRACE_ALWAYS,
                                (TSTR("yaffs cache creation failed\n")));
-                       YBUG();
+                       BUG();
                }
        } 
 }
 
 
-yaffs_tnode_t *yaffs_alloc_raw_tnode(struct yaffs_dev *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(struct yaffs_dev *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);
@@ -185,11 +185,11 @@ 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);