From: Christian Brauner Date: Wed, 4 Dec 2019 12:44:22 +0000 (+0100) Subject: Revert "cgroups/freezer: fix and improve cgroup2 freezer implementation" X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=663287e92bee76ffa2e1e7654910b55fbc13e987;p=thirdparty%2Flxc.git Revert "cgroups/freezer: fix and improve cgroup2 freezer implementation" This reverts commit ecaf0c7bfc1baee74ff38dbdbc65bf4bec2361d4. I somehow accidently did a double-backport. Signed-off-by: Christian Brauner --- diff --git a/src/lxc/commands.c b/src/lxc/commands.c index 13a6da888..62b38c283 100644 --- a/src/lxc/commands.c +++ b/src/lxc/commands.c @@ -1259,71 +1259,6 @@ static int lxc_cmd_unfreeze_callback(int fd, struct lxc_cmd_req *req, return lxc_cmd_rsp_send(fd, &rsp); } -int lxc_cmd_freeze(const char *name, const char *lxcpath, int timeout) -{ - int ret, stopped; - struct lxc_cmd_rr cmd = { - .req = { - .cmd = LXC_CMD_FREEZE, - .data = INT_TO_PTR(timeout), - }, - }; - - ret = lxc_cmd(name, &cmd, &stopped, lxcpath, NULL); - if (ret <= 0 || cmd.rsp.ret < 0) - return error_log_errno(errno, "Failed to freeze container"); - - return cmd.rsp.ret; -} - -static int lxc_cmd_freeze_callback(int fd, struct lxc_cmd_req *req, - struct lxc_handler *handler, - struct lxc_epoll_descr *descr) -{ - int timeout = PTR_TO_INT(req->data); - struct lxc_cmd_rsp rsp = { - .ret = -ENOENT, - }; - struct cgroup_ops *ops = handler->cgroup_ops; - - if (ops->cgroup_layout == CGROUP_LAYOUT_UNIFIED) - rsp.ret = ops->freeze(ops, timeout); - - return lxc_cmd_rsp_send(fd, &rsp); -} - -int lxc_cmd_unfreeze(const char *name, const char *lxcpath, int timeout) -{ - int ret, stopped; - struct lxc_cmd_rr cmd = { - .req = { - .cmd = LXC_CMD_UNFREEZE, - .data = INT_TO_PTR(timeout), - }, - }; - - ret = lxc_cmd(name, &cmd, &stopped, lxcpath, NULL); - if (ret <= 0 || cmd.rsp.ret < 0) - return error_log_errno(errno, "Failed to unfreeze container"); - - return cmd.rsp.ret; -} - -static int lxc_cmd_unfreeze_callback(int fd, struct lxc_cmd_req *req, - struct lxc_handler *handler, - struct lxc_epoll_descr *descr) -{ - int timeout = PTR_TO_INT(req->data); - struct lxc_cmd_rsp rsp = { - .ret = -ENOENT, - }; - struct cgroup_ops *ops = handler->cgroup_ops; - - if (ops->cgroup_layout == CGROUP_LAYOUT_UNIFIED) - rsp.ret = ops->unfreeze(ops, timeout); - - return lxc_cmd_rsp_send(fd, &rsp); -} int lxc_cmd_get_cgroup2_fd(const char *name, const char *lxcpath) {