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/dquot.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/dquot.c')
| -rw-r--r-- | fs/dquot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/dquot.c b/fs/dquot.c index 7e273151f589..de9a29f64ff3 100644 --- a/fs/dquot.c +++ b/fs/dquot.c | |||
| @@ -1848,11 +1848,11 @@ static int __init dquot_init(void) | |||
| 1848 | 1848 | ||
| 1849 | register_sysctl_table(sys_table); | 1849 | register_sysctl_table(sys_table); |
| 1850 | 1850 | ||
| 1851 | dquot_cachep = kmem_cache_create("dquot", | 1851 | dquot_cachep = kmem_cache_create("dquot", |
| 1852 | sizeof(struct dquot), sizeof(unsigned long) * 4, | 1852 | sizeof(struct dquot), sizeof(unsigned long) * 4, |
| 1853 | (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT| | 1853 | (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT| |
| 1854 | SLAB_MEM_SPREAD|SLAB_PANIC), | 1854 | SLAB_MEM_SPREAD|SLAB_PANIC), |
| 1855 | NULL, NULL); | 1855 | NULL); |
| 1856 | 1856 | ||
| 1857 | order = 0; | 1857 | order = 0; |
| 1858 | dquot_hash = (struct hlist_head *)__get_free_pages(GFP_ATOMIC, order); | 1858 | dquot_hash = (struct hlist_head *)__get_free_pages(GFP_ATOMIC, order); |