On 5/4/20 10:25, Jens Axboe wrote:
>> diff --git a/fs/io_uring.c b/fs/io_uring.c
>> index e5dfbbd2aa34..4b1efb062f7f 100644
>> --- a/fs/io_uring.c
>> +++ b/fs/io_uring.c
>> @@ -2782,7 +2782,7 @@ static int io_splice(struct io_kiocb *req, bool
>> force_nonblock)
>> poff_in = (sp->off_in == -1) ? NULL : &sp->off_in;
>> poff_out = (sp->off_out == -1) ? NULL : &sp->off_out;
>> ret = do_splice(in, poff_in, out, poff_out, sp->len, flags);
>> - if (force_nonblock && ret == -EAGAIN)
>> + if (ret == -EAGAIN)
>> return -EAGAIN;
>
> This isn't right, it should just remove the two lines completely. But
> also see:
>
> https://lore.kernel.org/io-uring/529ea928-88a6-2cbe-ba8c-72b4c68cc...@kernel.dk/T/#u
>
Oh, I see now. Thanks for the feedback.
--
Gustavo
