Message ID | 2329ea2aecb56e982f16aea7c637fd0e8a7985506.1697486714.git.nabijaczleweli@nabijaczleweli.xyz (mailing list archive) |
---|---|
State | New |
Headers | show |
Series | splice(file<>pipe) I/O on file as-if O_NONBLOCK | expand |
diff --git a/kernel/relay.c b/kernel/relay.c index 83fe0325cde1..3d381e94a204 100644 --- a/kernel/relay.c +++ b/kernel/relay.c @@ -1215,8 +1215,7 @@ static ssize_t relay_file_splice_read(struct file *in, if (ret < 0) break; else if (!ret) { - if (flags & SPLICE_F_NONBLOCK) - ret = -EAGAIN; + ret = -EAGAIN; break; }
For consistency with the new "file->pipe reads non-blockingly" semantic. Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz> --- kernel/relay.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)