Skip to content

Commit

Permalink
IPVS: rename of netns init and cleanup functions.
Browse files Browse the repository at this point in the history 
Make it more clear what the functions does,
on request by Julian.

Signed-off-by: Hans Schillstrom <hans.schillstrom@ericsson.com>
Signed-off-by: Hans Schillstrom <hans@schillstrom.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
  • Loading branch information
Hans Schillstrom authored and Simon Horman committed Jun 13, 2011
1 parent ed78bec commit 503cf15
Show file tree
Hide file tree
Showing 8 changed files with 51 additions and 51 deletions.
26 changes: 13 additions & 13 deletions include/net/ip_vs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1087,19 +1087,19 @@ ip_vs_control_add(struct ip_vs_conn *cp, struct ip_vs_conn *ctl_cp)
/*
* IPVS netns init & cleanup functions
*/
extern int __ip_vs_estimator_init(struct net *net);
extern int __ip_vs_control_init(struct net *net);
extern int __ip_vs_protocol_init(struct net *net);
extern int __ip_vs_app_init(struct net *net);
extern int __ip_vs_conn_init(struct net *net);
extern int __ip_vs_sync_init(struct net *net);
extern void __ip_vs_conn_cleanup(struct net *net);
extern void __ip_vs_app_cleanup(struct net *net);
extern void __ip_vs_protocol_cleanup(struct net *net);
extern void __ip_vs_control_cleanup(struct net *net);
extern void __ip_vs_estimator_cleanup(struct net *net);
extern void __ip_vs_sync_cleanup(struct net *net);
extern void __ip_vs_service_cleanup(struct net *net);
extern int ip_vs_estimator_net_init(struct net *net);
extern int ip_vs_control_net_init(struct net *net);
extern int ip_vs_protocol_net_init(struct net *net);
extern int ip_vs_app_net_init(struct net *net);
extern int ip_vs_conn_net_init(struct net *net);
extern int ip_vs_sync_net_init(struct net *net);
extern void ip_vs_conn_net_cleanup(struct net *net);
extern void ip_vs_app_net_cleanup(struct net *net);
extern void ip_vs_protocol_net_cleanup(struct net *net);
extern void ip_vs_control_net_cleanup(struct net *net);
extern void ip_vs_estimator_net_cleanup(struct net *net);
extern void ip_vs_sync_net_cleanup(struct net *net);
extern void ip_vs_service_net_cleanup(struct net *net);

/*
* IPVS application functions
Expand Down
4 changes: 2 additions & 2 deletions net/netfilter/ipvs/ip_vs_app.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@ static const struct file_operations ip_vs_app_fops = {
};
#endif

int __net_init __ip_vs_app_init(struct net *net)
int __net_init ip_vs_app_net_init(struct net *net)
{
struct netns_ipvs *ipvs = net_ipvs(net);

Expand All @@ -585,7 +585,7 @@ int __net_init __ip_vs_app_init(struct net *net)
return 0;
}

void __net_exit __ip_vs_app_cleanup(struct net *net)
void __net_exit ip_vs_app_net_cleanup(struct net *net)
{
proc_net_remove(net, "ip_vs_app");
}
Expand Down
4 changes: 2 additions & 2 deletions net/netfilter/ipvs/ip_vs_conn.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1247,7 +1247,7 @@ static void ip_vs_conn_flush(struct net *net)
/*
* per netns init and exit
*/
int __net_init __ip_vs_conn_init(struct net *net)
int __net_init ip_vs_conn_net_init(struct net *net)
{
struct netns_ipvs *ipvs = net_ipvs(net);

Expand All @@ -1258,7 +1258,7 @@ int __net_init __ip_vs_conn_init(struct net *net)
return 0;
}

