From cba2278a108ab0f7eaf85ef55ff93c9a4267f459 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Tue, 10 Aug 2021 17:57:26 +0200 Subject: [PATCH] mainloop: remove CANCEL_RAISE flag This is really not needed since we're not checking it anywhere anyway. Signed-off-by: Christian Brauner --- src/lxc/mainloop.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/lxc/mainloop.c b/src/lxc/mainloop.c index f5388e0a3..28f198c4e 100644 --- a/src/lxc/mainloop.c +++ b/src/lxc/mainloop.c @@ -19,9 +19,8 @@ lxc_log_define(mainloop, lxc); -#define CANCEL_RAISED (1 << 0) -#define CANCEL_RECEIVED (1 << 1) -#define CANCEL_SUCCESS (1 << 2) +#define CANCEL_RECEIVED (1 << 0) +#define CANCEL_SUCCESS (1 << 1) struct mainloop_handler { struct lxc_list *list; @@ -191,14 +190,11 @@ static int __io_uring_disarm(struct lxc_async_descr *descr, "Failed to get submission queue entry"); io_uring_prep_poll_remove(sqe, handler); - handler->flags |= CANCEL_RAISED; io_uring_sqe_set_data(sqe, handler); ret = io_uring_submit(descr->ring); - if (ret < 0) { - handler->flags &= ~CANCEL_RAISED; + if (ret < 0) return syserror_ret(ret, "Failed to remove \"%s\" handler", handler->handler_name); - } TRACE("Removed handler \"%s\"", handler->handler_name); return ret;