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

ipvs: Pass ipvs not net into ip_vs_app_net_init and ip_vs_app_net_cleanup

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:34 -05:00 • committed by Simon Horman
parent 09858708e6
commit b5dd212cc1
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/net/ip_vs.h
View file

@ -1326,11 +1326,11 @@ ip_vs_control_add(struct ip_vs_conn *cp, struct ip_vs_conn *ctl_cp)
int ip_vs_estimator_net_init(struct netns_ipvs *ipvs); int ip_vs_estimator_net_init(struct netns_ipvs *ipvs);
int ip_vs_control_net_init(struct netns_ipvs *ipvs); int ip_vs_control_net_init(struct netns_ipvs *ipvs);
int ip_vs_protocol_net_init(struct net *net); int ip_vs_protocol_net_init(struct net *net);
int ip_vs_app_net_init(struct net *net); int ip_vs_app_net_init(struct netns_ipvs *ipvs);
int ip_vs_conn_net_init(struct net *net); int ip_vs_conn_net_init(struct net *net);
int ip_vs_sync_net_init(struct netns_ipvs *ipvs); int ip_vs_sync_net_init(struct netns_ipvs *ipvs);
void ip_vs_conn_net_cleanup(struct net *net); void ip_vs_conn_net_cleanup(struct net *net);
void ip_vs_app_net_cleanup(struct net *net); void ip_vs_app_net_cleanup(struct netns_ipvs *ipvs);
void ip_vs_protocol_net_cleanup(struct net *net); void ip_vs_protocol_net_cleanup(struct net *net);
void ip_vs_control_net_cleanup(struct netns_ipvs *ipvs); void ip_vs_control_net_cleanup(struct netns_ipvs *ipvs);
void ip_vs_estimator_net_cleanup(struct netns_ipvs *ipvs); void ip_vs_estimator_net_cleanup(struct netns_ipvs *ipvs);

8
net/netfilter/ipvs/ip_vs_app.c
View file

@ -603,18 +603,18 @@ static const struct file_operations ip_vs_app_fops = {
}; };
#endif #endif
int __net_init ip_vs_app_net_init(struct net *net) int __net_init ip_vs_app_net_init(struct netns_ipvs *ipvs)
{ {
struct netns_ipvs *ipvs = net_ipvs(net); struct net *net = ipvs->net;
INIT_LIST_HEAD(&ipvs->app_list); INIT_LIST_HEAD(&ipvs->app_list);
proc_create("ip_vs_app", 0, net->proc_net, &ip_vs_app_fops); proc_create("ip_vs_app", 0, net->proc_net, &ip_vs_app_fops);
return 0; return 0;
} }
void __net_exit ip_vs_app_net_cleanup(struct net *net) void __net_exit ip_vs_app_net_cleanup(struct netns_ipvs *ipvs)
{ {
struct netns_ipvs *ipvs = net_ipvs(net); struct net *net = ipvs->net;
unregister_ip_vs_app(ipvs, NULL /* all */); unregister_ip_vs_app(ipvs, NULL /* all */);
remove_proc_entry("ip_vs_app", net->proc_net); remove_proc_entry("ip_vs_app", net->proc_net);

6
net/netfilter/ipvs/ip_vs_core.c
View file

@ -2081,7 +2081,7 @@ static int __net_init __ip_vs_init(struct net *net)
if (ip_vs_protocol_net_init(net) < 0) if (ip_vs_protocol_net_init(net) < 0)
goto protocol_fail; goto protocol_fail;
if (ip_vs_app_net_init(net) < 0) if (ip_vs_app_net_init(ipvs) < 0)
goto app_fail; goto app_fail;
if (ip_vs_conn_net_init(net) < 0) if (ip_vs_conn_net_init(net) < 0)
@ -2100,7 +2100,7 @@ static int __net_init __ip_vs_init(struct net *net)
sync_fail: sync_fail:
ip_vs_conn_net_cleanup(net); ip_vs_conn_net_cleanup(net);
conn_fail: conn_fail:
ip_vs_app_net_cleanup(net); ip_vs_app_net_cleanup(ipvs);
app_fail: app_fail:
ip_vs_protocol_net_cleanup(net); ip_vs_protocol_net_cleanup(net);
protocol_fail: protocol_fail:
@ -2118,7 +2118,7 @@ static void __net_exit __ip_vs_cleanup(struct net *net)
ip_vs_service_net_cleanup(ipvs); /* ip_vs_flush() with locks */ ip_vs_service_net_cleanup(ipvs); /* ip_vs_flush() with locks */
ip_vs_conn_net_cleanup(net); ip_vs_conn_net_cleanup(net);
ip_vs_app_net_cleanup(net); ip_vs_app_net_cleanup(ipvs);
ip_vs_protocol_net_cleanup(net); ip_vs_protocol_net_cleanup(net);
ip_vs_control_net_cleanup(ipvs); ip_vs_control_net_cleanup(ipvs);
ip_vs_estimator_net_cleanup(ipvs); ip_vs_estimator_net_cleanup(ipvs);