From de4a56ce68d8d20213b3002f8ce82d4fe6f384ce Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Tue, 16 Nov 2010 10:19:18 +0100
Subject: [PATCH] --- yaml --- r: 236575 b: refs/heads/master c:
 3bfd45f93c8bca7a5dc955235ff083602d95aa43 h: refs/heads/master i:   236573:
 de274bfdde8aada158d7c715e914a35290745c4b   236571:
 90f4fb21730b9b1f32a70ea1c935ede3e3771532   236567:
 9175483ab33f9f0140f829aeb71d84695f998471   236559:
 3ac9d736de4332165052f137ee3546de292b2cf0   236543:
 a1a39cb76461a6521435b3bdf047684a93c29226 v: v3

---
 [refs]                                    | 2 +-
 trunk/net/netfilter/nf_conntrack_expect.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6562c15c17ce..46222741e11b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5d277d29ad1ae9add8d6984025ccd2e835971ce
+refs/heads/master: 3bfd45f93c8bca7a5dc955235ff083602d95aa43
diff --git a/trunk/net/netfilter/nf_conntrack_expect.c b/trunk/net/netfilter/nf_conntrack_expect.c
index bbb21402596d..774f32ba2ac9 100644
--- a/trunk/net/netfilter/nf_conntrack_expect.c
+++ b/trunk/net/netfilter/nf_conntrack_expect.c
@@ -323,7 +323,8 @@ static void nf_ct_expect_insert(struct nf_conntrack_expect *exp)
 	const struct nf_conntrack_expect_policy *p;
 	unsigned int h = nf_ct_expect_dst_hash(&exp->tuple);
 
-	atomic_inc(&exp->use);
+	/* two references : one for hash insert, one for the timer */
+	atomic_add(2, &exp->use);
 
 	if (master_help) {
 		hlist_add_head(&exp->lnode, &master_help->expectations);
@@ -345,7 +346,6 @@ static void nf_ct_expect_insert(struct nf_conntrack_expect *exp)
 	}
 	add_timer(&exp->timeout);
 
-	atomic_inc(&exp->use);
 	NF_CT_STAT_INC(net, expect_create);
 }