Skip to content

L
lxc
Commit b1dad6f6 by Robert Vogelgesang Committed by Serge Hallyn
Options

Two further cgroup cleanups:

Move the test of mp->need_cpuset_init to a logically better place. Avoid misleading error messages. Signed-off-by: 's avatarRobert Vogelgesang <vogel@users.sourceforge.net> Signed-off-by: 's avatarSerge Hallyn <serge.hallyn@ubuntu.com>
parent 6ff9f8ec
Showing with 5 additions and 5 deletions
src/lxc/cgroup.c
...@@ -2107,9 +2107,6 @@ static bool do_init_cpuset_file(struct cgroup_mount_point *mp, ...@@ -2107,9 +2107,6 @@ static bool do_init_cpuset_file(struct cgroup_mount_point *mp,
int ret; int ret;
bool ok = false; bool ok = false;
if (!mp->need_cpuset_init)
return true;
childfile = cgroup_to_absolute_path(mp, path, name); childfile = cgroup_to_absolute_path(mp, path, name);
if (!childfile) if (!childfile)
return false; return false;
...@@ -2150,10 +2147,10 @@ static bool do_init_cpuset_file(struct cgroup_mount_point *mp, ...@@ -2150,10 +2147,10 @@ static bool do_init_cpuset_file(struct cgroup_mount_point *mp,
goto out; goto out;
} }
ok = (lxc_write_to_file(childfile, value, strlen(value), false) >= 0); ok = (lxc_write_to_file(childfile, value, strlen(value), false) >= 0);
out:
if (!ok) if (!ok)
SYSERROR("failed writing %s", childfile); SYSERROR("failed writing %s", childfile);
out:
if (parentfile) if (parentfile)
free(parentfile); free(parentfile);
free(childfile); free(childfile);
...@@ -2168,6 +2165,9 @@ static bool init_cpuset_if_needed(struct cgroup_mount_point *mp, ...@@ -2168,6 +2165,9 @@ static bool init_cpuset_if_needed(struct cgroup_mount_point *mp,
(const char **)mp->hierarchy->subsystems)) (const char **)mp->hierarchy->subsystems))
return true; return true;
if (!mp->need_cpuset_init)
return true;
return (do_init_cpuset_file(mp, path, "/cpuset.cpus") && return (do_init_cpuset_file(mp, path, "/cpuset.cpus") &&
do_init_cpuset_file(mp, path, "/cpuset.mems") ); do_init_cpuset_file(mp, path, "/cpuset.mems") );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment