summaryrefslogtreecommitdiffstats
path: root/net/smc
diff options
context:
space:
mode:
authorJann Horn <jannh@google.com>2019-01-23 15:19:18 +0100
committerAl Viro <viro@zeniv.linux.org.uk>2019-02-01 02:01:45 -0500
commit01e7187b41191376cee8bea8de9f907b001e87b4 (patch)
tree024b8f4afcf6bb85a5daafc475c47187b40435d3 /net/smc
parenta0ce2f0aa6ad97c3d4927bf2ca54bcebdf062d55 (diff)
downloadlinux-01e7187b41191376cee8bea8de9f907b001e87b4.tar.gz
linux-01e7187b41191376cee8bea8de9f907b001e87b4.tar.bz2
linux-01e7187b41191376cee8bea8de9f907b001e87b4.zip
pipe: stop using ->can_merge
Al Viro pointed out that since there is only one pipe buffer type to which new data can be appended, it isn't necessary to have a ->can_merge field in struct pipe_buf_operations, we can just check for a magic type. Suggested-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Jann Horn <jannh@google.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'net/smc')
-rw-r--r--net/smc/smc_rx.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/smc/smc_rx.c b/net/smc/smc_rx.c
index bbcf0fe4ae10..413a6abf227e 100644
--- a/net/smc/smc_rx.c
+++ b/net/smc/smc_rx.c
@@ -136,7 +136,6 @@ static int smc_rx_pipe_buf_nosteal(struct pipe_inode_info *pipe,
}
static const struct pipe_buf_operations smc_pipe_ops = {
- .can_merge = 0,
.confirm = generic_pipe_buf_confirm,
.release = smc_rx_pipe_buf_release,
.steal = smc_rx_pipe_buf_nosteal,