cgroups: move cgroup2 parameters into substruct

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/lxc/cgroups/cgroup.h b/src/lxc/cgroups/cgroup.h
index 8b34dff5b29191d74cb4503a5a1eaf2050d6d514..b7d75ea3bae0962ab4158932b97418f6a94d73d3 100644 (file)
--- a/src/lxc/cgroups/cgroup.h
+++ b/src/lxc/cgroups/cgroup.h
@@ -77,18 +77,8 @@ typedef enum {
  *   CGROUP2_SUPER_MAGIC.
  */
 struct hierarchy {
-       /*
-        * cgroup2 only: what files need to be chowned to delegate a cgroup to
-        * an unprivileged user.
-        */
-       char **cgroup2_chown;
-       char **controllers;
        cgroupfs_type_magic_t fs_type;
 
-       /* cgroup2 only */
-       unsigned int bpf_device_controller:1;
-       unsigned int freezer_controller:1;
-
        /* File descriptor for the container's cgroup @path_con. */
        int dfd_con;
        char *path_con;
@@ -111,6 +101,19 @@ struct hierarchy {
        /* File descriptor for the controller's base cgroup path @at_base. */
        int dfd_base;
        char *at_base;
+
+       struct /* unified hierarchy specific */ {
+               /*
+                * 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 freezer_controller : 1;
+       };
+
+       char **controllers;
 };
 
 struct cgroup_ops {