diff options
| author | Jens Axboe <axboe@kernel.dk> | 2020-04-13 05:12:49 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-04-13 05:16:01 +0200 |
| commit | 88357580854aab29d27e1a443575caaedd081612 (patch) | |
| tree | ce168deef967746e8ebc79d895661c2f128ef2b7 /fs | |
| parent | io_uring: restore req->work when canceling poll request (diff) | |
| download | linux-88357580854aab29d27e1a443575caaedd081612.tar.xz linux-88357580854aab29d27e1a443575caaedd081612.zip | |
io_uring: correct O_NONBLOCK check for splice punt
The splice file punt check uses file->f_mode to check for O_NONBLOCK,
but it should be checking file->f_flags. This leads to punting even
for files that have O_NONBLOCK set, which isn't necessary. This equates
to checking for FMODE_PATH, which will never be set on the fd in
question.
Fixes: 7d67af2c0134 ("io_uring: add splice(2) support")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs')
| -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 68a678a0056b..0d1b5d5f1251 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -2763,7 +2763,7 @@ static bool io_splice_punt(struct file *file) return false; if (!io_file_supports_async(file)) return true; - return !(file->f_mode & O_NONBLOCK); + return !(file->f_flags & O_NONBLOCK); } static int io_splice(struct io_kiocb *req, bool force_nonblock) |