diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-04 00:52:19 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-04 00:52:19 +0200 |
| commit | ae03c53d005ef8a1e0253ad67b7b62103ea1fae6 (patch) | |
| tree | 2c3ebbe7a97c6b5e69add4a67723f89df73533f8 /kernel/relay.c | |
| parent | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
| parent | fs: rename pipe_buf ->steal to ->try_steal (diff) | |
| download | linux-ae03c53d005ef8a1e0253ad67b7b62103ea1fae6.tar.xz linux-ae03c53d005ef8a1e0253ad67b7b62103ea1fae6.zip | |
Merge branch 'work.splice' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull splice updates from Al Viro:
"Christoph's assorted splice cleanups"
* 'work.splice' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
fs: rename pipe_buf ->steal to ->try_steal
fs: make the pipe_buf_operations ->confirm operation optional
fs: make the pipe_buf_operations ->steal operation optional
trace: remove tracing_pipe_buf_ops
pipe: merge anon_pipe_buf*_ops
fs: simplify do_splice_from
fs: simplify do_splice_to
Diffstat (limited to 'kernel/relay.c')
| -rw-r--r-- | kernel/relay.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/relay.c b/kernel/relay.c index d0c9c287680a..90c7a002436d 100644 --- a/kernel/relay.c +++ b/kernel/relay.c @@ -1177,10 +1177,9 @@ static void relay_pipe_buf_release(struct pipe_inode_info *pipe, } static const struct pipe_buf_operations relay_pipe_buf_ops = { - .confirm = generic_pipe_buf_confirm, - .release = relay_pipe_buf_release, - .steal = generic_pipe_buf_steal, - .get = generic_pipe_buf_get, + .release = relay_pipe_buf_release, + .try_steal = generic_pipe_buf_try_steal, + .get = generic_pipe_buf_get, }; static void relay_page_release(struct splice_pipe_desc *spd, unsigned int i) |