Commit a7ed31cf authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso

Merge tag 'ipvs-for-v4.6' of...

Merge tag 'ipvs-for-v4.6' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next into HEAD

Simon Horman says:

====================
please consider these cleanups for IPVS for v4.6.

* Arnd Bergmann has resolved a bunch of unused variable warnings and;
* Yannick Brosseau has removed a noisy debug message
====================
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parents 8ee225e7 f6ca9f46
...@@ -605,17 +605,13 @@ static const struct file_operations ip_vs_app_fops = { ...@@ -605,17 +605,13 @@ static const struct file_operations ip_vs_app_fops = {
int __net_init ip_vs_app_net_init(struct netns_ipvs *ipvs) int __net_init ip_vs_app_net_init(struct netns_ipvs *ipvs)
{ {
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, ipvs->net->proc_net, &ip_vs_app_fops);
return 0; return 0;
} }
void __net_exit ip_vs_app_net_cleanup(struct netns_ipvs *ipvs) void __net_exit ip_vs_app_net_cleanup(struct netns_ipvs *ipvs)
{ {
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", ipvs->net->proc_net);
} }
...@@ -1376,8 +1376,6 @@ static void __ip_vs_del_service(struct ip_vs_service *svc, bool cleanup) ...@@ -1376,8 +1376,6 @@ static void __ip_vs_del_service(struct ip_vs_service *svc, bool cleanup)
struct ip_vs_pe *old_pe; struct ip_vs_pe *old_pe;
struct netns_ipvs *ipvs = svc->ipvs; struct netns_ipvs *ipvs = svc->ipvs;
pr_info("%s: enter\n", __func__);
/* Count only IPv4 services for old get/setsockopt interface */ /* Count only IPv4 services for old get/setsockopt interface */
if (svc->af == AF_INET) if (svc->af == AF_INET)
ipvs->num_services--; ipvs->num_services--;
...@@ -3947,7 +3945,6 @@ static struct notifier_block ip_vs_dst_notifier = { ...@@ -3947,7 +3945,6 @@ static struct notifier_block ip_vs_dst_notifier = {
int __net_init ip_vs_control_net_init(struct netns_ipvs *ipvs) int __net_init ip_vs_control_net_init(struct netns_ipvs *ipvs)
{ {
struct net *net = ipvs->net;
int i, idx; int i, idx;
/* Initialize rs_table */ /* Initialize rs_table */
...@@ -3974,9 +3971,9 @@ int __net_init ip_vs_control_net_init(struct netns_ipvs *ipvs) ...@@ -3974,9 +3971,9 @@ int __net_init ip_vs_control_net_init(struct netns_ipvs *ipvs)
spin_lock_init(&ipvs->tot_stats.lock); spin_lock_init(&ipvs->tot_stats.lock);
proc_create("ip_vs", 0, net->proc_net, &ip_vs_info_fops); proc_create("ip_vs", 0, ipvs->net->proc_net, &ip_vs_info_fops);
proc_create("ip_vs_stats", 0, net->proc_net, &ip_vs_stats_fops); proc_create("ip_vs_stats", 0, ipvs->net->proc_net, &ip_vs_stats_fops);
proc_create("ip_vs_stats_percpu", 0, net->proc_net, proc_create("ip_vs_stats_percpu", 0, ipvs->net->proc_net,
&ip_vs_stats_percpu_fops); &ip_vs_stats_percpu_fops);
if (ip_vs_control_net_init_sysctl(ipvs)) if (ip_vs_control_net_init_sysctl(ipvs))
...@@ -3991,13 +3988,11 @@ int __net_init ip_vs_control_net_init(struct netns_ipvs *ipvs) ...@@ -3991,13 +3988,11 @@ int __net_init ip_vs_control_net_init(struct netns_ipvs *ipvs)
void __net_exit ip_vs_control_net_cleanup(struct netns_ipvs *ipvs) void __net_exit ip_vs_control_net_cleanup(struct netns_ipvs *ipvs)
{ {
struct net *net = ipvs->net;
ip_vs_trash_cleanup(ipvs); ip_vs_trash_cleanup(ipvs);
ip_vs_control_net_cleanup_sysctl(ipvs); ip_vs_control_net_cleanup_sysctl(ipvs);
remove_proc_entry("ip_vs_stats_percpu", net->proc_net); remove_proc_entry("ip_vs_stats_percpu", ipvs->net->proc_net);
remove_proc_entry("ip_vs_stats", net->proc_net); remove_proc_entry("ip_vs_stats", ipvs->net->proc_net);
remove_proc_entry("ip_vs", net->proc_net); remove_proc_entry("ip_vs", ipvs->net->proc_net);
free_percpu(ipvs->tot_stats.cpustats); free_percpu(ipvs->tot_stats.cpustats);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment