From: Serge Hallyn <serge.hallyn@ubuntu.com>
Date: Wed, 29 Jan 2014 16:17:09 +0000 (+0000)
Subject: [PATCH cgmanager chown: don't do a gratuitous fork
X-Git-Tag: lxc-1.0.0.beta4~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=beebf12bbf0bf6c5ee6db110ea1ca470ac2d8e16;p=thirdparty%2Flxc.git

[PATCH cgmanager chown: don't do a gratuitous fork

userns_exec_1() clones a new task to manipulate.  We don't
need to fork before calling that.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/src/lxc/cgmanager.c b/src/lxc/cgmanager.c
index 0fb57cf64..76e628d85 100644
--- a/src/lxc/cgmanager.c
+++ b/src/lxc/cgmanager.c
@@ -246,7 +246,6 @@ static int chown_cgroup_wrapper(void *data)
 static bool chown_cgroup(const char *controller, const char *cgroup_path,
 			struct lxc_conf *conf)
 {
-	pid_t pid;
 	struct chown_data data;
 	data.controller = controller;
 	data.cgroup_path = cgroup_path;
@@ -257,20 +256,11 @@ static bool chown_cgroup(const char *controller, const char *cgroup_path,
 		return true;
 	}
 
-	if ((pid = fork()) < 0) {
-		SYSERROR("fork");
+	if (userns_exec_1(conf, chown_cgroup_wrapper, &data) < 0) {
+		ERROR("Error requesting cgroup chown in new namespace");
 		return false;
 	}
-	if (pid > 0) {
-		if (wait_for_pid(pid)) {
-			ERROR("Error chowning cgroup");
-			return false;
-		}
-		return true;
-	}
-	if (userns_exec_1(conf, chown_cgroup_wrapper, &data) < 0)
-		exit(1);
-	exit(0);
+	return true;
 }
 
 struct cgm_data {