git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
fs
/
jffs2
/
malloc.c
diff --git
a/fs/jffs2/malloc.c
b/fs/jffs2/malloc.c
index
5abb431
..
036cbd1
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.
*
*
* For licensing information, see the file 'LICENCE' in this directory.
*
- * $Id: malloc.c,v 1.
28 2004/11/16 20:36:11 dwmw2
Exp $
+ * $Id: malloc.c,v 1.
31 2005/11/07 11:14:40 gleixner
Exp $
*
*/
*
*/
@@
-17,15
+17,6
@@
#include <linux/jffs2.h>
#include "nodelist.h"
#include <linux/jffs2.h>
#include "nodelist.h"
-#if 0
-#define JFFS2_SLAB_POISON SLAB_POISON
-#else
-#define JFFS2_SLAB_POISON 0
-#endif
-
-// replace this by #define D3 (x) x for cache debugging
-#define D3(x)
-
/* 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;
/* 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;
@@
-38,45
+29,45
@@
static kmem_cache_t *inode_cache_slab;
int __init jffs2_create_slab_caches(void)
{
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),
sizeof(struct jffs2_full_dnode),
- 0,
JFFS2_SLAB_POISON
, NULL, NULL);
+ 0,
0
, NULL, NULL);
if (!full_dnode_slab)
goto err;
raw_dirent_slab = kmem_cache_create("jffs2_raw_dirent",
sizeof(struct jffs2_raw_dirent),
if (!full_dnode_slab)
goto err;
raw_dirent_slab = kmem_cache_create("jffs2_raw_dirent",
sizeof(struct jffs2_raw_dirent),
- 0,
JFFS2_SLAB_POISON
, NULL, NULL);
+ 0,
0
, NULL, NULL);
if (!raw_dirent_slab)
goto err;
raw_inode_slab = kmem_cache_create("jffs2_raw_inode",
sizeof(struct jffs2_raw_inode),
if (!raw_dirent_slab)
goto err;
raw_inode_slab = kmem_cache_create("jffs2_raw_inode",
sizeof(struct jffs2_raw_inode),
- 0,
JFFS2_SLAB_POISON
, NULL, NULL);
+ 0,
0
, NULL, NULL);
if (!raw_inode_slab)
goto err;
tmp_dnode_info_slab = kmem_cache_create("jffs2_tmp_dnode",
sizeof(struct jffs2_tmp_dnode_info),
if (!raw_inode_slab)
goto err;
tmp_dnode_info_slab = kmem_cache_create("jffs2_tmp_dnode",
sizeof(struct jffs2_tmp_dnode_info),
- 0,
JFFS2_SLAB_POISON
, NULL, NULL);
+ 0,
0
, NULL, NULL);
if (!tmp_dnode_info_slab)
goto err;
raw_node_ref_slab = kmem_cache_create("jffs2_raw_node_ref",
sizeof(struct jffs2_raw_node_ref),
if (!tmp_dnode_info_slab)
goto err;
raw_node_ref_slab = kmem_cache_create("jffs2_raw_node_ref",
sizeof(struct jffs2_raw_node_ref),
- 0,
JFFS2_SLAB_POISON
, NULL, NULL);
+ 0,
0
, NULL, NULL);
if (!raw_node_ref_slab)
goto err;
node_frag_slab = kmem_cache_create("jffs2_node_frag",
sizeof(struct jffs2_node_frag),
if (!raw_node_ref_slab)
goto err;
node_frag_slab = kmem_cache_create("jffs2_node_frag",
sizeof(struct jffs2_node_frag),
- 0,
JFFS2_SLAB_POISON
, NULL, NULL);
+ 0,
0
, NULL, NULL);
if (!node_frag_slab)
goto err;
inode_cache_slab = kmem_cache_create("jffs2_inode_cache",
sizeof(struct jffs2_inode_cache),
if (!node_frag_slab)
goto err;
inode_cache_slab = kmem_cache_create("jffs2_inode_cache",
sizeof(struct jffs2_inode_cache),
- 0,
JFFS2_SLAB_POISON
, NULL, NULL);
+ 0,
0
, NULL, NULL);
if (inode_cache_slab)
return 0;
err:
if (inode_cache_slab)
return 0;
err:
@@
-104,102
+95,113
@@
void jffs2_destroy_slab_caches(void)
struct jffs2_full_dirent *jffs2_alloc_full_dirent(int namesize)
{
struct jffs2_full_dirent *jffs2_alloc_full_dirent(int namesize)
{
- return kmalloc(sizeof(struct jffs2_full_dirent) + namesize, GFP_KERNEL);
+ struct jffs2_full_dirent *ret;
+ ret = kmalloc(sizeof(struct jffs2_full_dirent) + namesize, GFP_KERNEL);
+ dbg_memalloc("%p\n", ret);
+ return ret;
}
void jffs2_free_full_dirent(struct jffs2_full_dirent *x)
{
}
void jffs2_free_full_dirent(struct jffs2_full_dirent *x)
{
+ dbg_memalloc("%p\n", x);
kfree(x);
}
struct jffs2_full_dnode *jffs2_alloc_full_dnode(void)
{
kfree(x);
}
struct jffs2_full_dnode *jffs2_alloc_full_dnode(void)
{
- struct jffs2_full_dnode *ret = kmem_cache_alloc(full_dnode_slab, GFP_KERNEL);
- D3 (printk (KERN_DEBUG "alloc_full_dnode at %p\n", ret));
+ struct jffs2_full_dnode *ret;
+ ret = kmem_cache_alloc(full_dnode_slab, GFP_KERNEL);
+ dbg_memalloc("%p\n", ret);
return ret;
}
void jffs2_free_full_dnode(struct jffs2_full_dnode *x)
{
return ret;
}
void jffs2_free_full_dnode(struct jffs2_full_dnode *x)
{
-
D3 (printk (KERN_DEBUG "free full_dnode at %p\n", x)
);
+
dbg_memalloc("%p\n", x
);
kmem_cache_free(full_dnode_slab, x);
}
struct jffs2_raw_dirent *jffs2_alloc_raw_dirent(void)
{
kmem_cache_free(full_dnode_slab, x);
}
struct jffs2_raw_dirent *jffs2_alloc_raw_dirent(void)
{
- struct jffs2_raw_dirent *ret = kmem_cache_alloc(raw_dirent_slab, GFP_KERNEL);
- D3 (printk (KERN_DEBUG "alloc_raw_dirent\n", ret));
+ struct jffs2_raw_dirent *ret;
+ ret = kmem_cache_alloc(raw_dirent_slab, GFP_KERNEL);
+ dbg_memalloc("%p\n", ret);
return ret;
}
void jffs2_free_raw_dirent(struct jffs2_raw_dirent *x)
{
return ret;
}
void jffs2_free_raw_dirent(struct jffs2_raw_dirent *x)
{
-
D3 (printk (KERN_DEBUG "free_raw_dirent at %p\n", x)
);
+
dbg_memalloc("%p\n", x
);
kmem_cache_free(raw_dirent_slab, x);
}
struct jffs2_raw_inode *jffs2_alloc_raw_inode(void)
{
kmem_cache_free(raw_dirent_slab, x);
}
struct jffs2_raw_inode *jffs2_alloc_raw_inode(void)
{
- struct jffs2_raw_inode *ret = kmem_cache_alloc(raw_inode_slab, GFP_KERNEL);
- D3 (printk (KERN_DEBUG "alloc_raw_inode at %p\n", ret));
+ struct jffs2_raw_inode *ret;
+ ret = kmem_cache_alloc(raw_inode_slab, GFP_KERNEL);
+ dbg_memalloc("%p\n", ret);
return ret;
}
void jffs2_free_raw_inode(struct jffs2_raw_inode *x)
{
return ret;
}
void jffs2_free_raw_inode(struct jffs2_raw_inode *x)
{
-
D3 (printk (KERN_DEBUG "free_raw_inode at %p\n", x)
);
+
dbg_memalloc("%p\n", x
);
kmem_cache_free(raw_inode_slab, x);
}
struct jffs2_tmp_dnode_info *jffs2_alloc_tmp_dnode_info(void)
{
kmem_cache_free(raw_inode_slab, x);
}
struct jffs2_tmp_dnode_info *jffs2_alloc_tmp_dnode_info(void)
{
- struct jffs2_tmp_dnode_info *ret = kmem_cache_alloc(tmp_dnode_info_slab, GFP_KERNEL);
- D3 (printk (KERN_DEBUG "alloc_tmp_dnode_info at %p\n", ret));
+ struct jffs2_tmp_dnode_info *ret;
+ ret = kmem_cache_alloc(tmp_dnode_info_slab, GFP_KERNEL);
+ dbg_memalloc("%p\n",
+ ret);
return ret;
}
void jffs2_free_tmp_dnode_info(struct jffs2_tmp_dnode_info *x)
{
return ret;
}
void jffs2_free_tmp_dnode_info(struct jffs2_tmp_dnode_info *x)
{
-
D3 (printk (KERN_DEBUG "free_tmp_dnode_info at %p\n", x)
);
+
dbg_memalloc("%p\n", x
);
kmem_cache_free(tmp_dnode_info_slab, x);
}
struct jffs2_raw_node_ref *jffs2_alloc_raw_node_ref(void)
{
kmem_cache_free(tmp_dnode_info_slab, x);
}
struct jffs2_raw_node_ref *jffs2_alloc_raw_node_ref(void)
{
- struct jffs2_raw_node_ref *ret = kmem_cache_alloc(raw_node_ref_slab, GFP_KERNEL);
- D3 (printk (KERN_DEBUG "alloc_raw_node_ref at %p\n", ret));
+ struct jffs2_raw_node_ref *ret;
+ ret = kmem_cache_alloc(raw_node_ref_slab, GFP_KERNEL);
+ dbg_memalloc("%p\n", ret);
return ret;
}
void jffs2_free_raw_node_ref(struct jffs2_raw_node_ref *x)
{
return ret;
}
void jffs2_free_raw_node_ref(struct jffs2_raw_node_ref *x)
{
-
D3 (printk (KERN_DEBUG "free_raw_node_ref at %p\n", x)
);
+
dbg_memalloc("%p\n", x
);
kmem_cache_free(raw_node_ref_slab, x);
}
struct jffs2_node_frag *jffs2_alloc_node_frag(void)
{
kmem_cache_free(raw_node_ref_slab, x);
}
struct jffs2_node_frag *jffs2_alloc_node_frag(void)
{
- struct jffs2_node_frag *ret = kmem_cache_alloc(node_frag_slab, GFP_KERNEL);
- D3 (printk (KERN_DEBUG "alloc_node_frag at %p\n", ret));
+ struct jffs2_node_frag *ret;
+ ret = kmem_cache_alloc(node_frag_slab, GFP_KERNEL);
+ dbg_memalloc("%p\n", ret);
return ret;
}
void jffs2_free_node_frag(struct jffs2_node_frag *x)
{
return ret;
}
void jffs2_free_node_frag(struct jffs2_node_frag *x)
{
-
D3 (printk (KERN_DEBUG "free_node_frag at %p\n", x)
);
+
dbg_memalloc("%p\n", x
);
kmem_cache_free(node_frag_slab, x);
}
struct jffs2_inode_cache *jffs2_alloc_inode_cache(void)
{
kmem_cache_free(node_frag_slab, x);
}
struct jffs2_inode_cache *jffs2_alloc_inode_cache(void)
{
- struct jffs2_inode_cache *ret = kmem_cache_alloc(inode_cache_slab, GFP_KERNEL);
- D3 (printk(KERN_DEBUG "Allocated inocache at %p\n", ret));
+ struct jffs2_inode_cache *ret;
+ ret = kmem_cache_alloc(inode_cache_slab, GFP_KERNEL);
+ dbg_memalloc("%p\n", ret);
return ret;
}
void jffs2_free_inode_cache(struct jffs2_inode_cache *x)
{
return ret;
}
void jffs2_free_inode_cache(struct jffs2_inode_cache *x)
{
-
D3 (printk(KERN_DEBUG "Freeing inocache at %p\n", x)
);
+
dbg_memalloc("%p\n", x
);
kmem_cache_free(inode_cache_slab, x);
}
kmem_cache_free(inode_cache_slab, x);
}
-