splice_pipe_desc: kill ->flags

no users left

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/include/linux/splice.h b/include/linux/splice.h
index 647243bdd9d7fb4a518d95cf04470f73913c7f24..3c98dad93bf37a4a92ad8ec63cd078ebf441c4ee 100644 (file)
--- 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 8f18d314a96a49a1e9fc6c4cf1c5bead5c96a787..9b48284eac56b0e033fea99046925e87c9ef4c67 100644 (file)
--- 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 d7449783987a2bee7dea147e02530f36ff23dfba..77c2d9bcb40f9d75d85a4caa7923906260216fa9 100644 (file)
--- 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 5a03730fbc1a84376985d4d68d8b80d8f38b0985..0835ac93a4b1a5eee99b228db896af0676a19300 100644 (file)
--- 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,
        };