relay: set an spd_release() hook for splice
authorJens Axboe <jens.axboe@oracle.com>
Wed, 26 Mar 2008 11:04:09 +0000 (12:04 +0100)
committerJens Axboe <jens.axboe@oracle.com>
Wed, 26 Mar 2008 11:04:09 +0000 (12:04 +0100)
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>
kernel/relay.c

index ed3f6cf2db861917091536d949895b4864f38139..d6204a4858183c754d5d401ad230c11f60a546c1 100644 (file)
@@ -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)