projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ring buffer splice: remove compatibility code
[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 f0b5479a8b8bfb993b29da4d3c0db3e708d76385..1888e0f873e2feccfa3e89c1c2615c9d244ee2a5 100644
(file)
--- a/
lib/ringbuffer/ring_buffer_splice.c
+++ b/
lib/ringbuffer/ring_buffer_splice.c
@@
-12,9
+12,8
@@
#include <linux/module.h>
#include <linux/fs.h>
#include <linux/module.h>
#include <linux/fs.h>
-#include <linux/
version
.h>
+#include <linux/
splice
.h>
-#include <wrapper/splice.h>
#include <wrapper/ringbuffer/backend.h>
#include <wrapper/ringbuffer/frontend.h>
#include <wrapper/ringbuffer/vfs.h>
#include <wrapper/ringbuffer/backend.h>
#include <wrapper/ringbuffer/frontend.h>
#include <wrapper/ringbuffer/vfs.h>
@@
-43,13
+42,6
@@
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,
-#endif
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0))
- .map = generic_pipe_buf_map,
- .unmap = generic_pipe_buf_unmap,
-#endif
.confirm = generic_pipe_buf_confirm,
.release = lib_ring_buffer_pipe_buf_release,
.steal = generic_pipe_buf_steal,
.confirm = generic_pipe_buf_confirm,
.release = lib_ring_buffer_pipe_buf_release,
.steal = generic_pipe_buf_steal,
@@
-84,9
+76,6
@@
static int subbuf_splice_actor(struct file *in,
.pages = pages,
.nr_pages = 0,
.partial = partial,
.pages = pages,
.nr_pages = 0,
.partial = partial,
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,12,0))
- .flags = flags,
-#endif
.ops = &ring_buffer_pipe_buf_ops,
.spd_release = lib_ring_buffer_page_release,
};
.ops = &ring_buffer_pipe_buf_ops,
.spd_release = lib_ring_buffer_page_release,
};
@@
-152,7
+141,7
@@
static int subbuf_splice_actor(struct file *in,
if (!spd.nr_pages)
return 0;
if (!spd.nr_pages)
return 0;
- return
wrapper_
splice_to_pipe(pipe, &spd);
+ return splice_to_pipe(pipe, &spd);
}
ssize_t lib_ring_buffer_splice_read(struct file *in, loff_t *ppos,
}
ssize_t lib_ring_buffer_splice_read(struct file *in, loff_t *ppos,
This page took
0.023582 seconds
and
4
git commands to generate.