Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90af90d7 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds
Browse files

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

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Acked-by: default avatarSerge Hallyn <serue@us.ibm.com>
Cc: Pavel Emelyanov <xemul@openvz.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 612ce478

kernel/nsproxy.c

+7 −12
Original line number Original line Diff line number Diff line
@@ -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);