diff options
| author |   Jens Axboe <axboe@kernel.dk> | 2019-11-14 22:40:44 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-11-25 19:48:31 -0700 |
| commit | 95a5bbae05ef1ec1cceb8c1b04a482aa0b7c177c (patch) | |
| tree | 1300dff8caa613fb8d6c670663311041869bb95b /fs | |
| parent | Merge tag 'edac_for_5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras (diff) | |
| download | linux-dev-95a5bbae05ef1ec1cceb8c1b04a482aa0b7c177c.tar.xz linux-dev-95a5bbae05ef1ec1cceb8c1b04a482aa0b7c177c.zip | |
io_uring: io_async_cancel() should pass in 'nxt' request pointer
If we have a linked request, this enables us to pass it back directly
without having to go through async context.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/io_uring.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index 4c030a92de79..011281856ff7 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -2480,7 +2480,7 @@ static int io_async_cancel(struct io_kiocb *req, const struct io_uring_sqe *sqe, sqe->cancel_flags) return -EINVAL; - io_async_find_and_cancel(ctx, req, READ_ONCE(sqe->addr), NULL); + io_async_find_and_cancel(ctx, req, READ_ONCE(sqe->addr), nxt); return 0; } |