diff options
author | Paul Mundt <lethal@linux-sh.org> | 2007-07-19 21:11:58 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2007-07-19 21:11:58 -0400 |
commit | 20c2df83d25c6a95affe6157a4c9cac4cf5ffaac (patch) | |
tree | 415c4453d2b17a50abe7a3e515177e1fa337bd67 /fs/nfs | |
parent | 64fb98fc40738ae1a98bcea9ca3145b89fb71524 (diff) |
mm: Remove slab destructors from kmem_cache_create().
Slab destructors were no longer supported after Christoph's
c59def9f222d44bb7e2f0a559f2906191a0862d7 change. They've been
BUGs for both slab and slub, and slob never supported them
either.
This rips out support for the dtor pointer from kmem_cache_create()
completely and fixes up every single callsite in the kernel (there were
about 224, not including the slab allocator definitions themselves,
or the documentation references).
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'fs/nfs')
-rw-r--r-- | fs/nfs/direct.c | 2 | ||||
-rw-r--r-- | fs/nfs/inode.c | 4 | ||||
-rw-r--r-- | fs/nfs/pagelist.c | 2 | ||||
-rw-r--r-- | fs/nfs/read.c | 2 | ||||
-rw-r--r-- | fs/nfs/write.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index a5c82b6f3b45..fcf4d384610e 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c | |||
@@ -875,7 +875,7 @@ int __init nfs_init_directcache(void) | |||
875 | sizeof(struct nfs_direct_req), | 875 | sizeof(struct nfs_direct_req), |
876 | 0, (SLAB_RECLAIM_ACCOUNT| | 876 | 0, (SLAB_RECLAIM_ACCOUNT| |
877 | SLAB_MEM_SPREAD), | 877 | SLAB_MEM_SPREAD), |
878 | NULL, NULL); | 878 | NULL); |
879 | if (nfs_direct_cachep == NULL) | 879 | if (nfs_direct_cachep == NULL) |
880 | return -ENOMEM; | 880 | return -ENOMEM; |
881 | 881 | ||
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index 3d9fccf4ef93..bca6cdcb9f0d 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c | |||
@@ -1165,14 +1165,14 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag | |||
1165 | nfsi->npages = 0; | 1165 | nfsi->npages = 0; |
1166 | nfs4_init_once(nfsi); | 1166 | nfs4_init_once(nfsi); |
1167 | } | 1167 | } |
1168 | 1168 | ||
1169 | static int __init nfs_init_inodecache(void) | 1169 | static int __init nfs_init_inodecache(void) |
1170 | { | 1170 | { |
1171 | nfs_inode_cachep = kmem_cache_create("nfs_inode_cache", | 1171 | nfs_inode_cachep = kmem_cache_create("nfs_inode_cache", |
1172 | sizeof(struct nfs_inode), | 1172 | sizeof(struct nfs_inode), |
1173 | 0, (SLAB_RECLAIM_ACCOUNT| | 1173 | 0, (SLAB_RECLAIM_ACCOUNT| |
1174 | SLAB_MEM_SPREAD), | 1174 | SLAB_MEM_SPREAD), |
1175 | init_once, NULL); | 1175 | init_once); |
1176 | if (nfs_inode_cachep == NULL) | 1176 | if (nfs_inode_cachep == NULL) |
1177 | return -ENOMEM; | 1177 | return -ENOMEM; |
1178 | 1178 | ||
diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index f56dae5216f4..345bb9b4765b 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c | |||
@@ -442,7 +442,7 @@ int __init nfs_init_nfspagecache(void) | |||
442 | nfs_page_cachep = kmem_cache_create("nfs_page", | 442 | nfs_page_cachep = kmem_cache_create("nfs_page", |
443 | sizeof(struct nfs_page), | 443 | sizeof(struct nfs_page), |
444 | 0, SLAB_HWCACHE_ALIGN, | 444 | 0, SLAB_HWCACHE_ALIGN, |
445 | NULL, NULL); | 445 | NULL); |
446 | if (nfs_page_cachep == NULL) | 446 | if (nfs_page_cachep == NULL) |
447 | return -ENOMEM; | 447 | return -ENOMEM; |
448 | 448 | ||
diff --git a/fs/nfs/read.c b/fs/nfs/read.c index 6ae2e58ed05a..19e05633f4e3 100644 --- a/fs/nfs/read.c +++ b/fs/nfs/read.c | |||
@@ -598,7 +598,7 @@ int __init nfs_init_readpagecache(void) | |||
598 | nfs_rdata_cachep = kmem_cache_create("nfs_read_data", | 598 | nfs_rdata_cachep = kmem_cache_create("nfs_read_data", |
599 | sizeof(struct nfs_read_data), | 599 | sizeof(struct nfs_read_data), |
600 | 0, SLAB_HWCACHE_ALIGN, | 600 | 0, SLAB_HWCACHE_ALIGN, |
601 | NULL, NULL); | 601 | NULL); |
602 | if (nfs_rdata_cachep == NULL) | 602 | if (nfs_rdata_cachep == NULL) |
603 | return -ENOMEM; | 603 | return -ENOMEM; |
604 | 604 | ||
diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 73ac992ece85..ef97e0c0f5b1 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c | |||
@@ -1467,7 +1467,7 @@ int __init nfs_init_writepagecache(void) | |||
1467 | nfs_wdata_cachep = kmem_cache_create("nfs_write_data", | 1467 | nfs_wdata_cachep = kmem_cache_create("nfs_write_data", |
1468 | sizeof(struct nfs_write_data), | 1468 | sizeof(struct nfs_write_data), |
1469 | 0, SLAB_HWCACHE_ALIGN, | 1469 | 0, SLAB_HWCACHE_ALIGN, |
1470 | NULL, NULL); | 1470 | NULL); |
1471 | if (nfs_wdata_cachep == NULL) | 1471 | if (nfs_wdata_cachep == NULL) |
1472 | return -ENOMEM; | 1472 | return -ENOMEM; |
1473 | 1473 | ||