From f148185f1c93a4395d5fad8b9e903aa88ce5f322 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Fri, 5 Mar 2010 13:42:51 -0800 Subject: [PATCH] --- yaml --- r: 186245 b: refs/heads/master c: 5f1664f92b2247111b7d37e454a050b76ac61b7f h: refs/heads/master i: 186243: e0003552ae3a74791496ee98e6d24e6937cd3620 v: v3 --- [refs] | 2 +- trunk/kernel/relay.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 171174e2856f..c1ce92fa7e53 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0347af4ee3922220f6bfe74b87b526aa709a0365 +refs/heads/master: 5f1664f92b2247111b7d37e454a050b76ac61b7f diff --git a/trunk/kernel/relay.c b/trunk/kernel/relay.c index c705a41b4ba3..3d97f2821611 100644 --- a/trunk/kernel/relay.c +++ b/trunk/kernel/relay.c @@ -1215,14 +1215,14 @@ static void relay_page_release(struct splice_pipe_desc *spd, unsigned int i) /* * subbuf_splice_actor - splice up to one subbuf's worth of data */ -static int subbuf_splice_actor(struct file *in, +static ssize_t subbuf_splice_actor(struct file *in, loff_t *ppos, struct pipe_inode_info *pipe, size_t len, unsigned int flags, int *nonpad_ret) { - unsigned int pidx, poff, total_len, subbuf_pages, nr_pages, ret; + unsigned int pidx, poff, total_len, subbuf_pages, nr_pages; struct rchan_buf *rbuf = in->private_data; unsigned int subbuf_size = rbuf->chan->subbuf_size; uint64_t pos = (uint64_t) *ppos; @@ -1241,6 +1241,7 @@ static int subbuf_splice_actor(struct file *in, .ops = &relay_pipe_buf_ops, .spd_release = relay_page_release, }; + ssize_t ret; if (rbuf->subbufs_produced == rbuf->subbufs_consumed) return 0;