diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2008-03-26 12:04:09 +0100 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2008-03-26 12:04:09 +0100 |
| commit | 5eb7f9fa847b8ab6e4864bfb8cb45f370844a47c (patch) | |
| tree | 6d84d9441eaf31bf471fb98996bb6e5b5ecd875f | |
| parent | 37529fe9f62835e1c11895a1895064748b032dc1 (diff) | |
| download | linux-5eb7f9fa847b8ab6e4864bfb8cb45f370844a47c.tar.bz2 | |
relay: set an spd_release() hook for splice
relay doesn't reference the pages it adds, however we need a non-NULL
hook or splice_to_pipe() can oops.
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| -rw-r--r-- | kernel/relay.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/relay.c b/kernel/relay.c index ed3f6cf2db86..d6204a485818 100644 --- a/kernel/relay.c +++ b/kernel/relay.c @@ -1056,6 +1056,10 @@ static struct pipe_buf_operations relay_pipe_buf_ops = { .get = generic_pipe_buf_get, }; +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 */ @@ -1083,6 +1087,7 @@ static int subbuf_splice_actor(struct file *in, .partial = partial, .flags = flags, .ops = &relay_pipe_buf_ops, + .spd_release = relay_page_release, }; if (rbuf->subbufs_produced == rbuf->subbufs_consumed) |