diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2021-10-14 16:10:13 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2021-10-19 05:49:55 -0600 |
| commit | f80a50a632d6f5c64729563892b0deb95d563f6d (patch) | |
| tree | ec3932c6b5d075881254f649fcf05fdd05d59ba7 /fs/io_uring.c | |
| parent | 04f34081c5de35749274cf3bea8d8eb1c79b6ad1 (diff) | |
| download | lwn-f80a50a632d6f5c64729563892b0deb95d563f6d.tar.gz lwn-f80a50a632d6f5c64729563892b0deb95d563f6d.zip | |
io_uring: prioritise read success path over fails
Rearrange io_read return handling so first we expect it completing
successfully and only then checking for errors, which is a colder path.
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/c91c7c2da11815ec8b04b5d872f60dc4cde662c5.1634144845.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs/io_uring.c')
| -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 094cd5f49214..86ef803db27a 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -3487,7 +3487,7 @@ static int io_read(struct io_kiocb *req, unsigned int issue_flags) ret = 0; } else if (ret == -EIOCBQUEUED) { goto out_free; - } else if (ret <= 0 || ret == req->result || !force_nonblock || + } else if (ret == req->result || ret <= 0 || !force_nonblock || (req->flags & REQ_F_NOWAIT) || !need_read_all(req)) { /* read all, failed, already did sync or don't want to retry */ goto done; |