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/ufs/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/ufs/super.c')
-rw-r--r-- | fs/ufs/super.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ufs/super.c b/fs/ufs/super.c index 2b3011689e89..73402c5eeb8a 100644 --- a/fs/ufs/super.c +++ b/fs/ufs/super.c | |||
@@ -1240,14 +1240,14 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag | |||
1240 | 1240 | ||
1241 | inode_init_once(&ei->vfs_inode); | 1241 | inode_init_once(&ei->vfs_inode); |
1242 | } | 1242 | } |
1243 | 1243 | ||
1244 | static int init_inodecache(void) | 1244 | static int init_inodecache(void) |
1245 | { | 1245 | { |
1246 | ufs_inode_cachep = kmem_cache_create("ufs_inode_cache", | 1246 | ufs_inode_cachep = kmem_cache_create("ufs_inode_cache", |
1247 | sizeof(struct ufs_inode_info), | 1247 | sizeof(struct ufs_inode_info), |
1248 | 0, (SLAB_RECLAIM_ACCOUNT| | 1248 | 0, (SLAB_RECLAIM_ACCOUNT| |
1249 | SLAB_MEM_SPREAD), | 1249 | SLAB_MEM_SPREAD), |
1250 | init_once, NULL); | 1250 | init_once); |
1251 | if (ufs_inode_cachep == NULL) | 1251 | if (ufs_inode_cachep == NULL) |
1252 | return -ENOMEM; | 1252 | return -ENOMEM; |
1253 | return 0; | 1253 | return 0; |