Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[linux-2.6] / fs / jffs2 / malloc.c

diff --git a/fs/jffs2/malloc.c b/fs/jffs2/malloc.c
index 734801145bf87cea2bc75defb0f69045f37bd4bc..036cbd11c00449d6755481b8a51e53bbf0f7fb4f 100644 (file)
--- a/fs/jffs2/malloc.c
+++ b/fs/jffs2/malloc.c
@@ -7,7 +7,7 @@
  *
  * For licensing information, see the file 'LICENCE' in this directory.
  *
- * $Id: malloc.c,v 1.29 2005/07/27 14:16:53 dedekind Exp $
+ * $Id: malloc.c,v 1.31 2005/11/07 11:14:40 gleixner Exp $
  *
  */
 
@@ -29,7 +29,7 @@ static kmem_cache_t *inode_cache_slab;
 
 int __init jffs2_create_slab_caches(void)
 {
-       full_dnode_slab = kmem_cache_create("jffs2_full_dnode", 
+       full_dnode_slab = kmem_cache_create("jffs2_full_dnode",
                                            sizeof(struct jffs2_full_dnode),
                                            0, 0, NULL, NULL);
        if (!full_dnode_slab)
@@ -97,13 +97,13 @@ struct jffs2_full_dirent *jffs2_alloc_full_dirent(int namesize)
 {
        struct jffs2_full_dirent *ret;
        ret = kmalloc(sizeof(struct jffs2_full_dirent) + namesize, GFP_KERNEL);
-       JFFS2_DBG_MEMALLOC("%p\n", ret);
+       dbg_memalloc("%p\n", ret);
        return ret;
 }
 
 void jffs2_free_full_dirent(struct jffs2_full_dirent *x)
 {
-       JFFS2_DBG_MEMALLOC("%p\n", x);
+       dbg_memalloc("%p\n", x);
        kfree(x);
 }
 
@@ -111,13 +111,13 @@ struct jffs2_full_dnode *jffs2_alloc_full_dnode(void)
 {
        struct jffs2_full_dnode *ret;
        ret = kmem_cache_alloc(full_dnode_slab, GFP_KERNEL);
-       JFFS2_DBG_MEMALLOC("%p\n", ret);
+       dbg_memalloc("%p\n", ret);
        return ret;
 }
 
 void jffs2_free_full_dnode(struct jffs2_full_dnode *x)
 {
-       JFFS2_DBG_MEMALLOC("%p\n", x);
+       dbg_memalloc("%p\n", x);
        kmem_cache_free(full_dnode_slab, x);
 }
 
@@ -125,13 +125,13 @@ struct jffs2_raw_dirent *jffs2_alloc_raw_dirent(void)
 {
        struct jffs2_raw_dirent *ret;
        ret = kmem_cache_alloc(raw_dirent_slab, GFP_KERNEL);
-       JFFS2_DBG_MEMALLOC("%p\n", ret);
+       dbg_memalloc("%p\n", ret);
        return ret;
 }
 
 void jffs2_free_raw_dirent(struct jffs2_raw_dirent *x)
 {
-       JFFS2_DBG_MEMALLOC("%p\n", x);
+       dbg_memalloc("%p\n", x);
        kmem_cache_free(raw_dirent_slab, x);
 }
 
@@ -139,13 +139,13 @@ struct jffs2_raw_inode *jffs2_alloc_raw_inode(void)
 {
        struct jffs2_raw_inode *ret;
        ret = kmem_cache_alloc(raw_inode_slab, GFP_KERNEL);
-       JFFS2_DBG_MEMALLOC("%p\n", ret);
+       dbg_memalloc("%p\n", ret);
        return ret;
 }
 
 void jffs2_free_raw_inode(struct jffs2_raw_inode *x)
 {
-       JFFS2_DBG_MEMALLOC("%p\n", x);
+       dbg_memalloc("%p\n", x);
        kmem_cache_free(raw_inode_slab, x);
 }
 
@@ -153,14 +153,14 @@ struct jffs2_tmp_dnode_info *jffs2_alloc_tmp_dnode_info(void)
 {
        struct jffs2_tmp_dnode_info *ret;
        ret = kmem_cache_alloc(tmp_dnode_info_slab, GFP_KERNEL);
-       JFFS2_DBG_MEMALLOC("%p\n",
+       dbg_memalloc("%p\n",
                ret);
        return ret;
 }
 
 void jffs2_free_tmp_dnode_info(struct jffs2_tmp_dnode_info *x)
 {
-       JFFS2_DBG_MEMALLOC("%p\n", x);
+       dbg_memalloc("%p\n", x);
        kmem_cache_free(tmp_dnode_info_slab, x);
 }
 
@@ -168,13 +168,13 @@ struct jffs2_raw_node_ref *jffs2_alloc_raw_node_ref(void)
 {
        struct jffs2_raw_node_ref *ret;
        ret = kmem_cache_alloc(raw_node_ref_slab, GFP_KERNEL);
-       JFFS2_DBG_MEMALLOC("%p\n", ret);
+       dbg_memalloc("%p\n", ret);
        return ret;
 }
 
 void jffs2_free_raw_node_ref(struct jffs2_raw_node_ref *x)
 {
-       JFFS2_DBG_MEMALLOC("%p\n", x);
+       dbg_memalloc("%p\n", x);
        kmem_cache_free(raw_node_ref_slab, x);
 }
 
@@ -182,13 +182,13 @@ struct jffs2_node_frag *jffs2_alloc_node_frag(void)
 {
        struct jffs2_node_frag *ret;
        ret = kmem_cache_alloc(node_frag_slab, GFP_KERNEL);
-       JFFS2_DBG_MEMALLOC("%p\n", ret);
+       dbg_memalloc("%p\n", ret);
        return ret;
 }
 
 void jffs2_free_node_frag(struct jffs2_node_frag *x)
 {
-       JFFS2_DBG_MEMALLOC("%p\n", x);
+       dbg_memalloc("%p\n", x);
        kmem_cache_free(node_frag_slab, x);
 }
 
@@ -196,12 +196,12 @@ struct jffs2_inode_cache *jffs2_alloc_inode_cache(void)
 {
        struct jffs2_inode_cache *ret;
        ret = kmem_cache_alloc(inode_cache_slab, GFP_KERNEL);
-       JFFS2_DBG_MEMALLOC("%p\n", ret);
+       dbg_memalloc("%p\n", ret);
        return ret;
 }
 
 void jffs2_free_inode_cache(struct jffs2_inode_cache *x)
 {
-       JFFS2_DBG_MEMALLOC("%p\n", x);
+       dbg_memalloc("%p\n", x);
        kmem_cache_free(inode_cache_slab, x);
 }