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 /net/dccp | |
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 'net/dccp')
-rw-r--r-- | net/dccp/ackvec.c | 4 | ||||
-rw-r--r-- | net/dccp/ccid.c | 2 | ||||
-rw-r--r-- | net/dccp/ccids/lib/loss_interval.c | 2 | ||||
-rw-r--r-- | net/dccp/ccids/lib/packet_history.c | 4 | ||||
-rw-r--r-- | net/dccp/proto.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/net/dccp/ackvec.c b/net/dccp/ackvec.c index 01030f346177..7ac775f9a64b 100644 --- a/net/dccp/ackvec.c +++ b/net/dccp/ackvec.c | |||
@@ -481,14 +481,14 @@ int __init dccp_ackvec_init(void) | |||
481 | { | 481 | { |
482 | dccp_ackvec_slab = kmem_cache_create("dccp_ackvec", | 482 | dccp_ackvec_slab = kmem_cache_create("dccp_ackvec", |
483 | sizeof(struct dccp_ackvec), 0, | 483 | sizeof(struct dccp_ackvec), 0, |
484 | SLAB_HWCACHE_ALIGN, NULL, NULL); | 484 | SLAB_HWCACHE_ALIGN, NULL); |
485 | if (dccp_ackvec_slab == NULL) | 485 | if (dccp_ackvec_slab == NULL) |
486 | goto out_err; | 486 | goto out_err; |
487 | 487 | ||
488 | dccp_ackvec_record_slab = | 488 | dccp_ackvec_record_slab = |
489 | kmem_cache_create("dccp_ackvec_record", | 489 | kmem_cache_create("dccp_ackvec_record", |
490 | sizeof(struct dccp_ackvec_record), | 490 | sizeof(struct dccp_ackvec_record), |
491 | 0, SLAB_HWCACHE_ALIGN, NULL, NULL); | 491 | 0, SLAB_HWCACHE_ALIGN, NULL); |
492 | if (dccp_ackvec_record_slab == NULL) | 492 | if (dccp_ackvec_record_slab == NULL) |
493 | goto out_destroy_slab; | 493 | goto out_destroy_slab; |
494 | 494 | ||
diff --git a/net/dccp/ccid.c b/net/dccp/ccid.c index d8cf92f09e68..ccbf72c793b6 100644 --- a/net/dccp/ccid.c +++ b/net/dccp/ccid.c | |||
@@ -69,7 +69,7 @@ static struct kmem_cache *ccid_kmem_cache_create(int obj_size, const char *fmt,. | |||
69 | if (slab_name == NULL) | 69 | if (slab_name == NULL) |
70 | return NULL; | 70 | return NULL; |
71 | slab = kmem_cache_create(slab_name, sizeof(struct ccid) + obj_size, 0, | 71 | slab = kmem_cache_create(slab_name, sizeof(struct ccid) + obj_size, 0, |
72 | SLAB_HWCACHE_ALIGN, NULL, NULL); | 72 | SLAB_HWCACHE_ALIGN, NULL); |
73 | if (slab == NULL) | 73 | if (slab == NULL) |
74 | kfree(slab_name); | 74 | kfree(slab_name); |
75 | return slab; | 75 | return slab; |
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; |
65 | out: | 65 | out: |
@@ -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; |
154 | out: | 154 | out: |
diff --git a/net/dccp/proto.c b/net/dccp/proto.c index 6607b7b14f34..04b59ec4f512 100644 --- a/net/dccp/proto.c +++ b/net/dccp/proto.c | |||
@@ -1003,7 +1003,7 @@ static int __init dccp_init(void) | |||
1003 | dccp_hashinfo.bind_bucket_cachep = | 1003 | dccp_hashinfo.bind_bucket_cachep = |
1004 | kmem_cache_create("dccp_bind_bucket", | 1004 | kmem_cache_create("dccp_bind_bucket", |
1005 | sizeof(struct inet_bind_bucket), 0, | 1005 | sizeof(struct inet_bind_bucket), 0, |
1006 | SLAB_HWCACHE_ALIGN, NULL, NULL); | 1006 | SLAB_HWCACHE_ALIGN, NULL); |
1007 | if (!dccp_hashinfo.bind_bucket_cachep) | 1007 | if (!dccp_hashinfo.bind_bucket_cachep) |
1008 | goto out; | 1008 | goto out; |
1009 | 1009 | ||