Message ID | 153743472937.21312.592412049853708197.stgit@localhost.localdomain |
---|---|
State | Changes Requested, archived |
Delegated to: | David Miller |
Headers | show |
Series | Refactorings on af_inet pernet initialization | expand |
On Thu, Sep 20, 2018 at 2:12 AM Kirill Tkhai <ktkhai@virtuozzo.com> wrote: > > From: Cong Wang <xiyou.wangcong@gmail.com> > > 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 <xiyou.wangcong@gmail.com> > Acked-by: Kirill Tkhai <ktkhai@virtuozzo.com> I regret for wasting my time on this, so: Nacked-by: Cong Wang <xiyou.wangcong@gmail.com> Let's just leave the current code as it is.
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; }