[PATCH 4/5] Mark the setup_net as __net_init

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: David Miller <davem@...>
Cc: Linux Netdev List <netdev@...>, Eric W. Biederman <ebiederm@...>, <devel@...>
Date: Wednesday, October 31, 2007 - 3:31 pm

The setup_net is called for the init net namespace
only (int the CONFIG_NET_NS=n of course) from the __init
function, so mark it as __net_init to disappear with the
caller after the boot.

Yet again, in the perfect world this has to be under
#ifdef CONFIG_NET_NS, but it isn't guaranteed that every
subsystem is registered *after* the init_net_ns is set
up. After we are sure, that we don't start registering
them before the init net setup, we'll be able to move
this code under the ifdef.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>

---

diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index d5bf8b2..a044e2d 100644
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@ -25,7 +25,7 @@ EXPORT_SYMBOL_GPL(init_net);
 /*
  * setup_net runs the initializers for the network namespace object.
  */
-static int setup_net(struct net *net)
+static __net_init int setup_net(struct net *net)
 {
 	/* Must be called with net_mutex held */
 	struct pernet_operations *ops;
-- 
1.5.3.4

-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 0/5] Make nicer CONFIG_NET_NS=n case code, Pavel Emelyanov, (Wed Oct 31, 3:19 pm)
Re: [PATCH 0/5] Make nicer CONFIG_NET_NS=n case code, Daniel Lezcano, (Wed Oct 31, 5:37 pm)
Re: [PATCH 0/5] Make nicer CONFIG_NET_NS=n case code, Eric Dumazet, (Wed Oct 31, 2:49 pm)
Re: [PATCH 0/5] Make nicer CONFIG_NET_NS=n case code, Eric W. Biederman, (Wed Oct 31, 6:05 pm)
Re: [PATCH 0/5] Make nicer CONFIG_NET_NS=n case code, Eric Dumazet, (Wed Oct 31, 6:40 pm)
Re: [PATCH 0/5] Make nicer CONFIG_NET_NS=n case code, Eric W. Biederman, (Wed Oct 31, 8:51 pm)
Re: [PATCH 0/5] Make nicer CONFIG_NET_NS=n case code, Eric Dumazet, (Thu Nov 1, 2:58 am)
Re: [PATCH 0/5] Make nicer CONFIG_NET_NS=n case code, David Miller, (Thu Nov 1, 3:02 am)
Re: [PATCH 0/5] Make nicer CONFIG_NET_NS=n case code, David Miller, (Wed Oct 31, 7:31 pm)
Re: [PATCH 0/5] Make nicer CONFIG_NET_NS=n case code, Eric W. Biederman, (Wed Oct 31, 8:58 pm)
Re: [PATCH 0/5] Make nicer CONFIG_NET_NS=n case code, Daniel Lezcano, (Wed Oct 31, 5:35 pm)
[PATCH 5/5] Hide the net_ns kmem cache, Pavel Emelyanov, (Wed Oct 31, 3:32 pm)
Re: [PATCH 5/5] Hide the net_ns kmem cache, David Miller, (Thu Nov 1, 3:47 am)
[PATCH 4/5] Mark the setup_net as __net_init, Pavel Emelyanov, (Wed Oct 31, 3:31 pm)
Re: [PATCH 4/5] Mark the setup_net as __net_init, David Miller, (Thu Nov 1, 3:46 am)
[PATCH 3/5] Hide the dead code in the net_namespace.c, Pavel Emelyanov, (Wed Oct 31, 3:28 pm)
[PATCH 2/5] Relax the reference counting of init_net_ns, Pavel Emelyanov, (Wed Oct 31, 3:25 pm)