On 4/13/2020 6:16 AM, Jens Axboe wrote:
> 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.
My bad, thanks
> Fixes: 7d67af2c0134 ("io_uring: add splice(2) support")
> Signed-off-by: Jens Axboe <axboe@xxxxxxxxx>
>
> ---
>
> 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)
>
--
Pavel Begunkov
