aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/ccids
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2007-07-19 21:11:58 -0400
committerPaul Mundt <lethal@linux-sh.org>2007-07-19 21:11:58 -0400
commit20c2df83d25c6a95affe6157a4c9cac4cf5ffaac (patch)
tree415c4453d2b17a50abe7a3e515177e1fa337bd67 /net/dccp/ccids
parent64fb98fc40738ae1a98bcea9ca3145b89fb71524 (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 'net/dccp/ccids')
-rw-r--r--net/dccp/ccids/lib/loss_interval.c2
-rw-r--r--net/dccp/ccids/lib/packet_history.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/net/dccp/ccids/lib/loss_interval.c b/net/dccp/ccids/lib/loss_interval.c
index dd0fc992b042..174d3f13d93f 100644
--- a/net/dccp/ccids/lib/loss_interval.c
+++ b/net/dccp/ccids/lib/loss_interval.c
@@ -282,7 +282,7 @@ static __init int dccp_li_init(void)
282{ 282{
283 dccp_li_cachep = kmem_cache_create("dccp_li_hist", 283 dccp_li_cachep = kmem_cache_create("dccp_li_hist",
284 sizeof(struct dccp_li_hist_entry), 284 sizeof(struct dccp_li_hist_entry),
285 0, SLAB_HWCACHE_ALIGN, NULL, NULL); 285 0, SLAB_HWCACHE_ALIGN, NULL);
286 return dccp_li_cachep == NULL ? -ENOBUFS : 0; 286 return dccp_li_cachep == NULL ? -ENOBUFS : 0;
287} 287}
288 288
diff --git a/net/dccp/ccids/lib/packet_history.c b/net/dccp/ccids/lib/packet_history.c
index 2e8ef42721e2..34c4f6047724 100644
--- a/net/dccp/ccids/lib/packet_history.c
+++ b/net/dccp/ccids/lib/packet_history.c
@@ -59,7 +59,7 @@ struct dccp_tx_hist *dccp_tx_hist_new(const char *name)
59 hist->dccptxh_slab = kmem_cache_create(slab_name, 59 hist->dccptxh_slab = kmem_cache_create(slab_name,
60 sizeof(struct dccp_tx_hist_entry), 60 sizeof(struct dccp_tx_hist_entry),
61 0, SLAB_HWCACHE_ALIGN, 61 0, SLAB_HWCACHE_ALIGN,
62 NULL, NULL); 62 NULL);
63 if (hist->dccptxh_slab == NULL) 63 if (hist->dccptxh_slab == NULL)
64 goto out_free_slab_name; 64 goto out_free_slab_name;
65out: 65out:
@@ -148,7 +148,7 @@ struct dccp_rx_hist *dccp_rx_hist_new(const char *name)
148 hist->dccprxh_slab = kmem_cache_create(slab_name, 148 hist->dccprxh_slab = kmem_cache_create(slab_name,
149 sizeof(struct dccp_rx_hist_entry), 149 sizeof(struct dccp_rx_hist_entry),
150 0, SLAB_HWCACHE_ALIGN, 150 0, SLAB_HWCACHE_ALIGN,
151 NULL, NULL); 151 NULL);
152 if (hist->dccprxh_slab == NULL) 152 if (hist->dccprxh_slab == NULL)
153 goto out_free_slab_name; 153 goto out_free_slab_name;
154out: 154out: