cgroup: rename container specific cgroup functions

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

diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
index bd72b38b2a5e7e52d65d594719d98b6958b7c803..a0d4cedb509b7ee257f9eccf238a1b4b3723d076 100644 (file)
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -2591,8 +2591,8 @@ struct cgroup_ops *cgfsng_ops_init(struct lxc_conf *conf)
 
        cgfsng_ops->data_init = cgfsng_data_init;
        cgfsng_ops->destroy = cgfsng_destroy;
-       cgfsng_ops->create = cgfsng_create;
-       cgfsng_ops->enter = cgfsng_enter;
+       cgfsng_ops->payload_create = cgfsng_payload_create;
+       cgfsng_ops->payload_enter = cgfsng_payload_enter;
        cgfsng_ops->escape = cgfsng_escape;
        cgfsng_ops->num_hierarchies = cgfsng_num_hierarchies;
        cgfsng_ops->get_hierarchies = cgfsng_get_hierarchies;

diff --git a/src/lxc/cgroups/cgroup.h b/src/lxc/cgroups/cgroup.h
index 0c8b2ea887faf7abe67828168bd7e80c3408cdba..3514021277eafd85a894d83e5852ec43336796e3 100644 (file)
--- a/src/lxc/cgroups/cgroup.h
+++ b/src/lxc/cgroups/cgroup.h
@@ -124,8 +124,8 @@ struct cgroup_ops {
 
        bool (*data_init)(struct cgroup_ops *ops);
        void (*destroy)(struct cgroup_ops *ops, struct lxc_handler *handler);
-       bool (*create)(struct cgroup_ops *ops, struct lxc_handler *handler);
-       bool (*enter)(struct cgroup_ops *ops, pid_t pid);
+       bool (*payload_create)(struct cgroup_ops *ops, struct lxc_handler *handler);
+       bool (*payload_enter)(struct cgroup_ops *ops, pid_t pid);
        const char *(*get_cgroup)(struct cgroup_ops *ops, const char *controller);
        bool (*escape)(const struct cgroup_ops *ops, struct lxc_conf *conf);
        int (*num_hierarchies)(struct cgroup_ops *ops);

diff --git a/src/lxc/criu.c b/src/lxc/criu.c
index db9101b0fc96193cef177495d1c2faa2fa8b995b..ffcb1bb0f955243ef27ec73f15387f1db2cb4737 100644 (file)
--- a/src/lxc/criu.c
+++ b/src/lxc/criu.c
@@ -972,7 +972,7 @@ static void do_restore(struct lxc_container *c, int status_pipe, struct migrate_
                goto out_fini_handler;
        handler->cgroup_ops = cgroup_ops;
 
-       if (!cgroup_ops->create(cgroup_ops, handler)) {
+       if (!cgroup_ops->payload_create(cgroup_ops, handler)) {
                ERROR("failed creating groups");
                goto out_fini_handler;
        }

diff --git a/src/lxc/start.c b/src/lxc/start.c
index 6d289dadd6e9751d68b51fc2785c757459460edc..02310635c8c2fc14b9ef664c25f1367b9edd4c97 100644 (file)
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -1678,7 +1678,7 @@ static int lxc_spawn(struct lxc_handler *handler)
                }
        }
 
-       if (!cgroup_ops->create(cgroup_ops, handler)) {
+       if (!cgroup_ops->payload_create(cgroup_ops, handler)) {
                ERROR("Failed creating cgroups");
                goto out_delete_net;
        }
@@ -1772,7 +1772,7 @@ static int lxc_spawn(struct lxc_handler *handler)
                goto out_delete_net;
        }
 
-       if (!cgroup_ops->enter(cgroup_ops, handler->pid))
+       if (!cgroup_ops->payload_enter(cgroup_ops, handler->pid))
                goto out_delete_net;
 
        if (!cgroup_ops->chown(cgroup_ops, handler->conf))