From 4abe9a9aaa6ab6a0b681e82a01640509a1e4bea8 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Fri, 22 Jul 2005 12:51:03 -0700 Subject: [PATCH] --- yaml --- r: 4933 b: refs/heads/master c: 21f930e4abdcb9649f26e5b959c14dddee4e600b h: refs/heads/master i: 4931: 502a9b9302340b022a480c22dc8ca9cc308bd772 v: v3 --- [refs] | 2 +- trunk/net/ipv4/netfilter/ip_conntrack_core.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9084c27b66fe..429ce81070a7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d04b4f8c1c9766e49fad6a141fc61cb30db69a5c +refs/heads/master: 21f930e4abdcb9649f26e5b959c14dddee4e600b diff --git a/trunk/net/ipv4/netfilter/ip_conntrack_core.c b/trunk/net/ipv4/netfilter/ip_conntrack_core.c index 14af55cad5d6..63bf88264980 100644 --- a/trunk/net/ipv4/netfilter/ip_conntrack_core.c +++ b/trunk/net/ipv4/netfilter/ip_conntrack_core.c @@ -1107,6 +1107,9 @@ void ip_conntrack_cleanup(void) schedule(); goto i_see_dead_people; } + /* wait until all references to ip_conntrack_untracked are dropped */ + while (atomic_read(&ip_conntrack_untracked.ct_general.use) > 1) + schedule(); kmem_cache_destroy(ip_conntrack_cachep); kmem_cache_destroy(ip_conntrack_expect_cachep);