aboutsummaryrefslogtreecommitdiffstats
path: root/net/netfilter
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/netfilter
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/netfilter')
-rw-r--r--net/netfilter/nf_conntrack_core.c2
-rw-r--r--net/netfilter/nf_conntrack_expect.c2
-rw-r--r--net/netfilter/xt_hashlimit.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 8cce814f6bee..aa086c83af80 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -1108,7 +1108,7 @@ int __init nf_conntrack_init(void)
1108 1108
1109 nf_conntrack_cachep = kmem_cache_create("nf_conntrack", 1109 nf_conntrack_cachep = kmem_cache_create("nf_conntrack",
1110 sizeof(struct nf_conn), 1110 sizeof(struct nf_conn),
1111 0, 0, NULL, NULL); 1111 0, 0, NULL);
1112 if (!nf_conntrack_cachep) { 1112 if (!nf_conntrack_cachep) {
1113 printk(KERN_ERR "Unable to create nf_conn slab cache\n"); 1113 printk(KERN_ERR "Unable to create nf_conn slab cache\n");
1114 goto err_free_hash; 1114 goto err_free_hash;
diff --git a/net/netfilter/nf_conntrack_expect.c b/net/netfilter/nf_conntrack_expect.c
index 2191fe008f60..1aa6229ca99f 100644
--- a/net/netfilter/nf_conntrack_expect.c
+++ b/net/netfilter/nf_conntrack_expect.c
@@ -540,7 +540,7 @@ int __init nf_conntrack_expect_init(void)
540 540
541 nf_ct_expect_cachep = kmem_cache_create("nf_conntrack_expect", 541 nf_ct_expect_cachep = kmem_cache_create("nf_conntrack_expect",
542 sizeof(struct nf_conntrack_expect), 542 sizeof(struct nf_conntrack_expect),
543 0, 0, NULL, NULL); 543 0, 0, NULL);
544 if (!nf_ct_expect_cachep) 544 if (!nf_ct_expect_cachep)
545 goto err2; 545 goto err2;
546 546
diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c
index d6b3d01975b6..bd45f9d3f7d0 100644
--- a/net/netfilter/xt_hashlimit.c
+++ b/net/netfilter/xt_hashlimit.c
@@ -738,7 +738,7 @@ static int __init xt_hashlimit_init(void)
738 err = -ENOMEM; 738 err = -ENOMEM;
739 hashlimit_cachep = kmem_cache_create("xt_hashlimit", 739 hashlimit_cachep = kmem_cache_create("xt_hashlimit",
740 sizeof(struct dsthash_ent), 0, 0, 740 sizeof(struct dsthash_ent), 0, 0,
741 NULL, NULL); 741 NULL);
742 if (!hashlimit_cachep) { 742 if (!hashlimit_cachep) {
743 printk(KERN_ERR "xt_hashlimit: unable to create slab cache\n"); 743 printk(KERN_ERR "xt_hashlimit: unable to create slab cache\n");
744 goto err2; 744 goto err2;