Skip to content

Commit

Permalink
io_uring: highlight read-retry loop
Browse files Browse the repository at this point in the history
We already have implicit do-while for read-retries but with goto in the
end. Convert it to an actual do-while, it highlights it so making a
bit more understandable and is cleaner in general.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
  • Loading branch information
Pavel Begunkov authored and Jens Axboe committed Feb 4, 2021
1 parent 5ea5dd4 commit b23df91
Showing 1 changed file with 20 additions and 20 deletions.
40 changes: 20 additions & 20 deletions fs/io_uring.c
Original file line number Diff line number Diff line change
Expand Up @@ -3566,27 +3566,27 @@ static int io_read(struct io_kiocb *req, bool force_nonblock,
rw = req->async_data;
/* now use our persistent iterator, if we aren't already */
iter = &rw->iter;
retry:
io_size -= ret;
rw->bytes_done += ret;
/* if we can retry, do so with the callbacks armed */
if (!io_rw_should_retry(req)) {
kiocb->ki_flags &= ~IOCB_WAITQ;
return -EAGAIN;
}

/*
* Now retry read with the IOCB_WAITQ parts set in the iocb. If we
* get -EIOCBQUEUED, then we'll get a notification when the desired
* page gets unlocked. We can also get a partial read here, and if we
* do, then just retry at the new offset.
*/
ret = io_iter_do_read(req, iter);
if (ret == -EIOCBQUEUED)
return 0;
/* we got some bytes, but not all. retry. */
if (ret > 0 && ret < io_size)
goto retry;
do {
io_size -= ret;
rw->bytes_done += ret;
/* if we can retry, do so with the callbacks armed */
if (!io_rw_should_retry(req)) {
kiocb->ki_flags &= ~IOCB_WAITQ;
return -EAGAIN;
}

/*
* Now retry read with the IOCB_WAITQ parts set in the iocb. If
* we get -EIOCBQUEUED, then we'll get a notification when the
* desired page gets unlocked. We can also get a partial read
* here, and if we do, then just retry at the new offset.
*/
ret = io_iter_do_read(req, iter);
if (ret == -EIOCBQUEUED)
return 0;
/* we got some bytes, but not all. retry. */
} while (ret > 0 && ret < io_size);
done:
kiocb_done(kiocb, ret, cs);
return 0;
Expand Down

0 comments on commit b23df91

Please sign in to comment.