projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: don't access packet header for stream_id and stream_instance_id getters
[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 bb91f45e01a303303b514814436d388ed9292c23..93cad295e0e9495ff3ec8fdad8efc98ecb11cdb4 100644
(file)
--- a/
lib/ringbuffer/ring_buffer_splice.c
+++ b/
lib/ringbuffer/ring_buffer_splice.c
@@
-27,10
+27,10
@@
#include <linux/fs.h>
#include <linux/version.h>
#include <linux/fs.h>
#include <linux/version.h>
-#include
"../../wrapper/splice.h"
-#include
"../../wrapper/ringbuffer/backend.h"
-#include
"../../wrapper/ringbuffer/frontend.h"
-#include
"../../wrapper/ringbuffer/vfs.h"
+#include
<wrapper/splice.h>
+#include
<wrapper/ringbuffer/backend.h>
+#include
<wrapper/ringbuffer/frontend.h>
+#include
<wrapper/ringbuffer/vfs.h>
#if 0
#define printk_dbg(fmt, args...) printk(fmt, args)
#if 0
#define printk_dbg(fmt, args...) printk(fmt, args)
@@
-56,7
+56,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,
@@
-95,7
+97,9
@@
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,
.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,
};
@@
-126,7
+130,8
@@
static int subbuf_splice_actor(struct file *in,
for (; spd.nr_pages < nr_pages; spd.nr_pages++) {
unsigned int this_len;
for (; spd.nr_pages < nr_pages; spd.nr_pages++) {
unsigned int this_len;
- struct page **page, *new_page;
+ unsigned long *pfnp, new_pfn;
+ struct page *new_page;
void **virt;
if (!len)
void **virt;
if (!len)
@@
-143,11
+148,11
@@
static int subbuf_splice_actor(struct file *in,
GFP_KERNEL | __GFP_ZERO, 0);
if (!new_page)
break;
GFP_KERNEL | __GFP_ZERO, 0);
if (!new_page)
break;
-
+ new_pfn = page_to_pfn(new_page);
this_len = PAGE_SIZE - poff;
this_len = PAGE_SIZE - poff;
- p
age = lib_ring_buffer_read_get_page
(&buf->backend, roffset, &virt);
- spd.pages[spd.nr_pages] =
*page
;
- *p
age = new_page
;
+ p
fnp = lib_ring_buffer_read_get_pfn
(&buf->backend, roffset, &virt);
+ spd.pages[spd.nr_pages] =
pfn_to_page(*pfnp)
;
+ *p
fnp = new_pfn
;
*virt = page_address(new_page);
spd.partial[spd.nr_pages].offset = poff;
spd.partial[spd.nr_pages].len = this_len;
*virt = page_address(new_page);
spd.partial[spd.nr_pages].offset = poff;
spd.partial[spd.nr_pages].len = this_len;
This page took
0.023903 seconds
and
4
git commands to generate.