Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit efe41606 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

ipvs: convert to use pernet nf_hook api 



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: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 1fefe147

net/netfilter/ipvs/ip_vs_core.c

+9 −10
Original line number Diff line number Diff line
@@ -2200,6 +2200,7 @@ static struct nf_hook_ops ip_vs_ops[] __read_mostly = { 
static int __net_init __ip_vs_init(struct net *net)

{

	struct netns_ipvs *ipvs;

	int ret;



	ipvs = net_generic(net, ip_vs_net_id);

	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)

		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;

/*

 * Error handling

 */



hook_fail:

	ip_vs_sync_net_cleanup(ipvs);

sync_fail:

	ip_vs_conn_net_cleanup(ipvs);

conn_fail:
@@ -2255,6 +2262,7 @@ static void __net_exit __ip_vs_cleanup(struct net *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_conn_net_cleanup(ipvs);

	ip_vs_app_net_cleanup(ipvs);
@@ -2315,24 +2323,16 @@ static int __init ip_vs_init(void) 
	if (ret < 0)

		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();

	if (ret < 0) {

		pr_err("can't register netlink/ioctl.\n");

		goto cleanup_hooks;

		goto cleanup_dev;

	}



	pr_info("ipvs loaded.\n");



	return ret;



cleanup_hooks:

	nf_unregister_hooks(ip_vs_ops, ARRAY_SIZE(ip_vs_ops));

cleanup_dev:

	unregister_pernet_device(&ipvs_core_dev_ops);

cleanup_sub:
@@ -2349,7 +2349,6 @@ static int __init ip_vs_init(void) 
static void __exit ip_vs_cleanup(void)

{

	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_subsys(&ipvs_core_ops);	/* free ip_vs struct */

	ip_vs_conn_cleanup();