diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-13 07:53:38 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-13 07:53:38 +0100 |
| commit | 2523816da8290474fc7285179c6d9e0a2e411e75 (patch) | |
| tree | 51d6ceeb90d4a9a7ca2fc18a7c5db507ccad6b23 /fs/io_uring.c | |
| parent | 16bb7abc4a6b9defffa294e4dc28383e62a1dbcf (diff) | |
| parent | b3a987b0264d3ddbb24293ebff10eddfc472f653 (diff) | |
Merge 5.5-rc6 into char-misc-next
We need the char-misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/io_uring.c')
| -rw-r--r-- | fs/io_uring.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index 562e3a1a1bf9..38b54051facd 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -1863,18 +1863,6 @@ static int io_read(struct io_kiocb *req, struct io_kiocb **nxt, else ret2 = loop_rw_iter(READ, req->file, kiocb, &iter); - /* - * In case of a short read, punt to async. This can happen - * if we have data partially cached. Alternatively we can - * return the short read, in which case the application will - * need to issue another SQE and wait for it. That SQE will - * need async punt anyway, so it's more efficient to do it - * here. - */ - if (force_nonblock && !(req->flags & REQ_F_NOWAIT) && - (req->flags & REQ_F_ISREG) && - ret2 > 0 && ret2 < io_size) - ret2 = -EAGAIN; /* Catch -EAGAIN return for forced non-blocking submission */ if (!force_nonblock || ret2 != -EAGAIN) { kiocb_done(kiocb, ret2, nxt, req->in_async); |