From 0c5859ff6863f44c85bc614c33c798eb0e258155 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Sun, 15 Mar 2020 15:50:34 +0100 Subject: [PATCH] tree-wide: remove "name" argument from lxc_{fini,abort}() Signed-off-by: Christian Brauner --- src/lxc/criu.c | 6 +++--- src/lxc/start.c | 17 +++++++++-------- src/lxc/start.h | 4 ++-- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/lxc/criu.c b/src/lxc/criu.c index 59e50047b..6e5638928 100644 --- 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 08f336cf0..73d46ae39 100644 --- 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 370ed9f0a..2c3edd8c0 100644 --- 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. -- 2.47.2