mirror of
https://github.com/torvalds/linux
synced 2024-10-14 23:39:09 +00:00
io_uring/rw: don't lose short results on io_setup_async_rw()
If a retry io_setup_async_rw() fails we lose result from the first io_iter_do_read(), which is a problem mostly for streams/sockets. Cc: stable@vger.kernel.org Signed-off-by: Pavel Begunkov <asml.silence@gmail.com> Link: https://lore.kernel.org/r/0e8d20cebe5fc9c96ed268463c394237daabc384.1664235732.git.asml.silence@gmail.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
parent
bf68b5b343
commit
c278d9f8ac
|
@ -764,10 +764,12 @@ int io_read(struct io_kiocb *req, unsigned int issue_flags)
|
||||||
iov_iter_restore(&s->iter, &s->iter_state);
|
iov_iter_restore(&s->iter, &s->iter_state);
|
||||||
|
|
||||||
ret2 = io_setup_async_rw(req, iovec, s, true);
|
ret2 = io_setup_async_rw(req, iovec, s, true);
|
||||||
if (ret2)
|
|
||||||
return ret2;
|
|
||||||
|
|
||||||
iovec = NULL;
|
iovec = NULL;
|
||||||
|
if (ret2) {
|
||||||
|
ret = ret > 0 ? ret : ret2;
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
|
||||||
io = req->async_data;
|
io = req->async_data;
|
||||||
s = &io->s;
|
s = &io->s;
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in a new issue