cgroups: s/cgroup2_chown/delegate/g

parent 4cd3a764
...@@ -1326,7 +1326,7 @@ static int chown_cgroup_wrapper(void *data) ...@@ -1326,7 +1326,7 @@ static int chown_cgroup_wrapper(void *data)
if (arg->hierarchies[i]->fs_type != UNIFIED_HIERARCHY) if (arg->hierarchies[i]->fs_type != UNIFIED_HIERARCHY)
continue; continue;
for (char **p = arg->hierarchies[i]->cgroup2_chown; p && *p; p++) for (char **p = arg->hierarchies[i]->delegate; p && *p; p++)
(void)fchowmodat(dirfd, *p, destuid, nsgid, 0664); (void)fchowmodat(dirfd, *p, destuid, nsgid, 0664);
} }
...@@ -3213,7 +3213,7 @@ static int __initialize_cgroups(struct cgroup_ops *ops, bool relative, ...@@ -3213,7 +3213,7 @@ static int __initialize_cgroups(struct cgroup_ops *ops, bool relative,
move_ptr(controllers); move_ptr(controllers);
move_ptr(controller_list); move_ptr(controller_list);
if (type == UNIFIED_HIERARCHY) if (type == UNIFIED_HIERARCHY)
ops->unified->cgroup2_chown = move_ptr(delegate); ops->unified->delegate = move_ptr(delegate);
} }
/* determine cgroup layout */ /* determine cgroup layout */
......
...@@ -81,9 +81,9 @@ void cgroup_exit(struct cgroup_ops *ops) ...@@ -81,9 +81,9 @@ void cgroup_exit(struct cgroup_ops *ops)
free(*p); free(*p);
free((*it)->controllers); free((*it)->controllers);
for (char **p = (*it)->cgroup2_chown; p && *p; p++) for (char **p = (*it)->delegate; p && *p; p++)
free(*p); free(*p);
free((*it)->cgroup2_chown); free((*it)->delegate);
free((*it)->at_mnt); free((*it)->at_mnt);
free((*it)->at_base); free((*it)->at_base);
......
...@@ -103,12 +103,7 @@ struct hierarchy { ...@@ -103,12 +103,7 @@ struct hierarchy {
char *at_base; char *at_base;
struct /* unified hierarchy specific */ { struct /* unified hierarchy specific */ {
/* char **delegate;
* cgroup2 only: what files need to be chowned to delegate a
* cgroup to an unprivileged user.
*/
char **cgroup2_chown;
/* cgroup2 only */
unsigned int bpf_device_controller : 1; unsigned int bpf_device_controller : 1;
unsigned int freezer_controller : 1; unsigned int freezer_controller : 1;
}; };
......
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