X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=kernel%2Frelay.c;h=e8cd2027abbd1e2e0ed6d432974816cef2845a42;hb=ce9f8d6b39b0d8f62092477b8d96a835860fb45a;hp=ab56a1764d4db8c6a5136cd3b636dc330648783b;hpb=a591afc01d9e48affbacb365558a31e53c85af45;p=linux-2.6-microblaze.git

diff --git a/kernel/relay.c b/kernel/relay.c
index ab56a1764d4d..e8cd2027abbd 100644
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -1235,6 +1235,7 @@ static ssize_t subbuf_splice_actor(struct file *in,
 	struct splice_pipe_desc spd = {
 		.pages = pages,
 		.nr_pages = 0,
+		.nr_pages_max = PIPE_DEF_BUFFERS,
 		.partial = partial,
 		.flags = flags,
 		.ops = &relay_pipe_buf_ops,
@@ -1302,8 +1303,8 @@ static ssize_t subbuf_splice_actor(struct file *in,
                 ret += padding;
 
 out:
-	splice_shrink_spd(pipe, &spd);
-        return ret;
+	splice_shrink_spd(&spd);
+	return ret;
 }
 
 static ssize_t relay_file_splice_read(struct file *in,