summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-10-31 16:47:15 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2016-12-26 23:53:38 -0500
commitf81dc7d7d5a2528f98f26a0b9406e822d0b35011 (patch)
tree84dcf809066aa8e4be34feb2fec5af01bcdf2903
parent23c832b10ca9ab2685d7d3e0990800ffc846fc92 (diff)
downloadop-kernel-dev-f81dc7d7d5a2528f98f26a0b9406e822d0b35011.zip
op-kernel-dev-f81dc7d7d5a2528f98f26a0b9406e822d0b35011.tar.gz
splice_pipe_desc: kill ->flags
no users left Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--include/linux/splice.h1
-rw-r--r--kernel/relay.c1
-rw-r--r--kernel/trace/trace.c2
-rw-r--r--net/core/skbuff.c1
4 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/splice.h b/include/linux/splice.h
index 647243b..3c98dad 100644
--- a/include/linux/splice.h
+++ b/include/linux/splice.h
@@ -55,7 +55,6 @@ struct splice_pipe_desc {
struct partial_page *partial; /* pages[] may not be contig */
int nr_pages; /* number of populated pages in map */
unsigned int nr_pages_max; /* pages[] & partial[] arrays size */
- unsigned int flags; /* splice flags */
const struct pipe_buf_operations *ops;/* ops associated with output pipe */
void (*spd_release)(struct splice_pipe_desc *, unsigned int);
};
diff --git a/kernel/relay.c b/kernel/relay.c
index 8f18d31..9b48284 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 d744978..77c2d9b 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -5536,7 +5536,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,
};
@@ -6434,7 +6433,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,
};
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 5a03730..0835ac9 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -1976,7 +1976,6 @@ int skb_splice_bits(struct sk_buff *skb, struct sock *sk, unsigned int offset,
.pages = pages,
.partial = partial,
.nr_pages_max = MAX_SKB_FRAGS,
- .flags = flags,
.ops = &nosteal_pipe_buf_ops,
.spd_release = sock_spd_release,
};
OpenPOWER on IntegriCloud