[Devel] [PATCH RH7 3/3] netfilter: ipset: move registration message to init from net_init

Pavel Tikhomirov ptikhomirov at virtuozzo.com
Fri Apr 1 07:10:29 PDT 2016


MS commit 6843bc3c5681 ("netfilter: ipset: move registration message to
init from net_init")

Commit 1785e8f473 ("netfiler: ipset: Add net namespace for ipset") moved
the initialization print into net_init, which can get called a lot due
to namespaces. Move it back into init, reduce to pr_info.

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Signed-off-by: Jozsef Kadlecsik <kadlec at blackhole.kfki.hu>

https://jira.sw.ru/browse/PSBM-45281
Signed-off-by: Pavel Tikhomirov <ptikhomirov at virtuozzo.com>
---
 net/netfilter/ipset/ip_set_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
index 6d668ae..02b8ff3 100644
--- a/net/netfilter/ipset/ip_set_core.c
+++ b/net/netfilter/ipset/ip_set_core.c
@@ -1869,7 +1869,6 @@ ip_set_net_init(struct net *net)
 		return -ENOMEM;
 	inst->is_deleted = 0;
 	rcu_assign_pointer(inst->ip_set_list, list);
-	pr_notice("ip_set: protocol %u\n", IPSET_PROTOCOL);
 	return 0;
 }
 
@@ -1920,6 +1919,7 @@ ip_set_init(void)
 		nfnetlink_subsys_unregister(&ip_set_netlink_subsys);
 		return ret;
 	}
+	pr_info("ip_set: protocol %u\n", IPSET_PROTOCOL);
 	return 0;
 }
 
-- 
1.9.3



More information about the Devel mailing list