Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 22:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipvs: convert to use pernet nf_hook api

Browse Source 
nf_(un)register_hooks has to maintain an internal hook list to add/remove
those hooks from net namespaces as they are added/deleted.

ipvs already uses pernet_ops, so we can switch to the (more recent)
pernet hook api instead.

Compile tested only.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Florian Westphal 2017-04-19 18:25:22 +02:00 committed by Pablo Neira Ayuso
parent 1fefe14725
commit efe4160618
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
net/netfilter/ipvs/ip_vs_core.c
View File

@ -2200,6 +2200,7 @@ static struct nf_hook_ops ip_vs_ops[] __read_mostly = {
static int __net_init __ip_vs_init(struct net *net) static int __net_init __ip_vs_init(struct net *net)
{ {
struct netns_ipvs *ipvs; struct netns_ipvs *ipvs;
int ret;
ipvs = net_generic(net, ip_vs_net_id); ipvs = net_generic(net, ip_vs_net_id);
if (ipvs == NULL) if (ipvs == NULL)
@ -2231,11 +2232,17 @@ static int __net_init __ip_vs_init(struct net *net)
if (ip_vs_sync_net_init(ipvs) < 0) if (ip_vs_sync_net_init(ipvs) < 0)
goto sync_fail; goto sync_fail;
ret = nf_register_net_hooks(net, ip_vs_ops, ARRAY_SIZE(ip_vs_ops));
if (ret < 0)
goto hook_fail;
return 0; return 0;
/* /*
* Error handling * Error handling
*/ */
hook_fail:
ip_vs_sync_net_cleanup(ipvs);
sync_fail: sync_fail:
ip_vs_conn_net_cleanup(ipvs); ip_vs_conn_net_cleanup(ipvs);
conn_fail: conn_fail:
@ -2255,6 +2262,7 @@ static void __net_exit __ip_vs_cleanup(struct net *net)
{ {
struct netns_ipvs *ipvs = net_ipvs(net); struct netns_ipvs *ipvs = net_ipvs(net);
nf_unregister_net_hooks(net, ip_vs_ops, ARRAY_SIZE(ip_vs_ops));
ip_vs_service_net_cleanup(ipvs); /* ip_vs_flush() with locks */ ip_vs_service_net_cleanup(ipvs); /* ip_vs_flush() with locks */
ip_vs_conn_net_cleanup(ipvs); ip_vs_conn_net_cleanup(ipvs);
ip_vs_app_net_cleanup(ipvs); ip_vs_app_net_cleanup(ipvs);
@ -2315,24 +2323,16 @@ static int __init ip_vs_init(void)
if (ret < 0) if (ret < 0)
goto cleanup_sub; goto cleanup_sub;
ret = nf_register_hooks(ip_vs_ops, ARRAY_SIZE(ip_vs_ops));
if (ret < 0) {
pr_err("can't register hooks.\n");
goto cleanup_dev;
}
ret = ip_vs_register_nl_ioctl(); ret = ip_vs_register_nl_ioctl();
if (ret < 0) { if (ret < 0) {
pr_err("can't register netlink/ioctl.\n"); pr_err("can't register netlink/ioctl.\n");
goto cleanup_hooks; goto cleanup_dev;
} }
pr_info("ipvs loaded.\n"); pr_info("ipvs loaded.\n");
return ret; return ret;
cleanup_hooks:
nf_unregister_hooks(ip_vs_ops, ARRAY_SIZE(ip_vs_ops));
cleanup_dev: cleanup_dev:
unregister_pernet_device(&ipvs_core_dev_ops); unregister_pernet_device(&ipvs_core_dev_ops);
cleanup_sub: cleanup_sub:
@ -2349,7 +2349,6 @@ exit:
static void __exit ip_vs_cleanup(void) static void __exit ip_vs_cleanup(void)
{ {
ip_vs_unregister_nl_ioctl(); ip_vs_unregister_nl_ioctl();
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_conn_cleanup(); ip_vs_conn_cleanup();