mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Merge branch 'work.splice' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull splice updates from Al Viro: "These actually missed the last cycle; the branch itself is from last December" * 'work.splice' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: make nr_pages calculation in default_file_splice_read() a bit less ugly splice/tee/vmsplice: validate flags splice_pipe_desc: kill ->flags remove spd_release_page()
This commit is contained in:
commit
da7b66ffb2
5 changed files with 13 additions and 15 deletions
|
|
@ -1212,7 +1212,6 @@ static ssize_t subbuf_splice_actor(struct file *in,
|
|||
.nr_pages = 0,
|
||||
.nr_pages_max = PIPE_DEF_BUFFERS,
|
||||
.partial = partial,
|
||||
.flags = flags,
|
||||
.ops = &relay_pipe_buf_ops,
|
||||
.spd_release = relay_page_release,
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue