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/dcache.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/dcache.c')
| -rw-r--r-- | fs/dcache.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index cb9d05056b54..678d39deb607 100644 --- a/fs/dcache.c +++ b/fs/dcache.c | |||
| @@ -2165,10 +2165,10 @@ void __init vfs_caches_init(unsigned long mempages) | |||
| 2165 | mempages -= reserve; | 2165 | mempages -= reserve; |
| 2166 | 2166 | ||
| 2167 | names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0, | 2167 | names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0, |
| 2168 | SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL); | 2168 | SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL); |
| 2169 | 2169 | ||
| 2170 | filp_cachep = kmem_cache_create("filp", sizeof(struct file), 0, | 2170 | filp_cachep = kmem_cache_create("filp", sizeof(struct file), 0, |
| 2171 | SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL); | 2171 | SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL); |
| 2172 | 2172 | ||
| 2173 | dcache_init(mempages); | 2173 | dcache_init(mempages); |
| 2174 | inode_init(mempages); | 2174 | inode_init(mempages); |