diff options
| author | Jann Horn <jannh@google.com> | 2019-01-23 15:19:18 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2019-02-01 02:01:45 -0500 |
| commit | 01e7187b41191376cee8bea8de9f907b001e87b4 (patch) | |
| tree | 024b8f4afcf6bb85a5daafc475c47187b40435d3 /include/linux/pipe_fs_i.h | |
| parent | a0ce2f0aa6ad97c3d4927bf2ca54bcebdf062d55 (diff) | |
| download | linux-01e7187b41191376cee8bea8de9f907b001e87b4.tar.gz | |
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 'include/linux/pipe_fs_i.h')
| -rw-r--r-- | include/linux/pipe_fs_i.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h index 3ecd7ea212ae..787d224ff43e 100644 --- a/include/linux/pipe_fs_i.h +++ b/include/linux/pipe_fs_i.h @@ -74,13 +74,6 @@ struct pipe_inode_info { */ struct pipe_buf_operations { /* - * This is set to 1, if the generic pipe read/write may coalesce - * data into an existing buffer. If this is set to 0, a new pipe - * page segment is always used for new data. - */ - int can_merge; - - /* * ->confirm() verifies that the data in the pipe buffer is there * and that the contents are good. If the pages in the pipe belong * to a file system, we may need to wait for IO completion in this |