api_start: don't get a container reference for the daemonized case

In the daemonized case we will fork, so the anonymous container memlock will not be shared between parent and child. Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

api_start: don't get a container reference for the daemonized case
844f7a38 · Serge Hallyn · 2eee1b96 · 844f7a38
Commit 844f7a38 authored Jan 19, 2014 by Serge Hallyn
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 9 deletions

lxccontainer.c src/lxc/lxccontainer.c +3 -9

No files found.
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -589,15 +589,11 @@ static bool lxcapi_start(struct lxc_container *c, int useinit, char * const argv
 	* while container is running...
 	*/
 	if (daemonize) {
-		if (!lxc_container_get(c))
-			return false;
 		lxc_monitord_spawn(c->config_path);

 		pid_t pid = fork();
-		if (pid < 0) {
-			lxc_container_put(c);
+		if (pid < 0)
 			return false;
-		}
 		if (pid != 0)
 			return wait_on_daemonized_start(c, pid);

@@ -638,12 +634,10 @@ reboot:
 		goto reboot;
 	}

-	if (daemonize) {
-		lxc_container_put(c);
+	if (daemonize)
 		exit (ret == 0 ? true : false);
-	} else {
+	else
 		return (ret == 0 ? true : false);
-	}
 }

 /*