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/romfs/inode.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/romfs/inode.c')
-rw-r--r-- | fs/romfs/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/romfs/inode.c b/fs/romfs/inode.c index 2284e03342c6..dae7945f90e4 100644 --- a/fs/romfs/inode.c +++ b/fs/romfs/inode.c | |||
@@ -572,14 +572,14 @@ static void init_once(void *foo, struct kmem_cache *cachep, unsigned long flags) | |||
572 | 572 | ||
573 | inode_init_once(&ei->vfs_inode); | 573 | inode_init_once(&ei->vfs_inode); |
574 | } | 574 | } |
575 | 575 | ||
576 | static int init_inodecache(void) | 576 | static int init_inodecache(void) |
577 | { | 577 | { |
578 | romfs_inode_cachep = kmem_cache_create("romfs_inode_cache", | 578 | romfs_inode_cachep = kmem_cache_create("romfs_inode_cache", |
579 | sizeof(struct romfs_inode_info), | 579 | sizeof(struct romfs_inode_info), |
580 | 0, (SLAB_RECLAIM_ACCOUNT| | 580 | 0, (SLAB_RECLAIM_ACCOUNT| |
581 | SLAB_MEM_SPREAD), | 581 | SLAB_MEM_SPREAD), |
582 | init_once, NULL); | 582 | init_once); |
583 | if (romfs_inode_cachep == NULL) | 583 | if (romfs_inode_cachep == NULL) |
584 | return -ENOMEM; | 584 | return -ENOMEM; |
585 | return 0; | 585 | return 0; |