2011-04-15 12:26:36

by Rob Landley

Subject: [PATCH] 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(-)

diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index 3f86026..1abb508 100644
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@ -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 */

2011-04-15 12:38:04

by Jiri Pirko

Subject: Re: [PATCH] minor cleanup to net_namespace.c.

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(-)
>
>diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
>index 3f86026..1abb508 100644
>--- a/net/core/net_namespace.c
>+++ b/net/core/net_namespace.c
>@@ -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 */
>

Reviewed-by: Jiri Pirko <[email protected]>

2011-04-15 22:48:42

by David Miller

Subject: Re: [PATCH] minor cleanup to net_namespace.c.

From: Jiri Pirko <[email protected]>
Date: Fri, 15 Apr 2011 14:37:52 +0200

> 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]>
...
> Reviewed-by: Jiri Pirko <[email protected]>

Applied.