diff options
| author | Hao Xu <haoxu@linux.alibaba.com> | 2021-08-12 15:47:02 +0800 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2021-08-23 13:10:37 -0600 |
| commit | 41a5169c23ebe85fdd0b64a0b6381f486a34ef3c (patch) | |
| tree | d409ac044cf7d442dcba93af5560741b80e1559a | |
| parent | f552a27afe67f05c47bb0c33b92af2a23b684c31 (diff) | |
io_uring: code clean for completion_lock in io_arm_poll_handler()
We can merge two spin_unlock() operations to one since we removed some
code not long ago.
Signed-off-by: Hao Xu <haoxu@linux.alibaba.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | fs/io_uring.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index 7626cad93f60..c581c7cbb8b2 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -5237,13 +5237,10 @@ static int io_arm_poll_handler(struct io_kiocb *req) ret = __io_arm_poll_handler(req, &apoll->poll, &ipt, mask, io_async_wake); - if (ret || ipt.error) { - spin_unlock(&ctx->completion_lock); - if (ret) - return IO_APOLL_READY; - return IO_APOLL_ABORTED; - } spin_unlock(&ctx->completion_lock); + if (ret || ipt.error) + return ret ? IO_APOLL_READY : IO_APOLL_ABORTED; + trace_io_uring_poll_arm(ctx, req, req->opcode, req->user_data, mask, apoll->poll.events); return IO_APOLL_OK; |