summaryrefslogtreecommitdiff
path: root/io_uring/poll.c
diff options
context:
space:
mode:
authorPavel Begunkov <asml.silence@gmail.com>2022-06-20 03:25:54 +0300
committerJens Axboe <axboe@kernel.dk>2022-07-25 03:39:14 +0300
commitb321823a03dc81a5b83b063e6e1904d612b53266 (patch)
tree954691b392a9ffa5f169ef2a163171c9648a3d7a /io_uring/poll.c
parentba3cdb6fbb6e8eb525c868c60e103c5711edc068 (diff)
downloadlinux-b321823a03dc81a5b83b063e6e1904d612b53266.tar.xz
io_uring: fix io_poll_remove_all clang warnings
clang complains on bitwise operations with bools, add a bit more verbosity to better show that we want to call io_poll_remove_all_table() twice but with different arguments. Reported-by: Nathan Chancellor <nathan@kernel.org> Signed-off-by: Pavel Begunkov <asml.silence@gmail.com> Link: https://lore.kernel.org/r/f11d21dcdf9233e0eeb15fa13b858a05a78eb310.1655684496.git.asml.silence@gmail.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'io_uring/poll.c')
-rw-r--r--io_uring/poll.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/io_uring/poll.c b/io_uring/poll.c
index b2659b56c702..cbf44c38efd9 100644
--- a/io_uring/poll.c
+++ b/io_uring/poll.c
@@ -595,8 +595,11 @@ __cold bool io_poll_remove_all(struct io_ring_ctx *ctx, struct task_struct *tsk,
bool cancel_all)
__must_hold(&ctx->uring_lock)
{
- return io_poll_remove_all_table(tsk, &ctx->cancel_table, cancel_all) |
- io_poll_remove_all_table(tsk, &ctx->cancel_table_locked, cancel_all);
+ bool ret;
+
+ ret = io_poll_remove_all_table(tsk, &ctx->cancel_table, cancel_all);
+ ret |= io_poll_remove_all_table(tsk, &ctx->cancel_table_locked, cancel_all);
+ return ret;
}
static struct io_kiocb *io_poll_find(struct io_ring_ctx *ctx, bool poll_only,