adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-26 18:56:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

nsproxy: extract create_nsproxy()

Browse source 
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(), create_nsproxy() will be used by C/R code to create fresh
nsproxy on restart.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: Serge Hallyn <serue@us.ibm.com>
Cc: Pavel Emelyanov <xemul@openvz.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Alexey Dobriyan 2009-06-17 16:27:56 -07:00 committed by Linus Torvalds
parent 612ce478fa
commit 90af90d7d3
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
kernel/nsproxy.c
View file

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