diff options
| author | David S. Miller <davem@davemloft.net> | 2012-07-05 03:44:25 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-05 03:44:25 -0700 |
| commit | c90a9bb9073a4096596360f02ea711c619663494 (patch) | |
| tree | dc85d9f4c0d423e6b523e81c41a5b68e267de14f /kernel/relay.c | |
| parent | 23c342153ef2a4ad8bd4f2d6515126449658d2b3 (diff) | |
| parent | 9e85a6f9dc231f3ed3c1dc1b12217505d970142a (diff) | |
| download | linux-next-c90a9bb9073a4096596360f02ea711c619663494.tar.gz linux-next-c90a9bb9073a4096596360f02ea711c619663494.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'kernel/relay.c')
| -rw-r--r-- | kernel/relay.c | 5 |
1 files changed, 3 insertions, 2 deletions
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, |