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>
This commit is contained in:
@@ -73,13 +73,6 @@ struct pipe_inode_info {
|
||||
* in fs/pipe.c for the pipe and generic variants of these hooks.
|
||||
*/
|
||||
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
|
||||
|
Reference in New Issue
Block a user