diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-03 15:52:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-03 15:52:19 -0700 |
| commit | ae03c53d005ef8a1e0253ad67b7b62103ea1fae6 (patch) | |
| tree | 2c3ebbe7a97c6b5e69add4a67723f89df73533f8 /kernel/trace | |
| 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-dev-ae03c53d005ef8a1e0253ad67b7b62103ea1fae6.tar.xz linux-dev-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/trace')
| -rw-r--r-- | kernel/trace/trace.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index f12e99b387b2..0b144926bd73 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -6305,13 +6305,6 @@ static void tracing_spd_release_pipe(struct splice_pipe_desc *spd, __free_page(spd->pages[idx]); } -static const struct pipe_buf_operations tracing_pipe_buf_ops = { - .confirm = generic_pipe_buf_confirm, - .release = generic_pipe_buf_release, - .steal = generic_pipe_buf_steal, - .get = generic_pipe_buf_get, -}; - static size_t tracing_fill_pipe_page(size_t rem, struct trace_iterator *iter) { @@ -6373,7 +6366,7 @@ static ssize_t tracing_splice_read_pipe(struct file *filp, .partial = partial_def, .nr_pages = 0, /* This gets updated below. */ .nr_pages_max = PIPE_DEF_BUFFERS, - .ops = &tracing_pipe_buf_ops, + .ops = &default_pipe_buf_ops, .spd_release = tracing_spd_release_pipe, }; ssize_t ret; @@ -7582,9 +7575,7 @@ static bool buffer_pipe_buf_get(struct pipe_inode_info *pipe, /* Pipe buffer operations for a buffer. */ static const struct pipe_buf_operations buffer_pipe_buf_ops = { - .confirm = generic_pipe_buf_confirm, .release = buffer_pipe_buf_release, - .steal = generic_pipe_buf_nosteal, .get = buffer_pipe_buf_get, }; |