Merge pull request #611 from mihalicyn/cgroup2_devices_cleanup

cgroups: cleanup and remove unused cgroup2_devices code
lxc · Sep 29, 2023 · 2ae1113 · 2ae1113
2 parents a6069df + 823d5e3
commit 2ae1113
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 599 deletions.
diff --git a/meson.build b/meson.build
@@ -202,8 +202,6 @@ liblxcfs_sources = files(
     'src/cgroups/cgfsng.c',
     'src/cgroups/cgroup.c',
     'src/cgroups/cgroup.h',
-    'src/cgroups/cgroup2_devices.c',
-    'src/cgroups/cgroup2_devices.h',
     'src/cgroups/cgroup_utils.c',
     'src/cgroups/cgroup_utils.h',
     'src/cgroup_fuse.c',

diff --git a/src/cgroups/cgfsng.c b/src/cgroups/cgfsng.c
@@ -34,7 +34,6 @@
 #include "../memory_utils.h"
 #include "../utils.h"
 #include "cgroup.h"
-#include "cgroup2_devices.h"
 #include "cgroup_utils.h"
 
 /* Given a pointer to a null-terminated array of pointers, realloc to add one
@@ -963,9 +962,6 @@ static int cg_unified_init(struct cgroup_ops *ops)
 
 	new = add_hierarchy(&ops->hierarchies, delegatable, mountpoint, base_cgroup, CGROUP2_SUPER_MAGIC);
 
-	if (bpf_devices_cgroup_supported())
-		new->bpf_device_controller = 1;
-
 	ops->cgroup_layout = CGROUP_LAYOUT_UNIFIED;
 	ops->unified = new;
 

diff --git a/src/cgroups/cgroup.c b/src/cgroups/cgroup.c
@@ -26,7 +26,6 @@
 #include "../memory_utils.h"
 #include "cgroup.h"
 #include "cgroup_utils.h"
-#include "cgroup2_devices.h"
 
 extern struct cgroup_ops *cgfsng_ops_init(void);