diff options
author | Eric W. Biederman | 2015-09-21 20:02:26 +0200 |
---|---|---|
committer | Simon Horman | 2015-09-24 02:34:39 +0200 |
commit | 3d99376689ee40d4e88c90d26588268a4fccb383 (patch) | |
tree | 646fcde4131e0a5f9bd582e0db6eeb30ecb9fceb /net/netfilter/ipvs/ip_vs_ctl.c | |
parent | ipvs: Pass ipvs not net to ip_vs_control_net_(init|cleanup)_sysctl (diff) | |
download | kernel-qcow2-linux-3d99376689ee40d4e88c90d26588268a4fccb383.tar.gz kernel-qcow2-linux-3d99376689ee40d4e88c90d26588268a4fccb383.tar.xz kernel-qcow2-linux-3d99376689ee40d4e88c90d26588268a4fccb383.zip |
ipvs: Pass ipvs not net into ip_vs_control_net_(init|cleanup)
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>
Diffstat (limited to 'net/netfilter/ipvs/ip_vs_ctl.c')
-rw-r--r-- | net/netfilter/ipvs/ip_vs_ctl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index f0d72d6375e7..b7a0bd274085 100644 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c @@ -3950,10 +3950,10 @@ static struct notifier_block ip_vs_dst_notifier = { .notifier_call = ip_vs_dst_event, }; -int __net_init ip_vs_control_net_init(struct net *net) +int __net_init ip_vs_control_net_init(struct netns_ipvs *ipvs) { + struct net *net = ipvs->net; int i, idx; - struct netns_ipvs *ipvs = net_ipvs(net); /* Initialize rs_table */ for (idx = 0; idx < IP_VS_RTAB_SIZE; idx++) @@ -3994,9 +3994,9 @@ err: return -ENOMEM; } -void __net_exit ip_vs_control_net_cleanup(struct net *net) +void __net_exit ip_vs_control_net_cleanup(struct netns_ipvs *ipvs) { - struct netns_ipvs *ipvs = net_ipvs(net); + struct net *net = ipvs->net; ip_vs_trash_cleanup(ipvs); ip_vs_control_net_cleanup_sysctl(ipvs); |