X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libringbuffer%2Fring_buffer_abi.c;h=ed52b718964c09d48b6d4352bae23f692f967ba6;hb=4318ae1be57eb7983ab4857a7a8eeb4a030a8216;hp=fbf6df537f20de015467a5c416189b31710e0009;hpb=9f3fdbc68877e1f12b6cedb15ef76d9af9b48bac;p=lttng-ust.git

diff --git a/libringbuffer/ring_buffer_abi.c b/libringbuffer/ring_buffer_abi.c
index fbf6df53..ed52b718 100644
--- a/libringbuffer/ring_buffer_abi.c
+++ b/libringbuffer/ring_buffer_abi.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2009-2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * Ring Buffer VFS file operations.
+ * Ring Buffer ABI operations.
  *
  * Dual LGPL v2.1/GPL v2 license.
  */
 
 #include "backend.h"
 #include "frontend.h"
-#include <ust/ring-buffer-abi.h>
+#include <lttng/ring-buffer-abi.h>
 
 static int put_ulong(unsigned long val, unsigned long arg)
 {
@@ -34,7 +34,7 @@ static int compat_put_ulong(compat_ulong_t val, unsigned long arg)
  */
 int lib_ring_buffer_open(struct inode *inode, struct file *file)
 {
-	struct lib_ring_buffer *buf = inode->i_private;
+	struct lttng_ust_lib_ring_buffer *buf = inode->i_private;
 	int ret;
 
 	ret = lib_ring_buffer_open_read(buf);
@@ -61,7 +61,7 @@ release_read:
  */
 int lib_ring_buffer_release(struct inode *inode, struct file *file)
 {
-	struct lib_ring_buffer *buf = file->private_data;
+	struct lttng_ust_lib_ring_buffer *buf = file->private_data;
 
 	lib_ring_buffer_release_read(buf);
 
@@ -78,9 +78,9 @@ int lib_ring_buffer_release(struct inode *inode, struct file *file)
 unsigned int lib_ring_buffer_poll(struct file *filp, poll_table *wait)
 {
 	unsigned int mask = 0;
-	struct lib_ring_buffer *buf = filp->private_data;
+	struct lttng_ust_lib_ring_buffer *buf = filp->private_data;
 	struct channel *chan = buf->backend.chan;
-	const struct lib_ring_buffer_config *config = chan->backend.config;
+	const struct lttng_ust_lib_ring_buffer_config *config = chan->backend.config;
 	int finalized, disabled;
 
 	if (filp->f_mode & FMODE_READ) {
@@ -155,9 +155,9 @@ retry:
  */
 long lib_ring_buffer_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 {
-	struct lib_ring_buffer *buf = filp->private_data;
+	struct lttng_ust_lib_ring_buffer *buf = filp->private_data;
 	struct channel *chan = buf->backend.chan;
-	const struct lib_ring_buffer_config *config = chan->backend.config;
+	const struct lttng_ust_lib_ring_buffer_config *config = chan->backend.config;
 
 	if (lib_ring_buffer_channel_is_disabled(chan))
 		return -EIO;
@@ -241,7 +241,7 @@ long lib_ring_buffer_ioctl(struct file *filp, unsigned int cmd, unsigned long ar
 				 arg);
 	}
 	case RING_BUFFER_FLUSH:
-		lib_ring_buffer_switch_slow(buf, SWITCH_ACTIVE);
+		lib_ring_buffer_switch_slow(buf, SWITCH_ACTIVE, handle);
 		return 0;
 	default:
 		return -ENOIOCTLCMD;
@@ -252,9 +252,9 @@ long lib_ring_buffer_ioctl(struct file *filp, unsigned int cmd, unsigned long ar
 long lib_ring_buffer_compat_ioctl(struct file *filp, unsigned int cmd,
 				  unsigned long arg)
 {
-	struct lib_ring_buffer *buf = filp->private_data;
+	struct lttng_ust_lib_ring_buffer *buf = filp->private_data;
 	struct channel *chan = buf->backend.chan;
-	const struct lib_ring_buffer_config *config = chan->backend.config;
+	const struct lttng_ust_lib_ring_buffer_config *config = chan->backend.config;
 
 	if (lib_ring_buffer_channel_is_disabled(chan))
 		return -EIO;
@@ -354,7 +354,7 @@ long lib_ring_buffer_compat_ioctl(struct file *filp, unsigned int cmd,
 		return put_ulong(read_offset, arg);
 	}
 	case RING_BUFFER_FLUSH:
-		lib_ring_buffer_switch_slow(buf, SWITCH_ACTIVE);
+		lib_ring_buffer_switch_slow(buf, SWITCH_ACTIVE, handle);
 		return 0;
 	default:
 		return -ENOIOCTLCMD;