diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-03-23 10:28:11 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-03-23 10:28:14 +1100 |
| commit | 9edad0d1d666181dd905072c1604c96813f87875 (patch) | |
| tree | f423bac3e5158a848ef035ef06f314a71ef4575c /kernel | |
| parent | 8a459d2906799966e7ad22a3597a33e715a19f31 (diff) | |
| parent | 9e9c5ba8bd70714708bc9ae9b557eb8141f1de74 (diff) | |
Merge remote-tracking branch 'vfs/for-next'
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/relay.c | 1 | ||||
| -rw-r--r-- | kernel/trace/trace.c | 2 |
2 files changed, 0 insertions, 3 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, }; diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index f35109514a01..12f67868358b 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -5529,7 +5529,6 @@ 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, - .flags = flags, .ops = &tracing_pipe_buf_ops, .spd_release = tracing_spd_release_pipe, }; @@ -6427,7 +6426,6 @@ tracing_buffers_splice_read(struct file *file, loff_t *ppos, .pages = pages_def, .partial = partial_def, .nr_pages_max = PIPE_DEF_BUFFERS, - .flags = flags, .ops = &buffer_pipe_buf_ops, .spd_release = buffer_spd_release, }; |