tree-wide: remove "name" argument from lxc_{fini,abort}()

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

diff --git a/src/lxc/criu.c b/src/lxc/criu.c
index 59e50047b97d006f77a32eb73e2ebca807a2ee70..6e563892856fc340c74f33b2cc8f2ad035533614 100644 (file)
--- a/src/lxc/criu.c
+++ b/src/lxc/criu.c
@@ -1134,8 +1134,8 @@ static void do_restore(struct lxc_container *c, int status_pipe, struct migrate_
 
                ret = lxc_poll(c->name, handler);
                if (ret)
-                       lxc_abort(c->name, handler);
-               lxc_fini(c->name, handler);
+                       lxc_abort(handler);
+               lxc_fini(handler);
                _exit(ret);
        }
 
@@ -1145,7 +1145,7 @@ out_fini_handler:
        if (pipes[1] >= 0)
                close(pipes[1]);
 
-       lxc_fini(c->name, handler);
+       lxc_fini(handler);
 
 out:
        if (status_pipe >= 0) {

diff --git a/src/lxc/start.c b/src/lxc/start.c
index 08f336cf04ed5382d7a1dfa58cd6ae13d1c59b6b..73d46ae39e4843b4eafac41493ef3819f052197b 100644 (file)
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -860,13 +860,14 @@ out_restore_sigmask:
        return -1;
 }
 
-void lxc_fini(const char *name, struct lxc_handler *handler)
+void lxc_fini(struct lxc_handler *handler)
 {
        int ret;
        pid_t self;
        struct lxc_list *cur, *next;
        char *namespaces[LXC_NS_MAX + 1];
        size_t namespace_count = 0;
+       const char *name = handler->name;
        struct cgroup_ops *cgroup_ops = handler->cgroup_ops;
 
        /* The STOPPING state is there for future cleanup code which can take
@@ -1010,12 +1011,12 @@ void lxc_fini(const char *name, struct lxc_handler *handler)
        lxc_free_handler(handler);
 }
 
-void lxc_abort(const char *name, struct lxc_handler *handler)
+void lxc_abort(struct lxc_handler *handler)
 {
        int ret = 0;
        int status;
 
-       lxc_set_state(name, handler, ABORTING);
+       lxc_set_state(handler->name, handler, ABORTING);
 
        if (handler->pidfd >= 0) {
                ret = lxc_raw_pidfd_send_signal(handler->pidfd, SIGKILL, NULL, 0);
@@ -1870,7 +1871,7 @@ out_delete_net:
                lxc_delete_network(handler);
 
 out_abort:
-       lxc_abort(name, handler);
+       lxc_abort(handler);
 
 out_sync_fini:
        lxc_sync_fini(handler);
@@ -2006,21 +2007,21 @@ __private_goto2:
        detach_block_device(handler->conf);
 
 __private_goto3:
-       lxc_fini(name, handler);
+       lxc_fini(handler);
 
        return ret;
 
 /* These are the droids you are looking for. */
 out_abort:
-       lxc_abort(name, handler);
+       lxc_abort(handler);
        goto __private_goto3;
 
 out_detach_blockdev:
-       lxc_abort(name, handler);
+       lxc_abort(handler);
        goto __private_goto2;
 
 out_delete_network:
-       lxc_abort(name, handler);
+       lxc_abort(handler);
        goto __private_goto1;
 }
 

diff --git a/src/lxc/start.h b/src/lxc/start.h
index 370ed9f0ace95bbec6a8c442828f99bdcfbcdb86..2c3edd8c08e7a7618cf33917a1fdc275f11bc80f 100644 (file)
--- a/src/lxc/start.h
+++ b/src/lxc/start.h
@@ -142,7 +142,7 @@ extern int lxc_set_state(const char *name, struct lxc_handler *handler,
 extern int lxc_serve_state_clients(const char *name,
                                   struct lxc_handler *handler,
                                   lxc_state_t state);
-extern void lxc_abort(const char *name, struct lxc_handler *handler);
+extern void lxc_abort(struct lxc_handler *handler);
 extern struct lxc_handler *lxc_init_handler(const char *name,
                                            struct lxc_conf *conf,
                                            const char *lxcpath,
@@ -150,7 +150,7 @@ extern struct lxc_handler *lxc_init_handler(const char *name,
 extern void lxc_zero_handler(struct lxc_handler *handler);
 extern void lxc_free_handler(struct lxc_handler *handler);
 extern int lxc_init(const char *name, struct lxc_handler *handler);
-extern void lxc_fini(const char *name, struct lxc_handler *handler);
+extern void lxc_fini(struct lxc_handler *handler);
 
 /* lxc_check_inherited: Check for any open file descriptors and close them if
  *                      requested.