Merge branch 'upstream-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu...

[linux.git] / fs / jffs2 / malloc.c

diff --git a/fs/jffs2/malloc.c b/fs/jffs2/malloc.c
index 33f291005012bedf622daaaaa4ebf5f77655d2a1..f9211252b5f16f424fda655a0e5881680fc8eb78 100644 (file)
--- a/fs/jffs2/malloc.c
+++ b/fs/jffs2/malloc.c
@@ -1,14 +1,12 @@
 /*
  * JFFS2 -- Journalling Flash File System, Version 2.
  *
- * Copyright (C) 2001-2003 Red Hat, Inc.
+ * Copyright © 2001-2007 Red Hat, Inc.
  *
  * Created by David Woodhouse <[email protected]>
  *
  * For licensing information, see the file 'LICENCE' in this directory.
  *
- * $Id: malloc.c,v 1.31 2005/11/07 11:14:40 gleixner Exp $
- *
  */
 
 #include <linux/kernel.h>
@@ -19,72 +17,72 @@
 
 /* These are initialised to NULL in the kernel startup code.
    If you're porting to other operating systems, beware */
-static kmem_cache_t *full_dnode_slab;
-static kmem_cache_t *raw_dirent_slab;
-static kmem_cache_t *raw_inode_slab;
-static kmem_cache_t *tmp_dnode_info_slab;
-static kmem_cache_t *raw_node_ref_slab;
-static kmem_cache_t *node_frag_slab;
-static kmem_cache_t *inode_cache_slab;
+static struct kmem_cache *full_dnode_slab;
+static struct kmem_cache *raw_dirent_slab;
+static struct kmem_cache *raw_inode_slab;
+static struct kmem_cache *tmp_dnode_info_slab;
+static struct kmem_cache *raw_node_ref_slab;
+static struct kmem_cache *node_frag_slab;
+static struct kmem_cache *inode_cache_slab;
 #ifdef CONFIG_JFFS2_FS_XATTR
-static kmem_cache_t *xattr_datum_cache;
-static kmem_cache_t *xattr_ref_cache;
+static struct kmem_cache *xattr_datum_cache;
+static struct kmem_cache *xattr_ref_cache;
 #endif
 
 int __init jffs2_create_slab_caches(void)
 {
        full_dnode_slab = kmem_cache_create("jffs2_full_dnode",
                                            sizeof(struct jffs2_full_dnode),
-                                           0, 0, NULL, NULL);
+                                           0, 0, NULL);
        if (!full_dnode_slab)
                goto err;
 
        raw_dirent_slab = kmem_cache_create("jffs2_raw_dirent",
                                            sizeof(struct jffs2_raw_dirent),
-                                           0, 0, NULL, NULL);
+                                           0, 0, NULL);
        if (!raw_dirent_slab)
                goto err;
 
        raw_inode_slab = kmem_cache_create("jffs2_raw_inode",
                                           sizeof(struct jffs2_raw_inode),
-                                          0, 0, NULL, NULL);
+                                          0, 0, NULL);
        if (!raw_inode_slab)
                goto err;
 
        tmp_dnode_info_slab = kmem_cache_create("jffs2_tmp_dnode",
                                                sizeof(struct jffs2_tmp_dnode_info),
-                                               0, 0, NULL, NULL);
+                                               0, 0, NULL);
        if (!tmp_dnode_info_slab)
                goto err;
 
        raw_node_ref_slab = kmem_cache_create("jffs2_refblock",
                                              sizeof(struct jffs2_raw_node_ref) * (REFS_PER_BLOCK + 1),
-                                             0, 0, NULL, NULL);
+                                             0, 0, NULL);
        if (!raw_node_ref_slab)
                goto err;
 
        node_frag_slab = kmem_cache_create("jffs2_node_frag",
                                           sizeof(struct jffs2_node_frag),
-                                          0, 0, NULL, NULL);
+                                          0, 0, NULL);
        if (!node_frag_slab)
                goto err;
 
        inode_cache_slab = kmem_cache_create("jffs2_inode_cache",
                                             sizeof(struct jffs2_inode_cache),
-                                            0, 0, NULL, NULL);
+                                            0, 0, NULL);
        if (!inode_cache_slab)
                goto err;
 
 #ifdef CONFIG_JFFS2_FS_XATTR
        xattr_datum_cache = kmem_cache_create("jffs2_xattr_datum",
                                             sizeof(struct jffs2_xattr_datum),
-                                            0, 0, NULL, NULL);
+                                            0, 0, NULL);
        if (!xattr_datum_cache)
                goto err;
 
        xattr_ref_cache = kmem_cache_create("jffs2_xattr_ref",
                                           sizeof(struct jffs2_xattr_ref),
-                                          0, 0, NULL, NULL);
+                                          0, 0, NULL);
        if (!xattr_ref_cache)
                goto err;
 #endif