evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ipvs: Pass ipvs not net to ip_vs_control_net_(init|cleanup)_sysctl

Browse source 
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
This commit is contained in:
Eric W. Biederman 2015-09-21 13:02:25 -05:00 • committed by Simon Horman
parent 423b55954d
commit 8b8237a581
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
net/netfilter/ipvs/ip_vs_ctl.c
View file

@ -3841,10 +3841,10 @@ static void ip_vs_genl_unregister(void)
* per netns intit/exit func. * per netns intit/exit func.
*/ */
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
static int __net_init ip_vs_control_net_init_sysctl(struct net *net) static int __net_init ip_vs_control_net_init_sysctl(struct netns_ipvs *ipvs)
{ {
struct net *net = ipvs->net;
int idx; int idx;
struct netns_ipvs *ipvs = net_ipvs(net);
struct ctl_table *tbl; struct ctl_table *tbl;
atomic_set(&ipvs->dropentry, 0); atomic_set(&ipvs->dropentry, 0);
@ -3926,9 +3926,9 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net)
return 0; return 0;
} }
static void __net_exit ip_vs_control_net_cleanup_sysctl(struct net *net) static void __net_exit ip_vs_control_net_cleanup_sysctl(struct netns_ipvs *ipvs)
{ {
struct netns_ipvs *ipvs = net_ipvs(net); struct net *net = ipvs->net;
cancel_delayed_work_sync(&ipvs->defense_work); cancel_delayed_work_sync(&ipvs->defense_work);
cancel_work_sync(&ipvs->defense_work.work); cancel_work_sync(&ipvs->defense_work.work);
@ -3941,8 +3941,8 @@ static void __net_exit ip_vs_control_net_cleanup_sysctl(struct net *net)
#else #else
static int __net_init ip_vs_control_net_init_sysctl(struct net *net) { return 0; } static int __net_init ip_vs_control_net_init_sysctl(struct netns_ipvs *ipvs) { return 0; }
static void __net_exit ip_vs_control_net_cleanup_sysctl(struct net *net) { } static void __net_exit ip_vs_control_net_cleanup_sysctl(struct netns_ipvs *ipvs) { }
#endif #endif
@ -3984,7 +3984,7 @@ int __net_init ip_vs_control_net_init(struct net *net)
proc_create("ip_vs_stats_percpu", 0, net->proc_net, proc_create("ip_vs_stats_percpu", 0, net->proc_net,
&ip_vs_stats_percpu_fops); &ip_vs_stats_percpu_fops);
if (ip_vs_control_net_init_sysctl(net)) if (ip_vs_control_net_init_sysctl(ipvs))
goto err; goto err;
return 0; return 0;
@ -3999,7 +3999,7 @@ void __net_exit ip_vs_control_net_cleanup(struct net *net)
struct netns_ipvs *ipvs = net_ipvs(net); struct netns_ipvs *ipvs = net_ipvs(net);
ip_vs_trash_cleanup(ipvs); ip_vs_trash_cleanup(ipvs);
ip_vs_control_net_cleanup_sysctl(net); ip_vs_control_net_cleanup_sysctl(ipvs);
remove_proc_entry("ip_vs_stats_percpu", net->proc_net); remove_proc_entry("ip_vs_stats_percpu", net->proc_net);
remove_proc_entry("ip_vs_stats", net->proc_net); remove_proc_entry("ip_vs_stats", net->proc_net);
remove_proc_entry("ip_vs", net->proc_net); remove_proc_entry("ip_vs", net->proc_net);