2009-04-10 02:34:48

by Alexey Dobriyan

Subject: [PATCH 05/30] nsproxy: add create_nsproxy()

clone_nsproxy() does useless copying of old nsproxy -- every pointer
will be rewritten to new ns or to old ns.

Remove copying, rename clone_nsproxy(), it will be used by C/R code
to create fresh nsproxy on restart.

Signed-off-by: Alexey Dobriyan <[email protected]>
---

kernel/nsproxy.c | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)

--- a/kernel/nsproxy.c
+++ b/kernel/nsproxy.c
@@ -26,19 +26,14 @@ static struct kmem_cache *nsproxy_cachep;

struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);

-/*
- * creates a copy of "orig" with refcount 1.
- */
-static inline struct nsproxy *clone_nsproxy(struct nsproxy *orig)
+static inline struct nsproxy *create_nsproxy(void)
{
- struct nsproxy *ns;
+ struct nsproxy *nsproxy;

- ns = kmem_cache_alloc(nsproxy_cachep, GFP_KERNEL);
- if (ns) {
- memcpy(ns, orig, sizeof(struct nsproxy));
- atomic_set(&ns->count, 1);
- }
- return ns;
+ nsproxy = kmem_cache_alloc(nsproxy_cachep, GFP_KERNEL);
+ if (nsproxy)
+ atomic_set(&nsproxy->count, 1);
+ return nsproxy;
}

/*
@@ -52,7 +47,7 @@ static struct nsproxy *create_new_namespaces(unsigned long flags,
struct nsproxy *new_nsp;
int err;

- new_nsp = clone_nsproxy(tsk->nsproxy);
+ new_nsp = create_nsproxy();
if (!new_nsp)
return ERR_PTR(-ENOMEM);

2009-04-10 22:33:32

by Serge E. Hallyn

Subject: Re: [PATCH 05/30] nsproxy: add create_nsproxy()

Quoting Alexey Dobriyan ([email protected]):
> clone_nsproxy() does useless copying of old nsproxy -- every pointer
> will be rewritten to new ns or to old ns.
>
> Remove copying, rename clone_nsproxy(), it will be used by C/R code
> to create fresh nsproxy on restart.
>
> Signed-off-by: Alexey Dobriyan <[email protected]>

Acked-by: Serge Hallyn <[email protected]>

> ---
>
> kernel/nsproxy.c | 19 +++++++------------
> 1 file changed, 7 insertions(+), 12 deletions(-)
>
> --- a/kernel/nsproxy.c
> +++ b/kernel/nsproxy.c
> @@ -26,19 +26,14 @@ static struct kmem_cache *nsproxy_cachep;
>
> struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
>
> -/*
> - * creates a copy of "orig" with refcount 1.
> - */
> -static inline struct nsproxy *clone_nsproxy(struct nsproxy *orig)
> +static inline struct nsproxy *create_nsproxy(void)
> {
> - struct nsproxy *ns;
> + struct nsproxy *nsproxy;
>
> - ns = kmem_cache_alloc(nsproxy_cachep, GFP_KERNEL);
> - if (ns) {
> - memcpy(ns, orig, sizeof(struct nsproxy));
> - atomic_set(&ns->count, 1);
> - }
> - return ns;
> + nsproxy = kmem_cache_alloc(nsproxy_cachep, GFP_KERNEL);
> + if (nsproxy)
> + atomic_set(&nsproxy->count, 1);
> + return nsproxy;
> }
>
> /*
> @@ -52,7 +47,7 @@ static struct nsproxy *create_new_namespaces(unsigned long flags,
> struct nsproxy *new_nsp;
> int err;
>
> - new_nsp = clone_nsproxy(tsk->nsproxy);
> + new_nsp = create_nsproxy();
> if (!new_nsp)
> return ERR_PTR(-ENOMEM);