mirror of
https://github.com/torvalds/linux.git
synced 2026-05-27 00:22:00 +02:00
Revert "io_uring: disallow self-propelled ring polling"
This reverts commit7fdbc5f014. This patch dealt with a subset of the real problem, which is a potential circular dependency on the wakup path for io_uring itself. Outside of io_uring, eventfd can also trigger this (see details in03e02acda8) and so can epoll (see details incaf1aeaffc). Now that we have a generic solution to this problem, get rid of the io_uring specific work-around. Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
parent
4464853277
commit
4061f0ef73
|
|
@ -246,8 +246,6 @@ static int io_poll_check_events(struct io_kiocb *req, bool *locked)
|
|||
continue;
|
||||
if (req->apoll_events & EPOLLONESHOT)
|
||||
return IOU_POLL_DONE;
|
||||
if (io_is_uring_fops(req->file))
|
||||
return IOU_POLL_DONE;
|
||||
|
||||
/* multishot, just fill a CQE and proceed */
|
||||
if (!(req->flags & REQ_F_APOLL_MULTISHOT)) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user