diff options
| author |   Jens Axboe <axboe@kernel.dk> | 2020-08-25 12:59:22 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-08-25 12:59:22 -0600 |
| commit | 00d23d516e2e7900cd1bd577c1f84794ae7ff3a7 (patch) | |
| tree | 0873d6156fd575f1cc93236dd17ca105cd46e99d /fs | |
| parent | io_uring: don't use poll handler if file can't be nonblocking read/written (diff) | |
| download | linux-dev-00d23d516e2e7900cd1bd577c1f84794ae7ff3a7.tar.xz linux-dev-00d23d516e2e7900cd1bd577c1f84794ae7ff3a7.zip | |
io_uring: ensure read requests go through -ERESTART* transformation
We need to call kiocb_done() for any ret < 0 to ensure that we always
get the proper -ERESTARTSYS (and friends) transformation done.
At some point this should be tied into general error handling, so we
can get rid of the various (mostly network) related commands that check
and perform this substitution.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/io_uring.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index d15139088e4c..d9b88644d5e8 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -3160,7 +3160,8 @@ static int io_read(struct io_kiocb *req, bool force_nonblock, goto out_free; return -EAGAIN; } else if (ret < 0) { - goto out_free; + /* make sure -ERESTARTSYS -> -EINTR is done */ + goto done; } /* read it all, or we did blocking attempt. no retry. */ |