diff options
| author | Jann Horn | 2019-01-23 15:19:18 +0100 |
|---|---|---|
| committer | Al Viro | 2019-02-01 02:01:45 -0500 |
| commit | 01e7187b41191376cee8bea8de9f907b001e87b4 (patch) | |
| tree | 024b8f4afcf6bb85a5daafc475c47187b40435d3 /kernel/relay.c | |
| parent | a0ce2f0aa6ad97c3d4927bf2ca54bcebdf062d55 (diff) | |
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 'kernel/relay.c')
| -rw-r--r-- | kernel/relay.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/relay.c b/kernel/relay.c index 04f248644e06..db3e419c25a6 100644 --- a/kernel/relay.c +++ b/kernel/relay.c @@ -1175,7 +1175,6 @@ static void relay_pipe_buf_release(struct pipe_inode_info *pipe, } static const struct pipe_buf_operations relay_pipe_buf_ops = { - .can_merge = 0, .confirm = generic_pipe_buf_confirm, .release = relay_pipe_buf_release, .steal = generic_pipe_buf_steal, |