From 1ead0d55fb6a2c493faba2e9411d60085369443d Mon Sep 17 00:00:00 2001 From: Julian Anastasov Date: Wed, 25 Apr 2012 00:29:58 +0300 Subject: [PATCH] --- yaml --- r: 299955 b: refs/heads/master c: 39f618b4fd95ae243d940ec64c961009c74e3333 h: refs/heads/master i: 299953: d61f924b0605db65950c7f444cc957d75beb699a 299951: c899409b5cb8fe06141f002878114a735a223f48 v: v3 --- [refs] | 2 +- trunk/net/netfilter/ipvs/ip_vs_core.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index decb8df18c26..5681b8a0d8e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d08d71ce59438a6ef06be5db07966e0c144b74e +refs/heads/master: 39f618b4fd95ae243d940ec64c961009c74e3333 diff --git a/trunk/net/netfilter/ipvs/ip_vs_core.c b/trunk/net/netfilter/ipvs/ip_vs_core.c index 2555816e7788..260b9ef88775 100644 --- a/trunk/net/netfilter/ipvs/ip_vs_core.c +++ b/trunk/net/netfilter/ipvs/ip_vs_core.c @@ -1924,6 +1924,7 @@ static int __net_init __ip_vs_init(struct net *net) control_fail: ip_vs_estimator_net_cleanup(net); estimator_fail: + net->ipvs = NULL; return -ENOMEM; } @@ -1936,6 +1937,7 @@ static void __net_exit __ip_vs_cleanup(struct net *net) ip_vs_control_net_cleanup(net); ip_vs_estimator_net_cleanup(net); IP_VS_DBG(2, "ipvs netns %d released\n", net_ipvs(net)->gen); + net->ipvs = NULL; } static void __net_exit __ip_vs_dev_cleanup(struct net *net)