#include <linux/module.h>
#include <linux/mm.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>
/*
* fault() vm_op implementation for ring buffer file mapping.
struct channel *chan = buf->backend.chan;
const struct lib_ring_buffer_config *config = &chan->backend.config;
pgoff_t pgoff = vmf->pgoff;
- struct page **page;
+ unsigned long *pfnp;
void **virt;
unsigned long offset, sb_bindex;
buf->backend.chan->backend.subbuf_size))
return VM_FAULT_SIGBUS;
/*
- * ring_buffer_read_get_page() gets the page in the current reader's
- * pages.
+ * ring_buffer_read_get_pfn() gets the page frame number for the
+ * current reader's pages.
*/
- page = lib_ring_buffer_read_get_page(&buf->backend, offset, &virt);
- if (!*page)
+ pfnp = lib_ring_buffer_read_get_pfn(&buf->backend, offset, &virt);
+ if (!*pfnp)
return VM_FAULT_SIGBUS;
- get_page(*page);
- vmf->page = *page;
+ get_page(pfn_to_page(*pfnp));
+ vmf->page = pfn_to_page(*pfnp);
return 0;
}
return 0;
}
+int lib_ring_buffer_mmap(struct file *filp, struct vm_area_struct *vma,
+ struct lib_ring_buffer *buf)
+{
+ return lib_ring_buffer_mmap_buf(buf, vma);
+}
+EXPORT_SYMBOL_GPL(lib_ring_buffer_mmap);
+
/**
- * lib_ring_buffer_mmap - mmap file op
+ * vfs_lib_ring_buffer_mmap - mmap file op
* @filp: the file
* @vma: the vma describing what to map
*
* Calls upon lib_ring_buffer_mmap_buf() to map the file into user space.
*/
-int lib_ring_buffer_mmap(struct file *filp, struct vm_area_struct *vma)
+int vfs_lib_ring_buffer_mmap(struct file *filp, struct vm_area_struct *vma)
{
struct lib_ring_buffer *buf = filp->private_data;
- return lib_ring_buffer_mmap_buf(buf, vma);
+ return lib_ring_buffer_mmap(filp, vma, buf);
}
-EXPORT_SYMBOL_GPL(lib_ring_buffer_mmap);
+EXPORT_SYMBOL_GPL(vfs_lib_ring_buffer_mmap);