diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-28 08:00:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-28 08:00:51 -0700 |
| commit | b4412323cc954bd0a2144b1c2ed573dd2eddb32c (patch) | |
| tree | a0dd14e6d46efbb36a0898c158e8efb49e4a22ef /kernel | |
| parent | dc1d60a014aa9614518f9856ff661716d0969ffd (diff) | |
| parent | d6de8be711b28049a5cb93c954722c311c7d3f7f (diff) | |
| download | linux-3.10-b4412323cc954bd0a2144b1c2ed573dd2eddb32c.tar.gz linux-3.10-b4412323cc954bd0a2144b1c2ed573dd2eddb32c.tar.bz2 linux-3.10-b4412323cc954bd0a2144b1c2ed573dd2eddb32c.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
cfq-iosched: fix RCU problem in cfq_cic_lookup()
block: make blktrace use per-cpu buffers for message notes
Added in elevator switch message to blktrace stream
Added in MESSAGE notes for blktraces
block: reorder cfq_queue to save space on 64bit builds
block: Move the second call to get_request to the end of the loop
splice: handle try_to_release_page() failure
splice: fix sendfile() issue with relay
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/relay.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/relay.c b/kernel/relay.c index bc24dcdc570..7de644cdec4 100644 --- a/kernel/relay.c +++ b/kernel/relay.c @@ -1191,7 +1191,7 @@ static ssize_t relay_file_splice_read(struct file *in, ret = 0; spliced = 0; - while (len) { + while (len && !spliced) { ret = subbuf_splice_actor(in, ppos, pipe, len, flags, &nonpad_ret); if (ret < 0) break; |