Commit 88357580 authored by Jens Axboe's avatar Jens Axboe

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: 7d67af2c ("io_uring: add splice(2) support")
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent b1f573bd
...@@ -2763,7 +2763,7 @@ static bool io_splice_punt(struct file *file) ...@@ -2763,7 +2763,7 @@ static bool io_splice_punt(struct file *file)
return false; return false;
if (!io_file_supports_async(file)) if (!io_file_supports_async(file))
return true; 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) static int io_splice(struct io_kiocb *req, bool force_nonblock)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment