diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-02 11:38:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-02 11:38:06 -0700 |
| commit | da7b66ffb2815800440d9e1649282a27c805304f (patch) | |
| tree | 59e1cbab628f69afddd80e1eecaa18b2c6a02b92 /kernel/relay.c | |
| parent | 5b13475a5e12c49c24422ba1bd9998521dec1d4e (diff) | |
| parent | 13c0f52beb6310b9c08804c0929901f70abd211a (diff) | |
| download | linux-da7b66ffb2815800440d9e1649282a27c805304f.tar.bz2 | |
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()
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 0e413d9eec8a..39a9dfc69486 100644 --- a/kernel/relay.c +++ b/kernel/relay.c @@ -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, }; |