Change nscgroup interface

Prepare the nscgroup to be converted to the clone_children changes.

Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

diff --git a/src/lxc/cgroup.c b/src/lxc/cgroup.c
index 96a8ecdccd0db86d7162d64cb7c17e2668129bef..350d439660adf6c5c0306428b7515a74f84fec0c 100644 (file)
--- a/src/lxc/cgroup.c
+++ b/src/lxc/cgroup.c
@@ -85,7 +85,7 @@ out:
         return err;
 }
 
-int lxc_rename_nsgroup(const char *name, struct lxc_handler *handler)
+int lxc_rename_nsgroup(const char *name, pid_t pid)
 {
        char oldname[MAXPATHLEN];
        char newname[MAXPATHLEN];
@@ -97,7 +97,7 @@ int lxc_rename_nsgroup(const char *name, struct lxc_handler *handler)
                return -1;
        }
 
-       snprintf(oldname, MAXPATHLEN, "%s/%d", cgroup, handler->pid);
+       snprintf(oldname, MAXPATHLEN, "%s/%d", cgroup, pid);
        snprintf(newname, MAXPATHLEN, "%s/%s", cgroup, name);
 
        /* there is a previous cgroup, assume it is empty, otherwise

diff --git a/src/lxc/cgroup.h b/src/lxc/cgroup.h
index 640f1d24514a83f8b852510828b36c5008168dd7..905686e4c576c1e011723ab89cfbdece542f8bf5 100644 (file)
--- a/src/lxc/cgroup.h
+++ b/src/lxc/cgroup.h
@@ -26,7 +26,7 @@
 #define MAXPRIOLEN 24
 
 struct lxc_handler;
-int lxc_rename_nsgroup(const char *name, struct lxc_handler *handler);
+int lxc_rename_nsgroup(const char *name, pid_t pid);
 int lxc_unlink_nsgroup(const char *name);
 int lxc_cgroup_path_get(char **path, const char *name);
 int lxc_cgroup_nrtasks(const char *name);

diff --git a/src/lxc/start.c b/src/lxc/start.c
index 451d3559b98edeb85d7e8a43349a93912432eb4b..7e17cc5570d460f136d351c312b004e56958a337 100644 (file)
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -506,7 +506,7 @@ int lxc_spawn(struct lxc_handler *handler)
        if (lxc_sync_wait_child(handler, LXC_SYNC_CONFIGURE))
                failed_before_rename = 1;
 
-       if (lxc_rename_nsgroup(name, handler))
+       if (lxc_rename_nsgroup(name, handler->pid))
                goto out_delete_net;
 
        if (failed_before_rename)