From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kirill Tkhai Subject: [PATCH 3/3] ipv4: initialize ra_mutex in inet_init_net() Date: Thu, 20 Sep 2018 12:12:13 +0300 Message-ID: <153743472937.21312.592412049853708197.stgit@localhost.localdomain> References: <153743451940.21312.15708795592586962785.stgit@localhost.localdomain> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit To: davem@davemloft.net, xiyou.wangcong@gmail.com, yoshfuji@linux-ipv6.org, ktkhai@virtuozzo.com, avagin@virtuozzo.com, edumazet@google.com, ebiederm@xmission.com, netdev@vger.kernel.org Return-path: Received: from mail-eopbgr10092.outbound.protection.outlook.com ([40.107.1.92]:47232 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726788AbeITOyv (ORCPT ); Thu, 20 Sep 2018 10:54:51 -0400 In-Reply-To: <153743451940.21312.15708795592586962785.stgit@localhost.localdomain> Sender: netdev-owner@vger.kernel.org List-ID: From: Cong Wang ra_mutex is a IPv4 specific mutex, it is inside struct netns_ipv4, but its initialization is in the generic netns code, setup_net(). Move it to IPv4 specific net init code, inet_init_net(). Fixes: d9ff3049739e ("net: Replace ip_ra_lock with per-net mutex") Signed-off-by: Cong Wang Acked-by: Kirill Tkhai --- net/core/net_namespace.c | 1 - net/ipv4/af_inet.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c index 670c84b1bfc2..b272ccfcbf63 100644 --- a/net/core/net_namespace.c +++ b/net/core/net_namespace.c @@ -308,7 +308,6 @@ static __net_init int setup_net(struct net *net, struct user_namespace *user_ns) net->user_ns = user_ns; idr_init(&net->netns_ids); spin_lock_init(&net->nsid_lock); - mutex_init(&net->ipv4.ra_mutex); list_for_each_entry(ops, &pernet_list, list) { error = ops_init(ops, net); diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index bbd3a072ffea..d4623144e237 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -1818,6 +1818,8 @@ static __net_init int inet_init_net(struct net *net) net->ipv4.sysctl_igmp_llm_reports = 1; net->ipv4.sysctl_igmp_qrv = 2; + mutex_init(&net->ipv4.ra_mutex); + return 0; }