X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lib%2Fringbuffer%2Fring_buffer_vfs.c;h=899af8124f05c10f296b7ea167383a399fdb1e28;hb=7cfe462eeb0578f73b0ce072b66135fde1817776;hp=51d8a4d4305bb0dd53d61688d2859a54979e63fb;hpb=5a8fd222992df9bbb709836e5bf4ca053dd776c3;p=lttng-modules.git

diff --git a/lib/ringbuffer/ring_buffer_vfs.c b/lib/ringbuffer/ring_buffer_vfs.c
index 51d8a4d4..899af812 100644
--- a/lib/ringbuffer/ring_buffer_vfs.c
+++ b/lib/ringbuffer/ring_buffer_vfs.c
@@ -1,11 +1,23 @@
 /*
  * ring_buffer_vfs.c
  *
- * Copyright (C) 2009-2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
  * Ring Buffer VFS file operations.
  *
- * Dual LGPL v2.1/GPL v2 license.
+ * Copyright (C) 2010-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; only
+ * version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <linux/module.h>
@@ -268,14 +280,14 @@ long lib_ring_buffer_compat_ioctl(struct file *filp, unsigned int cmd,
 		return -EIO;
 
 	switch (cmd) {
-	case RING_BUFFER_SNAPSHOT:
+	case RING_BUFFER_COMPAT_SNAPSHOT:
 		return lib_ring_buffer_snapshot(buf, &buf->cons_snapshot,
 						&buf->prod_snapshot);
-	case RING_BUFFER_SNAPSHOT_GET_CONSUMED:
+	case RING_BUFFER_COMPAT_SNAPSHOT_GET_CONSUMED:
 		return compat_put_ulong(buf->cons_snapshot, arg);
-	case RING_BUFFER_SNAPSHOT_GET_PRODUCED:
+	case RING_BUFFER_COMPAT_SNAPSHOT_GET_PRODUCED:
 		return compat_put_ulong(buf->prod_snapshot, arg);
-	case RING_BUFFER_GET_SUBBUF:
+	case RING_BUFFER_COMPAT_GET_SUBBUF:
 	{
 		__u32 uconsume;
 		unsigned long consume;
@@ -294,11 +306,11 @@ long lib_ring_buffer_compat_ioctl(struct file *filp, unsigned int cmd,
 		}
 		return ret;
 	}
-	case RING_BUFFER_PUT_SUBBUF:
+	case RING_BUFFER_COMPAT_PUT_SUBBUF:
 		lib_ring_buffer_put_subbuf(buf);
 		return 0;
 
-	case RING_BUFFER_GET_NEXT_SUBBUF:
+	case RING_BUFFER_COMPAT_GET_NEXT_SUBBUF:
 	{
 		long ret;
 
@@ -309,19 +321,19 @@ long lib_ring_buffer_compat_ioctl(struct file *filp, unsigned int cmd,
 		}
 		return ret;
 	}
-	case RING_BUFFER_PUT_NEXT_SUBBUF:
+	case RING_BUFFER_COMPAT_PUT_NEXT_SUBBUF:
 		lib_ring_buffer_put_next_subbuf(buf);
 		return 0;
-	case RING_BUFFER_GET_SUBBUF_SIZE:
+	case RING_BUFFER_COMPAT_GET_SUBBUF_SIZE:
 	{
 		unsigned long data_size;
 
 		data_size = lib_ring_buffer_get_read_data_size(config, buf);
 		if (data_size > UINT_MAX)
 			return -EFBIG;
-		return put_ulong(data_size, arg);
+		return compat_put_ulong(data_size, arg);
 	}
-	case RING_BUFFER_GET_PADDED_SUBBUF_SIZE:
+	case RING_BUFFER_COMPAT_GET_PADDED_SUBBUF_SIZE:
 	{
 		unsigned long size;
 
@@ -329,13 +341,13 @@ long lib_ring_buffer_compat_ioctl(struct file *filp, unsigned int cmd,
 		size = PAGE_ALIGN(size);
 		if (size > UINT_MAX)
 			return -EFBIG;
-		return put_ulong(size, arg);
+		return compat_put_ulong(size, arg);
 	}
-	case RING_BUFFER_GET_MAX_SUBBUF_SIZE:
+	case RING_BUFFER_COMPAT_GET_MAX_SUBBUF_SIZE:
 		if (chan->backend.subbuf_size > UINT_MAX)
 			return -EFBIG;
-		return put_ulong(chan->backend.subbuf_size, arg);
-	case RING_BUFFER_GET_MMAP_LEN:
+		return compat_put_ulong(chan->backend.subbuf_size, arg);
+	case RING_BUFFER_COMPAT_GET_MMAP_LEN:
 	{
 		unsigned long mmap_buf_len;
 
@@ -346,9 +358,9 @@ long lib_ring_buffer_compat_ioctl(struct file *filp, unsigned int cmd,
 			mmap_buf_len += chan->backend.subbuf_size;
 		if (mmap_buf_len > UINT_MAX)
 			return -EFBIG;
-		return put_ulong(mmap_buf_len, arg);
+		return compat_put_ulong(mmap_buf_len, arg);
 	}
-	case RING_BUFFER_GET_MMAP_READ_OFFSET:
+	case RING_BUFFER_COMPAT_GET_MMAP_READ_OFFSET:
 	{
 		unsigned long sb_bindex, read_offset;
 
@@ -359,9 +371,9 @@ long lib_ring_buffer_compat_ioctl(struct file *filp, unsigned int cmd,
 		read_offset = buf->backend.array[sb_bindex]->mmap_offset;
 		if (read_offset > UINT_MAX)
 			return -EINVAL;
-		return put_ulong(read_offset, arg);
+		return compat_put_ulong(read_offset, arg);
 	}
-	case RING_BUFFER_FLUSH:
+	case RING_BUFFER_COMPAT_FLUSH:
 		lib_ring_buffer_switch_slow(buf, SWITCH_ACTIVE);
 		return 0;
 	default: