diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 21:38:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 21:38:13 -0400 |
| commit | 9a79b2274186fade17134929d4f85b70d59a3840 (patch) | |
| tree | d74e9ecc83ef617166445501b49087726595fb63 /fs/jffs2/super.c | |
| parent | 75473c1d3930896bbabcc99bb58fafd53ef42473 (diff) | |
| parent | 20c2df83d25c6a95affe6157a4c9cac4cf5ffaac (diff) | |
Merge branch 'kmem_death' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'kmem_death' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
mm: Remove slab destructors from kmem_cache_create().
Diffstat (limited to 'fs/jffs2/super.c')
| -rw-r--r-- | fs/jffs2/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c index e220d3bd610d..be2b70c2ec16 100644 --- a/fs/jffs2/super.c +++ b/fs/jffs2/super.c | |||
| @@ -192,7 +192,7 @@ static int __init init_jffs2_fs(void) | |||
| 192 | sizeof(struct jffs2_inode_info), | 192 | sizeof(struct jffs2_inode_info), |
| 193 | 0, (SLAB_RECLAIM_ACCOUNT| | 193 | 0, (SLAB_RECLAIM_ACCOUNT| |
| 194 | SLAB_MEM_SPREAD), | 194 | SLAB_MEM_SPREAD), |
| 195 | jffs2_i_init_once, NULL); | 195 | jffs2_i_init_once); |
| 196 | if (!jffs2_inode_cachep) { | 196 | if (!jffs2_inode_cachep) { |
| 197 | printk(KERN_ERR "JFFS2 error: Failed to initialise inode cache\n"); | 197 | printk(KERN_ERR "JFFS2 error: Failed to initialise inode cache\n"); |
| 198 | return -ENOMEM; | 198 | return -ENOMEM; |