Merge branch 'work.splice' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-block.git] / kernel / relay.c

diff --git a/kernel/relay.c b/kernel/relay.c
index d0c9c287680af0fc554e0007a0107d984d9ea860..90c7a002436ddc68bf60aaf876c465b261395353 100644 (file)
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -1177,10 +1177,9 @@ static void relay_pipe_buf_release(struct pipe_inode_info *pipe,
 }
 
 static const struct pipe_buf_operations relay_pipe_buf_ops = {
-       .confirm = generic_pipe_buf_confirm,
-       .release = relay_pipe_buf_release,
-       .steal = generic_pipe_buf_steal,
-       .get = generic_pipe_buf_get,
+       .release        = relay_pipe_buf_release,
+       .try_steal      = generic_pipe_buf_try_steal,
+       .get            = generic_pipe_buf_get,
 };
 
 static void relay_page_release(struct splice_pipe_desc *spd, unsigned int i)