projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: pipe: stop using ->can_merge (v5.1)
[lttng-modules.git]
/
lib
/
ringbuffer
/
ring_buffer_splice.c
diff --git
a/lib/ringbuffer/ring_buffer_splice.c
b/lib/ringbuffer/ring_buffer_splice.c
index 468641bc034e49723b14ce8b8c187f9aaf781f4e..52179a79986597f24352a5177f14cebfb02f0a9d 100644
(file)
--- a/
lib/ringbuffer/ring_buffer_splice.c
+++ b/
lib/ringbuffer/ring_buffer_splice.c
@@
-43,7
+43,9
@@
static void lib_ring_buffer_pipe_buf_release(struct pipe_inode_info *pipe,
}
static const struct pipe_buf_operations ring_buffer_pipe_buf_ops = {
}
static const struct pipe_buf_operations ring_buffer_pipe_buf_ops = {
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5,1,0))
.can_merge = 0,
.can_merge = 0,
+#endif
#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0))
.map = generic_pipe_buf_map,
.unmap = generic_pipe_buf_unmap,
#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0))
.map = generic_pipe_buf_map,
.unmap = generic_pipe_buf_unmap,
This page took
0.023439 seconds
and
4
git commands to generate.