From e085fff2baaa06d22161a77cb5c752fb319a955d Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Mon, 5 Dec 2005 13:36:50 -0800 Subject: [PATCH] --- yaml --- r: 14997 b: refs/heads/master c: 6636568cf85ef5898a892e90fcc88b61cca9ca27 h: refs/heads/master i: 14995: 53ef83d972ba2d8c1472c358f7839641314f8a62 v: v3 --- [refs] | 2 +- trunk/net/netfilter/nf_conntrack_core.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 453fcf6bd76e..5ae92daa7c69 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a79575633300adb5d3f1bd856cc518c45fefcb86 +refs/heads/master: 6636568cf85ef5898a892e90fcc88b61cca9ca27 diff --git a/trunk/net/netfilter/nf_conntrack_core.c b/trunk/net/netfilter/nf_conntrack_core.c index 1da678303d78..a7c7b490cf22 100644 --- a/trunk/net/netfilter/nf_conntrack_core.c +++ b/trunk/net/netfilter/nf_conntrack_core.c @@ -1383,6 +1383,9 @@ void nf_conntrack_cleanup(void) schedule(); goto i_see_dead_people; } + /* wait until all references to nf_conntrack_untracked are dropped */ + while (atomic_read(&nf_conntrack_untracked.ct_general.use) > 1) + schedule(); for (i = 0; i < NF_CT_F_NUM; i++) { if (nf_ct_cache[i].use == 0)