summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-05-08 10:48:36 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-08 10:48:36 -0700
commit7a34912d90c17a90d9fad12c4c51833b4e70707b (patch)
treea3811697f5eba3c5d12216ac76f681420046b219 /kernel
parent0f1bce41fed02e45f31c2409f29e69e1fedebcdc (diff)
parent75065ff619e42fe35178eda863cbcddd57776794 (diff)
downloadop-kernel-dev-7a34912d90c17a90d9fad12c4c51833b4e70707b.zip
op-kernel-dev-7a34912d90c17a90d9fad12c4c51833b4e70707b.tar.gz
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block: Revert "relay: fix splice problem" docbook: fix bio missing parameter block: use unitialized_var() in bio_alloc_bioset() block: avoid duplicate calls to get_part() in disk stat code cfq-iosched: make io priorities inherit CPU scheduling class as well as nice block: optimize generic_unplug_device() block: get rid of likely/unlikely predictions in merge logic vfs: splice remove_suid() cleanup cfq-iosched: fix RCU race in the cfq io_context destructor handling block: adjust tagging function queue bit locking block: sysfs store function needs to grab queue_lock and use queue_flag_*()
Diffstat (limited to 'kernel')
-rw-r--r--kernel/relay.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/relay.c b/kernel/relay.c
index 7de644c..bc24dcd 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 && !spliced) {
+ while (len) {
ret = subbuf_splice_actor(in, ppos, pipe, len, flags, &nonpad_ret);
if (ret < 0)
break;
OpenPOWER on IntegriCloud