X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=lib%2Fringbuffer%2Fring_buffer_iterator.c;h=47e151bfce4c13ed9a525e465e98c17d7bfcfc55;hb=152fe7fccd64295a24df5bef0c5281e5ea9cfa90;hp=e7c6cb7f91765d96c8c024f1e801373e91e06eca;hpb=886d51a3d7ed5fa6b41d7f19b3e14ae6c535a44c;p=lttng-modules.git

diff --git a/lib/ringbuffer/ring_buffer_iterator.c b/lib/ringbuffer/ring_buffer_iterator.c
index e7c6cb7f..47e151bf 100644
--- a/lib/ringbuffer/ring_buffer_iterator.c
+++ b/lib/ringbuffer/ring_buffer_iterator.c
@@ -25,7 +25,8 @@
  *	Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#include "../../wrapper/ringbuffer/iterator.h"
+#include <wrapper/ringbuffer/iterator.h>
+#include <wrapper/file.h>
 #include <linux/jiffies.h>
 #include <linux/delay.h>
 #include <linux/module.h>
@@ -70,7 +71,7 @@ restart:
 			 * Per-CPU buffers rather use a "push" scheme because
 			 * the IPI needed to flush all CPU's buffers is too
 			 * costly. In the "push" scheme, the reader waits for
-			 * the writer periodic deferrable timer to flush the
+			 * the writer periodic timer to flush the
 			 * buffers (keeping track of a quiescent state
 			 * timestamp). Therefore, the writer "pushes" data out
 			 * of the buffers rather than letting the reader "pull"
@@ -351,7 +352,7 @@ void lib_ring_buffer_iterator_init(struct channel *chan, struct lib_ring_buffer
 
 #ifdef CONFIG_HOTPLUG_CPU
 static
-int __cpuinit channel_iterator_cpu_hotplug(struct notifier_block *nb,
+int channel_iterator_cpu_hotplug(struct notifier_block *nb,
 					   unsigned long action,
 					   void *hcpu)
 {
@@ -691,7 +692,7 @@ ssize_t lib_ring_buffer_file_read(struct file *filp,
 			          size_t count,
 			          loff_t *ppos)
 {
-	struct inode *inode = filp->f_dentry->d_inode;
+	struct inode *inode = filp->lttng_f_dentry->d_inode;
 	struct lib_ring_buffer *buf = inode->i_private;
 	struct channel *chan = buf->backend.chan;
 
@@ -716,7 +717,7 @@ ssize_t channel_file_read(struct file *filp,
 			  size_t count,
 			  loff_t *ppos)
 {
-	struct inode *inode = filp->f_dentry->d_inode;
+	struct inode *inode = filp->lttng_f_dentry->d_inode;
 	struct channel *chan = inode->i_private;
 	const struct lib_ring_buffer_config *config = &chan->backend.config;
 
@@ -796,7 +797,7 @@ const struct file_operations channel_payload_file_operations = {
 	.open = channel_file_open,
 	.release = channel_file_release,
 	.read = channel_file_read,
-	.llseek = lib_ring_buffer_no_llseek,
+	.llseek = vfs_lib_ring_buffer_no_llseek,
 };
 EXPORT_SYMBOL_GPL(channel_payload_file_operations);
 
@@ -805,6 +806,6 @@ const struct file_operations lib_ring_buffer_payload_file_operations = {
 	.open = lib_ring_buffer_file_open,
 	.release = lib_ring_buffer_file_release,
 	.read = lib_ring_buffer_file_read,
-	.llseek = lib_ring_buffer_no_llseek,
+	.llseek = vfs_lib_ring_buffer_no_llseek,
 };
 EXPORT_SYMBOL_GPL(lib_ring_buffer_payload_file_operations);