X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=lib%2Fringbuffer%2Fring_buffer_mmap.c;h=4b1b7b310502c038c415a1b31a3b4f0e06d4140d;hb=c11ab967decd550b28111b2767eda20e7e6be3fd;hp=ec7d9530fd968544ad4ce0b5a70a1740545621ef;hpb=886d51a3d7ed5fa6b41d7f19b3e14ae6c535a44c;p=lttng-modules.git

diff --git a/lib/ringbuffer/ring_buffer_mmap.c b/lib/ringbuffer/ring_buffer_mmap.c
index ec7d9530..4b1b7b31 100644
--- a/lib/ringbuffer/ring_buffer_mmap.c
+++ b/lib/ringbuffer/ring_buffer_mmap.c
@@ -25,20 +25,20 @@
 #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.
  */
-static int lib_ring_buffer_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+static int lib_ring_buffer_fault_compat(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
 	struct lib_ring_buffer *buf = vma->vm_private_data;
 	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;
 
@@ -53,18 +53,31 @@ static int lib_ring_buffer_fault(struct vm_area_struct *vma, struct vm_fault *vm
 			  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;
 }
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0))
+static int lib_ring_buffer_fault(struct vm_fault *vmf)
+{
+	struct vm_area_struct *vma = vmf->vma;
+	return lib_ring_buffer_fault_compat(vma, vmf);
+}
+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)) */
+static int lib_ring_buffer_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+{
+	return lib_ring_buffer_fault_compat(vma, vmf);
+}
+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)) */
+
 /*
  * vm_ops for ring buffer file mappings.
  */
@@ -106,16 +119,23 @@ static int lib_ring_buffer_mmap_buf(struct lib_ring_buffer *buf,
 	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);