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

Commit ed160e83 authored by Denis V. Lunev's avatar Denis V. Lunev Committed by David S. Miller
Browse files

[NET]: Cleanup pernet operation without CONFIG_NET_NS 



If CONFIG_NET_NS is not set, the only namespace is possible.

This patch removes list of pernet_operations and cleanups code a bit.
This list is not needed if there are no namespaces. We should just call
->init method.

Additionally, the ->exit will be called on module unloading only. This
case is safe - the code is not discarded. For the in/kernel code, ->exit
should never be called.

Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 072ee3f9

net/core/net_namespace.c

+18 −0
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ static int __init net_ns_init(void) 


pure_initcall(net_ns_init);



#ifdef CONFIG_NET_NS

static int register_pernet_operations(struct list_head *list,

				      struct pernet_operations *ops)

{
@@ -228,6 +229,23 @@ static void unregister_pernet_operations(struct pernet_operations *ops) 
			ops->exit(net);

}



#else



static int register_pernet_operations(struct list_head *list,

				      struct pernet_operations *ops)

{

	if (ops->init == NULL)

		return 0;

	return ops->init(&init_net);

}



static void unregister_pernet_operations(struct pernet_operations *ops)

{

	if (ops->exit)

		ops->exit(&init_net);

}

#endif



/**

 *      register_pernet_subsys - register a network namespace subsystem

 *	@ops:  pernet operations structure for the subsystem