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/adfs | |
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/adfs')
-rw-r--r-- | fs/adfs/super.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/adfs/super.c b/fs/adfs/super.c index de2ed5ca33..1c9fd30294 100644 --- a/fs/adfs/super.c +++ b/fs/adfs/super.c | |||
@@ -234,14 +234,14 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag | |||
234 | 234 | ||
235 | inode_init_once(&ei->vfs_inode); | 235 | inode_init_once(&ei->vfs_inode); |
236 | } | 236 | } |
237 | 237 | ||
238 | static int init_inodecache(void) | 238 | static int init_inodecache(void) |
239 | { | 239 | { |
240 | adfs_inode_cachep = kmem_cache_create("adfs_inode_cache", | 240 | adfs_inode_cachep = kmem_cache_create("adfs_inode_cache", |
241 | sizeof(struct adfs_inode_info), | 241 | sizeof(struct adfs_inode_info), |
242 | 0, (SLAB_RECLAIM_ACCOUNT| | 242 | 0, (SLAB_RECLAIM_ACCOUNT| |
243 | SLAB_MEM_SPREAD), | 243 | SLAB_MEM_SPREAD), |
244 | init_once, NULL); | 244 | init_once); |
245 | if (adfs_inode_cachep == NULL) | 245 | if (adfs_inode_cachep == NULL) |
246 | return -ENOMEM; | 246 | return -ENOMEM; |
247 | return 0; | 247 | return 0; |