summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-06-03 15:52:19 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-06-03 15:52:19 -0700
commitae03c53d005ef8a1e0253ad67b7b62103ea1fae6 (patch)
tree2c3ebbe7a97c6b5e69add4a67723f89df73533f8 /net
parent039aeb9deb9291f3b19c375a8bc6fa7f768996cc (diff)
parentc928f642c29a5ffb02e16f2430b42b876dde69de (diff)
downloadlinux-ae03c53d005ef8a1e0253ad67b7b62103ea1fae6.tar.bz2
Merge branch 'work.splice' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull splice updates from Al Viro: "Christoph's assorted splice cleanups" * 'work.splice' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: fs: rename pipe_buf ->steal to ->try_steal fs: make the pipe_buf_operations ->confirm operation optional fs: make the pipe_buf_operations ->steal operation optional trace: remove tracing_pipe_buf_ops pipe: merge anon_pipe_buf*_ops fs: simplify do_splice_from fs: simplify do_splice_to
Diffstat (limited to 'net')
-rw-r--r--net/smc/smc_rx.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/net/smc/smc_rx.c b/net/smc/smc_rx.c
index 39d7b34d06d2..fcfac59f8b72 100644
--- a/net/smc/smc_rx.c
+++ b/net/smc/smc_rx.c
@@ -129,16 +129,8 @@ out:
sock_put(sk);
}
-static int smc_rx_pipe_buf_nosteal(struct pipe_inode_info *pipe,
- struct pipe_buffer *buf)
-{
- return 1;
-}
-
static const struct pipe_buf_operations smc_pipe_ops = {
- .confirm = generic_pipe_buf_confirm,
.release = smc_rx_pipe_buf_release,
- .steal = smc_rx_pipe_buf_nosteal,
.get = generic_pipe_buf_get
};