cgroups: s/cgroup_layout/layout/g

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

diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
index 335e5b074f48f0b0261c14fc58f82ebaee3f594a..816c9fe9d8a037d83924c073bb4f59d9b2e95b18 100644 (file)
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -3406,7 +3406,7 @@ static int __cgroup_attach_many(const struct lxc_conf *conf, const char *name,
        if (idx == 0)
                return syserrno_set(-ENOENT, "Failed to attach to cgroups");
 
-       TRACE("Attached to %s cgroup layout", cgroup_layout_name(ctx->cgroup_layout));
+       TRACE("Attached to %s cgroup layout", cgroup_layout_name(ctx->layout));
        return 0;
 }
 

diff --git a/src/lxc/cgroups/cgroup.h b/src/lxc/cgroups/cgroup.h
index fb28648ccbff6b03f79b63810df1b43ab4f40c6a..ca320d96963e38e729e38a2682f5549978b99706 100644 (file)
--- a/src/lxc/cgroups/cgroup.h
+++ b/src/lxc/cgroups/cgroup.h
@@ -64,7 +64,7 @@ typedef enum {
 // BUILD_BUG_ON(CGROUP_CTX_MAX_FD > KERNEL_SCM_MAX_FD);
 
 struct cgroup_ctx {
-       __s32 cgroup_layout;
+       __s32 layout;
        __u32 utilities;
        __u32 fd_len;
        __s32 fd[CGROUP_CTX_MAX_FD];
@@ -311,7 +311,7 @@ static inline int prepare_cgroup_ctx(struct cgroup_ops *ops,
                return ret_errno(ENOENT);
 
        ctx->fd_len = idx;
-       ctx->cgroup_layout = ops->cgroup_layout;
+       ctx->layout = ops->cgroup_layout;
        if (ops->unified && ops->unified->dfd_con > 0)
                ctx->utilities = ops->unified->utilities;