Two further cgroup cleanups:

Move the test of mp->need_cpuset_init to a logically better place. Avoid misleading error messages. Signed-off-by: Robert Vogelgesang <vogel@users.sourceforge.net> Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

Two further cgroup cleanups:
b1dad6f6 · Robert Vogelgesang · Serge Hallyn · 6ff9f8ec · b1dad6f6
Commit b1dad6f6 authored Jan 29, 2014 by Robert Vogelgesang Committed by Serge Hallyn Jan 29, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

cgroup.c src/lxc/cgroup.c +5 -5

No files found.
--- a/src/lxc/cgroup.c
+++ b/src/lxc/cgroup.c
@@ -2107,9 +2107,6 @@ static bool do_init_cpuset_file(struct cgroup_mount_point *mp,
 	int ret;
 	bool ok = false;

-	if (!mp->need_cpuset_init)
-		return true;
-
 	childfile = cgroup_to_absolute_path(mp, path, name);
 	if (!childfile)
 		return false;
@@ -2150,10 +2147,10 @@ static bool do_init_cpuset_file(struct cgroup_mount_point *mp,
 		goto out;
 	}
 	ok = (lxc_write_to_file(childfile, value, strlen(value), false) >= 0);
-
-out:
 	if (!ok)
 		SYSERROR("failed writing %s", childfile);
+
+out:
 	if (parentfile)
 		free(parentfile);
 	free(childfile);
@@ -2168,6 +2165,9 @@ static bool init_cpuset_if_needed(struct cgroup_mount_point *mp,
 				 (const char **)mp->hierarchy->subsystems))
 		return true;

+	if (!mp->need_cpuset_init)
+		return true;
+
 	return (do_init_cpuset_file(mp, path, "/cpuset.cpus") &&
 		do_init_cpuset_file(mp, path, "/cpuset.mems") );
 }