void __net_exit __ip_vs_conn_cleanup(struct net *net)
void __net_exit ip_vs_conn_net_cleanup(struct net *net)
{
/* flush all the connection entries first */
ip_vs_conn_flush(net);
Expand Down
36 changes: 18 additions & 18 deletions net/netfilter/ipvs/ip_vs_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1891,22 +1891,22 @@ static int __net_init __ip_vs_init(struct net *net)
atomic_inc(&ipvs_netns_cnt);
net->ipvs = ipvs;

if (__ip_vs_estimator_init(net) < 0)
if (ip_vs_estimator_net_init(net) < 0)
goto estimator_fail;

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

if (__ip_vs_protocol_init(net) < 0)
if (ip_vs_protocol_net_init(net) < 0)
goto protocol_fail;

if (__ip_vs_app_init(net) < 0)
if (ip_vs_app_net_init(net) < 0)
goto app_fail;

if (__ip_vs_conn_init(net) < 0)
if (ip_vs_conn_net_init(net) < 0)
goto conn_fail;

if (__ip_vs_sync_init(net) < 0)
if (ip_vs_sync_net_init(net) < 0)
goto sync_fail;

printk(KERN_INFO "IPVS: Creating netns size=%zu id=%d\n",
Expand All @@ -1917,35 +1917,35 @@ static int __net_init __ip_vs_init(struct net *net)
*/

sync_fail:
__ip_vs_conn_cleanup(net);
ip_vs_conn_net_cleanup(net);
conn_fail:
__ip_vs_app_cleanup(net);
ip_vs_app_net_cleanup(net);
app_fail:
__ip_vs_protocol_cleanup(net);
ip_vs_protocol_net_cleanup(net);
protocol_fail:
__ip_vs_control_cleanup(net);
ip_vs_control_net_cleanup(net);
control_fail:
__ip_vs_estimator_cleanup(net);
ip_vs_estimator_net_cleanup(net);
estimator_fail:
return -ENOMEM;
}

static void __net_exit __ip_vs_cleanup(struct net *net)
{
__ip_vs_service_cleanup(net); /* ip_vs_flush() with locks */
__ip_vs_conn_cleanup(net);
__ip_vs_app_cleanup(net);
__ip_vs_protocol_cleanup(net);
__ip_vs_control_cleanup(net);
__ip_vs_estimator_cleanup(net);
ip_vs_service_net_cleanup(net); /* ip_vs_flush() with locks */
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_estimator_net_cleanup(net);
IP_VS_DBG(2, "ipvs netns %d released\n", net_ipvs(net)->gen);
}

static void __net_exit __ip_vs_dev_cleanup(struct net *net)
{
EnterFunction(2);
net_ipvs(net)->enable = 0; /* Disable packet reception */
__ip_vs_sync_cleanup(net);
ip_vs_sync_net_cleanup(net);
LeaveFunction(2);
}

Expand Down
20 changes: 10 additions & 10 deletions net/netfilter/ipvs/ip_vs_ctl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1483,7 +1483,7 @@ static int ip_vs_flush(struct net *net)
* Delete service by {netns} in the service table.
* Called by __ip_vs_cleanup()
*/
void __ip_vs_service_cleanup(struct net *net)
void ip_vs_service_net_cleanup(struct net *net)
{
EnterFunction(2);
/* Check for "full" addressed entries */
Expand Down Expand Up @@ -1662,7 +1662,7 @@ proc_do_sync_mode(ctl_table *table, int write,
/*
* IPVS sysctl table (under the /proc/sys/net/ipv4/vs/)
* Do not change order or insert new entries without
* align with netns init in __ip_vs_control_init()
* align with netns init in ip_vs_control_net_init()
*/

static struct ctl_table vs_vars[] = {
Expand Down Expand Up @@ -3595,7 +3595,7 @@ static void ip_vs_genl_unregister(void)
* per netns intit/exit func.
*/
#ifdef CONFIG_SYSCTL
int __net_init __ip_vs_control_init_sysctl(struct net *net)
int __net_init ip_vs_control_net_init_sysctl(struct net *net)
{
int idx;
struct netns_ipvs *ipvs = net_ipvs(net);
Expand Down Expand Up @@ -3654,7 +3654,7 @@ int __net_init __ip_vs_control_init_sysctl(struct net *net)
return 0;
}

void __net_init __ip_vs_control_cleanup_sysctl(struct net *net)
void __net_init ip_vs_control_net_cleanup_sysctl(struct net *net)
{
struct netns_ipvs *ipvs = net_ipvs(net);

Expand All @@ -3665,16 +3665,16 @@ void __net_init __ip_vs_control_cleanup_sysctl(struct net *net)

#else

int __net_init __ip_vs_control_init_sysctl(struct net *net) { return 0; }
void __net_init __ip_vs_control_cleanup_sysctl(struct net *net) { }
int __net_init ip_vs_control_net_init_sysctl(struct net *net) { return 0; }
void __net_init ip_vs_control_net_cleanup_sysctl(struct net *net) { }

#endif

static struct notifier_block ip_vs_dst_notifier = {
.notifier_call = ip_vs_dst_event,
};

int __net_init __ip_vs_control_init(struct net *net)
int __net_init ip_vs_control_net_init(struct net *net)
{
int idx;
struct netns_ipvs *ipvs = net_ipvs(net);
Expand Down Expand Up @@ -3702,7 +3702,7 @@ int __net_init __ip_vs_control_init(struct net *net)
proc_net_fops_create(net, "ip_vs_stats_percpu", 0,
&ip_vs_stats_percpu_fops);

if (__ip_vs_control_init_sysctl(net))
if (ip_vs_control_net_init_sysctl(net))
goto err;

return 0;
Expand All @@ -3712,13 +3712,13 @@ int __net_init __ip_vs_control_init(struct net *net)
return -ENOMEM;
}

void __net_exit __ip_vs_control_cleanup(struct net *net)
void __net_exit ip_vs_control_net_cleanup(struct net *net)
{
struct netns_ipvs *ipvs = net_ipvs(net);

ip_vs_trash_cleanup(net);
ip_vs_stop_estimator(net, &ipvs->tot_stats);
__ip_vs_control_cleanup_sysctl(net);
ip_vs_control_net_cleanup_sysctl(net);
proc_net_remove(net, "ip_vs_stats_percpu");
proc_net_remove(net, "ip_vs_stats");
proc_net_remove(net, "ip_vs");
Expand Down
4 changes: 2 additions & 2 deletions net/netfilter/ipvs/ip_vs_est.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ void ip_vs_read_estimator(struct ip_vs_stats_user *dst,
dst->outbps = (e->outbps + 0xF) >> 5;
}

int __net_init __ip_vs_estimator_init(struct net *net)
int __net_init ip_vs_estimator_net_init(struct net *net)
{
struct netns_ipvs *ipvs = net_ipvs(net);

Expand All @@ -203,7 +203,7 @@ int __net_init __ip_vs_estimator_init(struct net *net)
return 0;
}

void __net_exit __ip_vs_estimator_cleanup(struct net *net)
void __net_exit ip_vs_estimator_net_cleanup(struct net *net)
{
del_timer_sync(&net_ipvs(net)->est_timer);
}
Expand Down
4 changes: 2 additions & 2 deletions net/netfilter/ipvs/ip_vs_proto.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ ip_vs_tcpudp_debug_packet(int af, struct ip_vs_protocol *pp,
/*
* per network name-space init
*/
int __net_init __ip_vs_protocol_init(struct net *net)
int __net_init ip_vs_protocol_net_init(struct net *net)
{
#ifdef CONFIG_IP_VS_PROTO_TCP
register_ip_vs_proto_netns(net, &ip_vs_protocol_tcp);
Expand All @@ -336,7 +336,7 @@ int __net_init __ip_vs_protocol_init(struct net *net)
return 0;
}

void __net_exit __ip_vs_protocol_cleanup(struct net *net)
void __net_exit ip_vs_protocol_net_cleanup(struct net *net)
{
struct netns_ipvs *ipvs = net_ipvs(net);
struct ip_vs_proto_data *pd;
Expand Down
4 changes: 2 additions & 2 deletions net/netfilter/ipvs/ip_vs_sync.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1663,7 +1663,7 @@ int stop_sync_thread(struct net *net, int state)
/*
* Initialize data struct for each netns
*/
int __net_init __ip_vs_sync_init(struct net *net)
int __net_init ip_vs_sync_net_init(struct net *net)
{
struct netns_ipvs *ipvs = net_ipvs(net);

Expand All @@ -1677,7 +1677,7 @@ int __net_init __ip_vs_sync_init(struct net *net)
return 0;
}

void __ip_vs_sync_cleanup(struct net *net)
void ip_vs_sync_net_cleanup(struct net *net)
{
int retc;

Expand Down

0 comments on commit 503cf15

Please sign in to comment.