diff options
| author |   Pavel Begunkov <asml.silence@gmail.com> | 2021-10-23 12:13:58 +0100 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2021-10-25 07:42:31 -0600 |
| commit | 658d0a401637ffbc733b0f03723e9e1255289429 (patch) | |
| tree | cbac1afa0e12a92611625969cd6c655d49c0c3ec /fs | |
| parent | io_uring: clean iowq submit work cancellation (diff) | |
| download | linux-dev-658d0a401637ffbc733b0f03723e9e1255289429.tar.xz linux-dev-658d0a401637ffbc733b0f03723e9e1255289429.zip | |
io_uring: check if opcode needs poll first on arming
->pollout or ->pollin are set only for opcodes that need a file, so if
io_arm_poll_handler() tests them first we can be sure that the request
has file set and the ->file check can be removed.
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/9adfe4f543d984875e516fce6da35348aab48668.1634987320.git.asml.silence@gmail.com
Reviewed-by: Hao Xu <haoxu@linux.alibaba.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/io_uring.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index 58cb3a14d58e..bff911f951ed 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -5584,12 +5584,10 @@ static int io_arm_poll_handler(struct io_kiocb *req) struct io_poll_table ipt; __poll_t ret, mask = EPOLLONESHOT | POLLERR | POLLPRI; - if (!req->file || !file_can_poll(req->file)) - return IO_APOLL_ABORTED; - if (req->flags & REQ_F_POLLED) - return IO_APOLL_ABORTED; if (!def->pollin && !def->pollout) return IO_APOLL_ABORTED; + if (!file_can_poll(req->file) || (req->flags & REQ_F_POLLED)) + return IO_APOLL_ABORTED; if (def->pollin) { mask |= POLLIN | POLLRDNORM; |