Commit 6c8f7949 authored by Hans Schillstrom's avatar Hans Schillstrom Committed by Simon Horman

IPVS: remove unused init and cleanup functions.

After restructuring, there is some unused or empty functions
left to be removed.
Signed-off-by: default avatarHans Schillstrom <hans.schillstrom@ericsson.com>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent 552ad65a
...@@ -1117,8 +1117,6 @@ extern void ip_vs_app_inc_put(struct ip_vs_app *inc); ...@@ -1117,8 +1117,6 @@ extern void ip_vs_app_inc_put(struct ip_vs_app *inc);
extern int ip_vs_app_pkt_out(struct ip_vs_conn *, struct sk_buff *skb); extern int ip_vs_app_pkt_out(struct ip_vs_conn *, struct sk_buff *skb);
extern int ip_vs_app_pkt_in(struct ip_vs_conn *, struct sk_buff *skb); extern int ip_vs_app_pkt_in(struct ip_vs_conn *, struct sk_buff *skb);
extern int ip_vs_app_init(void);
extern void ip_vs_app_cleanup(void);
void ip_vs_bind_pe(struct ip_vs_service *svc, struct ip_vs_pe *pe); void ip_vs_bind_pe(struct ip_vs_service *svc, struct ip_vs_pe *pe);
void ip_vs_unbind_pe(struct ip_vs_service *svc); void ip_vs_unbind_pe(struct ip_vs_service *svc);
...@@ -1221,15 +1219,11 @@ extern int start_sync_thread(struct net *net, int state, char *mcast_ifn, ...@@ -1221,15 +1219,11 @@ extern int start_sync_thread(struct net *net, int state, char *mcast_ifn,
__u8 syncid); __u8 syncid);
extern int stop_sync_thread(struct net *net, int state); extern int stop_sync_thread(struct net *net, int state);
extern void ip_vs_sync_conn(struct net *net, struct ip_vs_conn *cp); extern void ip_vs_sync_conn(struct net *net, struct ip_vs_conn *cp);
extern int ip_vs_sync_init(void);
extern void ip_vs_sync_cleanup(void);
/* /*
* IPVS rate estimator prototypes (from ip_vs_est.c) * IPVS rate estimator prototypes (from ip_vs_est.c)
*/ */
extern int ip_vs_estimator_init(void);
extern void ip_vs_estimator_cleanup(void);
extern void ip_vs_start_estimator(struct net *net, struct ip_vs_stats *stats); extern void ip_vs_start_estimator(struct net *net, struct ip_vs_stats *stats);
extern void ip_vs_stop_estimator(struct net *net, struct ip_vs_stats *stats); extern void ip_vs_stop_estimator(struct net *net, struct ip_vs_stats *stats);
extern void ip_vs_zero_estimator(struct ip_vs_stats *stats); extern void ip_vs_zero_estimator(struct ip_vs_stats *stats);
......
...@@ -589,13 +589,3 @@ void __net_exit ip_vs_app_net_cleanup(struct net *net) ...@@ -589,13 +589,3 @@ void __net_exit ip_vs_app_net_cleanup(struct net *net)
{ {
proc_net_remove(net, "ip_vs_app"); proc_net_remove(net, "ip_vs_app");
} }
int __init ip_vs_app_init(void)
{
return 0;
}
void ip_vs_app_cleanup(void)
{
}
...@@ -1967,36 +1967,23 @@ static int __init ip_vs_init(void) ...@@ -1967,36 +1967,23 @@ static int __init ip_vs_init(void)
{ {
int ret; int ret;
ip_vs_estimator_init();
ret = ip_vs_control_init(); ret = ip_vs_control_init();
if (ret < 0) { if (ret < 0) {
pr_err("can't setup control.\n"); pr_err("can't setup control.\n");
goto cleanup_estimator; goto exit;
} }
ip_vs_protocol_init(); ip_vs_protocol_init();
ret = ip_vs_app_init();
if (ret < 0) {
pr_err("can't setup application helper.\n");
goto cleanup_protocol;
}
ret = ip_vs_conn_init(); ret = ip_vs_conn_init();
if (ret < 0) { if (ret < 0) {
pr_err("can't setup connection table.\n"); pr_err("can't setup connection table.\n");
goto cleanup_app; goto cleanup_protocol;
}
ret = ip_vs_sync_init();
if (ret < 0) {
pr_err("can't setup sync data.\n");
goto cleanup_conn;
} }
ret = register_pernet_subsys(&ipvs_core_ops); /* Alloc ip_vs struct */ ret = register_pernet_subsys(&ipvs_core_ops); /* Alloc ip_vs struct */
if (ret < 0) if (ret < 0)
goto cleanup_sync; goto cleanup_conn;
ret = register_pernet_device(&ipvs_core_dev_ops); ret = register_pernet_device(&ipvs_core_dev_ops);
if (ret < 0) if (ret < 0)
...@@ -2016,17 +2003,12 @@ static int __init ip_vs_init(void) ...@@ -2016,17 +2003,12 @@ static int __init ip_vs_init(void)
unregister_pernet_device(&ipvs_core_dev_ops); unregister_pernet_device(&ipvs_core_dev_ops);
cleanup_sub: cleanup_sub:
unregister_pernet_subsys(&ipvs_core_ops); unregister_pernet_subsys(&ipvs_core_ops);
cleanup_sync:
ip_vs_sync_cleanup();
cleanup_conn: cleanup_conn:
ip_vs_conn_cleanup(); ip_vs_conn_cleanup();
cleanup_app:
ip_vs_app_cleanup();
cleanup_protocol: cleanup_protocol:
ip_vs_protocol_cleanup(); ip_vs_protocol_cleanup();
ip_vs_control_cleanup(); ip_vs_control_cleanup();
cleanup_estimator: exit:
ip_vs_estimator_cleanup();
return ret; return ret;
} }
...@@ -2035,12 +2017,9 @@ static void __exit ip_vs_cleanup(void) ...@@ -2035,12 +2017,9 @@ static void __exit ip_vs_cleanup(void)
nf_unregister_hooks(ip_vs_ops, ARRAY_SIZE(ip_vs_ops)); nf_unregister_hooks(ip_vs_ops, ARRAY_SIZE(ip_vs_ops));
unregister_pernet_device(&ipvs_core_dev_ops); unregister_pernet_device(&ipvs_core_dev_ops);
unregister_pernet_subsys(&ipvs_core_ops); /* free ip_vs struct */ unregister_pernet_subsys(&ipvs_core_ops); /* free ip_vs struct */
ip_vs_sync_cleanup();
ip_vs_conn_cleanup(); ip_vs_conn_cleanup();
ip_vs_app_cleanup();
ip_vs_protocol_cleanup(); ip_vs_protocol_cleanup();
ip_vs_control_cleanup(); ip_vs_control_cleanup();
ip_vs_estimator_cleanup();
pr_info("ipvs unloaded.\n"); pr_info("ipvs unloaded.\n");
} }
......
...@@ -207,12 +207,3 @@ void __net_exit ip_vs_estimator_net_cleanup(struct net *net) ...@@ -207,12 +207,3 @@ void __net_exit ip_vs_estimator_net_cleanup(struct net *net)
{ {
del_timer_sync(&net_ipvs(net)->est_timer); del_timer_sync(&net_ipvs(net)->est_timer);
} }
int __init ip_vs_estimator_init(void)
{
return 0;
}
void ip_vs_estimator_cleanup(void)
{
}
...@@ -1689,12 +1689,3 @@ void ip_vs_sync_net_cleanup(struct net *net) ...@@ -1689,12 +1689,3 @@ void ip_vs_sync_net_cleanup(struct net *net)
if (retc && retc != -ESRCH) if (retc && retc != -ESRCH)
pr_err("Failed to stop Backup Daemon\n"); pr_err("Failed to stop Backup Daemon\n");
} }
int __init ip_vs_sync_init(void)
{
return 0;
}
void ip_vs_sync_cleanup(void)
{
}
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