cgroups: s/basecginfo/cgroup_info/g

parent 522bbc79
...@@ -3311,7 +3311,7 @@ static void cg_unified_delegate(char ***delegate) ...@@ -3311,7 +3311,7 @@ static void cg_unified_delegate(char ***delegate)
*/ */
static int cg_hybrid_init(struct cgroup_ops *ops, bool relative, bool unprivileged) static int cg_hybrid_init(struct cgroup_ops *ops, bool relative, bool unprivileged)
{ {
__do_free char *basecginfo = NULL, *line = NULL; __do_free char *cgroup_info = NULL, *line = NULL;
__do_free_string_list char **klist = NULL, **nlist = NULL; __do_free_string_list char **klist = NULL, **nlist = NULL;
__do_fclose FILE *f = NULL; __do_fclose FILE *f = NULL;
int ret; int ret;
...@@ -3321,10 +3321,10 @@ static int cg_hybrid_init(struct cgroup_ops *ops, bool relative, bool unprivileg ...@@ -3321,10 +3321,10 @@ static int cg_hybrid_init(struct cgroup_ops *ops, bool relative, bool unprivileg
* cgroups as our base in that case. * cgroups as our base in that case.
*/ */
if (!relative && (geteuid() == 0)) if (!relative && (geteuid() == 0))
basecginfo = read_file_at(-EBADF, "/proc/1/cgroup", PROTECT_OPEN, 0); cgroup_info = read_file_at(-EBADF, "/proc/1/cgroup", PROTECT_OPEN, 0);
else else
basecginfo = read_file_at(-EBADF, "/proc/self/cgroup", PROTECT_OPEN, 0); cgroup_info = read_file_at(-EBADF, "/proc/self/cgroup", PROTECT_OPEN, 0);
if (!basecginfo) if (!cgroup_info)
return ret_errno(ENOMEM); return ret_errno(ENOMEM);
ret = get_existing_subsystems(&klist, &nlist); ret = get_existing_subsystems(&klist, &nlist);
...@@ -3335,7 +3335,7 @@ static int cg_hybrid_init(struct cgroup_ops *ops, bool relative, bool unprivileg ...@@ -3335,7 +3335,7 @@ static int cg_hybrid_init(struct cgroup_ops *ops, bool relative, bool unprivileg
if (!f) if (!f)
return log_error_errno(-1, errno, "Failed to open \"/proc/self/mountinfo\""); return log_error_errno(-1, errno, "Failed to open \"/proc/self/mountinfo\"");
lxc_cgfsng_print_basecg_debuginfo(basecginfo, klist, nlist); lxc_cgfsng_print_basecg_debuginfo(cgroup_info, klist, nlist);
while (getline(&line, &len, f) != -1) { while (getline(&line, &len, f) != -1) {
__do_free char *base_cgroup = NULL, *mountpoint = NULL; __do_free char *base_cgroup = NULL, *mountpoint = NULL;
...@@ -3380,9 +3380,9 @@ static int cg_hybrid_init(struct cgroup_ops *ops, bool relative, bool unprivileg ...@@ -3380,9 +3380,9 @@ static int cg_hybrid_init(struct cgroup_ops *ops, bool relative, bool unprivileg
} }
if (type == CGROUP_SUPER_MAGIC) if (type == CGROUP_SUPER_MAGIC)
base_cgroup = cg_hybrid_get_current_cgroup(relative, basecginfo, controller_list[0], CGROUP_SUPER_MAGIC); base_cgroup = cg_hybrid_get_current_cgroup(relative, cgroup_info, controller_list[0], CGROUP_SUPER_MAGIC);
else else
base_cgroup = cg_hybrid_get_current_cgroup(relative, basecginfo, NULL, CGROUP2_SUPER_MAGIC); base_cgroup = cg_hybrid_get_current_cgroup(relative, cgroup_info, NULL, CGROUP2_SUPER_MAGIC);
if (!base_cgroup) { if (!base_cgroup) {
WARN("Failed to find current cgroup"); WARN("Failed to find current cgroup");
continue; continue;
......
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