diff --git a/[refs] b/[refs] index d3785554afd2..73fb378b1c89 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 361371201b60ffd686a694c848c1d5ad6061725f +refs/heads/master: fbb5b7ae4b442f1923513dc6165a66c7a7f29073 diff --git a/trunk/kernel/relay.c b/trunk/kernel/relay.c index 32b0befdcb6a..09ac2008f77b 100644 --- a/trunk/kernel/relay.c +++ b/trunk/kernel/relay.c @@ -1317,12 +1317,9 @@ static ssize_t relay_file_splice_read(struct file *in, if (ret < 0) break; else if (!ret) { - if (spliced) - break; - if (flags & SPLICE_F_NONBLOCK) { + if (flags & SPLICE_F_NONBLOCK) ret = -EAGAIN; - break; - } + break; } *ppos += ret;