minor cleanup to net_namespace.c.
Subsystems (2)
PATCH 1/1 minor cleanup to net_namespace.c.
From: Rob Landley <[email protected]>
Inline a small static function that's only ever called from one place.
Signed-off-by Rob Landley <[email protected]>
---
net/core/net_namespace.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
net/core/net_namespace.c +4 -8
@@ -216,11 +216,14 @@ static void net_free(struct net *net)kmem_cache_free (net_cachep, net); } -static struct net *net_create (void ) +struct net *copy_net_ns (unsigned long flags,struct net *old_net) {struct net *net;int rv; +if (!(flags &CLONE_NEWNET )) +return get_net (old_net); + net =net_alloc ();if (!net)return ERR_PTR (-ENOMEM );
@@ -239,13 +242,6 @@ static struct net *net_create(void)return net; } -struct net *copy_net_ns (unsigned long flags,struct net *old_net) -{ -if (!(flags &CLONE_NEWNET )) -return get_net (old_net); -return net_create (); -} -static DEFINE_SPINLOCK (cleanup_list_lock);static LIST_HEAD (cleanup_list);/* Must hold cleanup_list_lock to touch */
Quoted 42 lines · Fri, Apr 15, 2011 at 02:26:25PM CEST, [email protected] wrote:
From: Rob Landley <[email protected]>
Inline a small static function that's only ever called from one place.
Signed-off-by Rob Landley <[email protected]>---
net/core/net_namespace.c| 12 ++++--------1 file changed, 4 insertions(+), 8 deletions(-)net/core/net_namespace.c +4
-8@@ -216,11 +216,14 @@ static void net_free(struct net *net)kmem_cache_free (net_cachep, net); } -static struct net *net_create (void ) +struct net *copy_net_ns (unsigned long flags,struct net *old_net) {struct net *net;int rv; +if (!(flags &CLONE_NEWNET )) +return get_net (old_net); + net =net_alloc ();if (!net)return ERR_PTR (-ENOMEM );@@ -239,13 +242,6 @@ static struct net *net_create(void)return net; } -struct net *copy_net_ns (unsigned long flags,struct net *old_net) -{ -if (!(flags &CLONE_NEWNET )) -return get_net (old_net); -return net_create (); -} -static DEFINE_SPINLOCK (cleanup_list_lock);
Quoted 2 lines
static
LIST_HEAD(cleanup_list); /* Must holdcleanup_list_lockto touch */
Reviewed-by Jiri Pirko <[email protected]>
From: Jiri Pirko <[email protected]>
Date: Fri, 15 Apr 2011 14:37:52 +0200
Quoted 6 lines
Quoted 5 lines · Fri, Apr 15, 2011 at 02:26:25PM CEST, [email protected] wrote:
From: Rob Landley <[email protected]>
Inline a small static function that's only ever called from one place.
Signed-off-by Rob Landley <[email protected]>
...
Quoted 1 line
Reviewed-by Jiri Pirko <[email protected]>
Applied.