Skip to content

Commit

Permalink
ipvs: Pass ipvs not net into ip_vs_control_net_(init|cleanup)
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Eric W. Biederman authored and Simon Horman committed Sep 24, 2015
1 parent 8b8237a commit 3d99376
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions include/net/ip_vs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1324,15 +1324,15 @@ ip_vs_control_add(struct ip_vs_conn *cp, struct ip_vs_conn *ctl_cp)

/* IPVS netns init & cleanup functions */
int ip_vs_estimator_net_init(struct net *net);
int ip_vs_control_net_init(struct net *net);
int ip_vs_control_net_init(struct netns_ipvs *ipvs);
int ip_vs_protocol_net_init(struct net *net);
int ip_vs_app_net_init(struct net *net);
int ip_vs_conn_net_init(struct net *net);
int ip_vs_sync_net_init(struct netns_ipvs *ipvs);
void ip_vs_conn_net_cleanup(struct net *net);
void ip_vs_app_net_cleanup(struct net *net);
void ip_vs_protocol_net_cleanup(struct net *net);
void ip_vs_control_net_cleanup(struct net *net);
void ip_vs_control_net_cleanup(struct netns_ipvs *ipvs);
void ip_vs_estimator_net_cleanup(struct net *net);
void ip_vs_sync_net_cleanup(struct netns_ipvs *ipvs);
void ip_vs_service_net_cleanup(struct netns_ipvs *ipvs);
Expand Down
6 changes: 3 additions & 3 deletions net/netfilter/ipvs/ip_vs_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2075,7 +2075,7 @@ static int __net_init __ip_vs_init(struct net *net)
if (ip_vs_estimator_net_init(net) < 0)
goto estimator_fail;

if (ip_vs_control_net_init(net) < 0)
if (ip_vs_control_net_init(ipvs) < 0)
goto control_fail;

if (ip_vs_protocol_net_init(net) < 0)
Expand Down Expand Up @@ -2104,7 +2104,7 @@ static int __net_init __ip_vs_init(struct net *net)
app_fail:
ip_vs_protocol_net_cleanup(net);
protocol_fail:
ip_vs_control_net_cleanup(net);
ip_vs_control_net_cleanup(ipvs);
control_fail:
ip_vs_estimator_net_cleanup(net);
estimator_fail:
Expand All @@ -2120,7 +2120,7 @@ static void __net_exit __ip_vs_cleanup(struct net *net)
ip_vs_conn_net_cleanup(net);
ip_vs_app_net_cleanup(net);
ip_vs_protocol_net_cleanup(net);
ip_vs_control_net_cleanup(net);
ip_vs_control_net_cleanup(ipvs);
ip_vs_estimator_net_cleanup(net);
IP_VS_DBG(2, "ipvs netns %d released\n", ipvs->gen);
net->ipvs = NULL;
Expand Down
8 changes: 4 additions & 4 deletions net/netfilter/ipvs/ip_vs_ctl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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++)
Expand Down Expand Up @@ -3994,9 +3994,9 @@ int __net_init ip_vs_control_net_init(struct net *net)
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);
Expand Down

0 comments on commit 3d99376

Please sign in to comment.