cgfsng: don't pre-calculate path

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>

cgfsng: don't pre-calculate path
5dc180dd · Serge Hallyn · Stéphane Graber · ea986a87 · 5dc180dd
Commit 5dc180dd authored Jul 01, 2016 by Serge Hallyn Committed by Stéphane Graber Aug 11, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 12 deletions

cgfsng.c src/lxc/cgfsng.c +0 -12

No files found.
--- a/src/lxc/cgfsng.c
+++ b/src/lxc/cgfsng.c
@@ -1627,8 +1627,6 @@ static bool cgfsng_setup_limits(void *hdata, struct lxc_list *cgroup_settings,
 	struct cgfsng_handler_data *d = hdata;
 	struct lxc_list *iterator, *sorted_cgroup_settings, *next;
 	struct lxc_cgroup *cg;
-	struct hierarchy *h;
-	char *listpath = NULL;
 	bool ret = false;
 	if (lxc_list_empty(cgroup_settings))
@@ -1639,15 +1637,6 @@ static bool cgfsng_setup_limits(void *hdata, struct lxc_list *cgroup_settings,
 		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) {
 		cg = iterator->elem;
@@ -1670,7 +1659,6 @@ static bool cgfsng_setup_limits(void *hdata, struct lxc_list *cgroup_settings,
 	ret = true;
 	INFO("cgroup has been setup");
 out:
-	free(listpath);
 	lxc_list_for_each_safe(iterator, sorted_cgroup_settings, next) {
 		lxc_list_del(iterator);
 		free(iterator);