start: delegate than move into the target cgroup

This is a way more sensible model. Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

start: delegate than move into the target cgroup
838d1556 · Christian Brauner · 95ab26af · 838d1556
Unverified Commit 838d1556 authored Feb 17, 2021 by Christian Brauner
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 8 deletions

start.c src/lxc/start.c +8 -8

No files found.
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -1806,13 +1806,13 @@ static int lxc_spawn(struct lxc_handler *handler)
 		goto out_delete_net;
 	}
-	if (!cgroup_ops->payload_enter(cgroup_ops, handler)) {
+	if (!cgroup_ops->payload_delegate_controllers(cgroup_ops)) {
-		ERROR("Failed to enter cgroups");
+		ERROR("Failed to delegate controllers to payload cgroup");
 		goto out_delete_net;
 	}
-	if (!cgroup_ops->payload_delegate_controllers(cgroup_ops)) {
+	if (!cgroup_ops->payload_enter(cgroup_ops, handler)) {
-		ERROR("Failed to delegate controllers to payload cgroup");
+		ERROR("Failed to enter cgroups");
 		goto out_delete_net;
 	}
@@ -2027,14 +2027,14 @@ int __lxc_start(struct lxc_handler *handler, struct lxc_operations *ops,
 		goto out_abort;
 	}
-	if (!cgroup_ops->monitor_enter(cgroup_ops, handler)) {
+	if (!cgroup_ops->monitor_delegate_controllers(cgroup_ops)) {
-		ERROR("Failed to enter monitor cgroup");
+		ERROR("Failed to delegate controllers to monitor cgroup");
 		ret = -1;
 		goto out_abort;
 	}
-	if (!cgroup_ops->monitor_delegate_controllers(cgroup_ops)) {
+	if (!cgroup_ops->monitor_enter(cgroup_ops, handler)) {
-		ERROR("Failed to delegate controllers to monitor cgroup");
+		ERROR("Failed to enter monitor cgroup");
 		ret = -1;
 		goto out_abort;
 	}