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:34:08 +0000 (16:34 -0400)
commitd6cd2c9598a06f0ba1ba885bbe754e8836528310
tree58337d8c9418811b6b42229a56b1951273a5ba2f
parent92da05ce1f73488a57e7fd79e9c03113cefdb76f
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.024892 seconds and 4 git commands to generate.