Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-01-23 02:14:37 +00:00
Code Issues Projects Releases Wiki Activity

cgroup: don't play with a function exit code

Browse source 
We should not have a chance to exit with a wrong code on error
paths.

Signed-off-by: Andrey Vagin <avagin@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Andrey Vagin 2015-04-21 20:19:52 +03:00 • committed by Pavel Emelyanov
parent a67e9f7bb9
commit 208fe10565
1 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
cgroup.c
View file

@ -436,7 +436,7 @@ static int add_cgroup_properties(const char *fpath, struct cgroup_dir *ncd,
static int add_cgroup(const char *fpath, const struct stat *sb, int typeflag)
{
struct cgroup_dir *ncd = NULL, *match;
int ret = 0;
int exit_code = -1;
if (typeflag == FTW_D) {
int mtype;
@ -461,6 +461,7 @@ static int add_cgroup(const char *fpath, const struct stat *sb, int typeflag)
switch (mtype) {
/* ignore co-mounted cgroups */
case EXACT_MATCH:
exit_code = 0;
goto out;
case PARENT_MATCH:
list_add_tail(&ncd->siblings, &match->children);
@ -479,20 +480,17 @@ static int add_cgroup(const char *fpath, const struct stat *sb, int typeflag)
INIT_LIST_HEAD(&ncd->properties);
ncd->n_properties = 0;
if (add_cgroup_properties(fpath, ncd, current_controller) < 0) {
ret = -1;
if (add_cgroup_properties(fpath, ncd, current_controller) < 0)
goto out;
}
}
return 0;
} else
return 0;
return 0;
out:
if (ncd)
xfree(ncd->path);
xfree(ncd);
return ret;
return exit_code;
}
static int collect_cgroups(struct list_head *ctls)
@ -522,8 +520,7 @@ static int collect_cgroups(struct list_head *ctls)
/* only allow "fake" controllers to be created this way */
if (!strstartswith(cc->name, "name=")) {
pr_err("controller %s not found\n", cc->name);
ret = -1;
goto out;
return -1;
} else {
struct cg_controller *nc = new_controller(cc->name, -1);
list_add_tail(&nc->l, &cg->l);
@ -562,12 +559,9 @@ static int collect_cgroups(struct list_head *ctls)
snprintf(path + path_pref_len, PATH_MAX - path_pref_len, "%s", cc->path);
ret = ftw(path, add_cgroup, 4);
if (ret < 0) {
if (ret < 0)
pr_perror("failed walking %s for empty cgroups", path);
goto out;
}
out:
close_safe(&fd);
if (ret < 0)