Fix: pipe: stop using ->can_merge (v5.1)
authorMichael Jeanson <mjeanson@efficios.com>
Mon, 18 Mar 2019 20:20:34 +0000 (16:20 -0400)
committerMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Mon, 18 Mar 2019 20:37:19 +0000 (16:37 -0400)
commit812026fcebce14e489749c44ad601a072588e51b
tree936fd7bda6bd32f806203eb376dcc63614a9583e
parentf4a8ec4d6b5d2515987f4d2d37dfeb8d116d3fff
Fix: pipe: stop using ->can_merge (v5.1)

See upstream commit:

  commit 01e7187b41191376cee8bea8de9f907b001e87b4
  Author: Jann Horn <jannh@google.com>
  Date:   Wed Jan 23 15:19:18 2019 +0100

    pipe: stop using ->can_merge

    Al Viro pointed out that since there is only one pipe buffer type to which
    new data can be appended, it isn't necessary to have a ->can_merge field in
    struct pipe_buf_operations, we can just check for a magic type.

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
lib/ringbuffer/ring_buffer_splice.c
This page took 0.026655 seconds and 4 git commands to generate.