#include <linux/module.h>
#include <linux/fs.h>
+#include <linux/version.h>
#include "../../wrapper/splice.h"
#include "../../wrapper/ringbuffer/backend.h"
#define printk_dbg(fmt, args...)
#endif
-loff_t lib_ring_buffer_no_llseek(struct file *file, loff_t offset, int origin)
+loff_t vfs_lib_ring_buffer_no_llseek(struct file *file, loff_t offset,
+ int origin)
{
return -ESPIPE;
}
+EXPORT_SYMBOL_GPL(vfs_lib_ring_buffer_no_llseek);
/*
* Release pages from the buffer so splice pipe_to_file can move them.
static const struct pipe_buf_operations ring_buffer_pipe_buf_ops = {
.can_merge = 0,
+#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,
loff_t *ppos,
struct pipe_inode_info *pipe,
size_t len,
- unsigned int flags)
+ unsigned int flags,
+ struct lib_ring_buffer *buf)
{
- struct lib_ring_buffer *buf = in->private_data;
struct channel *chan = buf->backend.chan;
const struct lib_ring_buffer_config *config = &chan->backend.config;
unsigned int poff, subbuf_pages, nr_pages;
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)
GFP_KERNEL | __GFP_ZERO, 0);
if (!new_page)
break;
-
+ new_pfn = page_to_pfn(new_page);
this_len = PAGE_SIZE - poff;
- page = lib_ring_buffer_read_get_page(&buf->backend, roffset, &virt);
- spd.pages[spd.nr_pages] = *page;
- *page = new_page;
+ pfnp = lib_ring_buffer_read_get_pfn(&buf->backend, roffset, &virt);
+ spd.pages[spd.nr_pages] = pfn_to_page(*pfnp);
+ *pfnp = new_pfn;
*virt = page_address(new_page);
spd.partial[spd.nr_pages].offset = poff;
spd.partial[spd.nr_pages].len = this_len;
ssize_t lib_ring_buffer_splice_read(struct file *in, loff_t *ppos,
struct pipe_inode_info *pipe, size_t len,
- unsigned int flags)
+ unsigned int flags,
+ struct lib_ring_buffer *buf)
{
- struct lib_ring_buffer *buf = in->private_data;
struct channel *chan = buf->backend.chan;
const struct lib_ring_buffer_config *config = &chan->backend.config;
ssize_t spliced;
printk_dbg(KERN_DEBUG "SPLICE read len %zu pos %zd\n", len,
(ssize_t)*ppos);
while (len && !spliced) {
- ret = subbuf_splice_actor(in, ppos, pipe, len, flags);
+ ret = subbuf_splice_actor(in, ppos, pipe, len, flags, buf);
printk_dbg(KERN_DEBUG "SPLICE read loop ret %d\n", ret);
if (ret < 0)
break;
return ret;
}
EXPORT_SYMBOL_GPL(lib_ring_buffer_splice_read);
+
+ssize_t vfs_lib_ring_buffer_splice_read(struct file *in, loff_t *ppos,
+ struct pipe_inode_info *pipe, size_t len,
+ unsigned int flags)
+{
+ struct lib_ring_buffer *buf = in->private_data;
+
+ return lib_ring_buffer_splice_read(in, ppos, pipe, len, flags, buf);
+}
+EXPORT_SYMBOL_GPL(vfs_lib_ring_buffer_splice_read);