proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-14 17:12:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cgfsng: don't pre-calculate path

Browse Source 
First, we're doing this so long a there is any cgroup config item -
even if no devices ones.  Then if devices is not available we fail.
This was leading to Rob E's mysterious startup failures.

Secondly, we're not even using this info.  The user was removed
awhile back.

Signed-off-by: Serge Hallyn <serge@hallyn.com>
This commit is contained in:
Serge Hallyn 2016-07-01 21:18:38 -05:00
parent df5512e5df
commit 0b6ca6e39b
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lxc/cgfsng.c
View File

@ -1627,8 +1627,6 @@ static bool cgfsng_setup_limits(void *hdata, struct lxc_list *cgroup_settings,
struct cgfsng_handler_data *d = hdata; struct cgfsng_handler_data *d = hdata;
struct lxc_list *iterator, *sorted_cgroup_settings, *next; struct lxc_list *iterator, *sorted_cgroup_settings, *next;
struct lxc_cgroup *cg; struct lxc_cgroup *cg;
struct hierarchy *h;
char *listpath = NULL;
bool ret = false; bool ret = false;
if (lxc_list_empty(cgroup_settings)) if (lxc_list_empty(cgroup_settings))
@ -1639,15 +1637,6 @@ static bool cgfsng_setup_limits(void *hdata, struct lxc_list *cgroup_settings,
return false; return false;
} }
if (do_devices) {
h = get_hierarchy("devices");
if (!h) {
ERROR("No devices cgroup setup for %s", d->name);
return false;
}
listpath = must_make_path(h->fullcgpath, "devices.list", NULL);
}
lxc_list_for_each(iterator, sorted_cgroup_settings) { lxc_list_for_each(iterator, sorted_cgroup_settings) {
cg = iterator->elem; cg = iterator->elem;
@ -1670,7 +1659,6 @@ static bool cgfsng_setup_limits(void *hdata, struct lxc_list *cgroup_settings,
ret = true; ret = true;
INFO("cgroup has been setup"); INFO("cgroup has been setup");
out: out:
free(listpath);
lxc_list_for_each_safe(iterator, sorted_cgroup_settings, next) { lxc_list_for_each_safe(iterator, sorted_cgroup_settings, next) {
lxc_list_del(iterator); lxc_list_del(iterator);
free(iterator); free(iterator);