X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=ltt-debugfs-abi.c;h=9043759f960102c443196f4e9567680cd8371f05;hb=3afe7aaccff5c7d2889267ab64eac46ce72ac799;hp=7fb7339205d5c99ff413d081ec50549606a526c6;hpb=1c25284c690cd38b71789c4024089d28de21caea;p=lttng-modules.git

diff --git a/ltt-debugfs-abi.c b/ltt-debugfs-abi.c
index 7fb73392..9043759f 100644
--- a/ltt-debugfs-abi.c
+++ b/ltt-debugfs-abi.c
@@ -141,14 +141,14 @@ int lttng_abi_create_channel(struct file *session_file,
 				  chan_param.switch_timer_interval,
 				  chan_param.read_timer_interval);
 	if (!chan) {
-		ret = -ENOMEM;
+		ret = -EINVAL;
 		goto chan_error;
 	}
 	chan->file = chan_file;
 	chan_file->private_data = chan;
 	fd_install(chan_fd, chan_file);
 	/* The channel created holds a reference on the session */
-	atomic_inc(&session_file->f_count);
+	atomic_long_inc(&session_file->f_count);
 
 	return chan_fd;
 
@@ -202,7 +202,9 @@ static
 int lttng_session_release(struct inode *inode, struct file *file)
 {
 	struct ltt_session *session = file->private_data;
-	ltt_session_destroy(session);
+
+	if (session)
+		ltt_session_destroy(session);
 	return 0;
 }
 
@@ -240,7 +242,7 @@ int lttng_abi_open_stream(struct file *channel_file)
 	}
 	fd_install(stream_fd, stream_file);
 	/* The stream holds a reference on the channel */
-	atomic_inc(&channel_file->f_count);
+	atomic_long_inc(&channel_file->f_count);
 	return stream_fd;
 
 file_error:
@@ -266,7 +268,7 @@ int lttng_abi_create_event(struct file *channel_file,
 	event_name = kmalloc(PATH_MAX, GFP_KERNEL);
 	if (!event_name)
 		return -ENOMEM;
-	if (strncpy_from_user(event_name, uevent_param->name, PATH_MAX)) {
+	if (strncpy_from_user(event_name, uevent_param->name, PATH_MAX) < 0) {
 		ret = -EFAULT;
 		goto name_error;
 	}
@@ -288,7 +290,7 @@ int lttng_abi_create_event(struct file *channel_file,
 	 * invariant for the rest of the session.
 	 */
 	event = ltt_event_create(channel, event_name, event_param.itype,
-				 NULL, NULL);	/* TODO non-null probe */
+				 (void *) 0x1, NULL);	/* TODO connect real probe */
 	if (!event) {
 		goto event_error;
 		ret = -EEXIST;
@@ -296,7 +298,7 @@ int lttng_abi_create_event(struct file *channel_file,
 	event_file->private_data = event;
 	fd_install(event_fd, event_file);
 	/* The event holds a reference on the channel */
-	atomic_inc(&channel_file->f_count);
+	atomic_long_inc(&channel_file->f_count);
 	kfree(event_name);
 	return event_fd;
 
@@ -372,7 +374,9 @@ static
 int lttng_channel_release(struct inode *inode, struct file *file)
 {
 	struct ltt_channel *channel = file->private_data;
-	fput(channel->session->file);
+
+	if (channel)
+		fput(channel->session->file);
 	return 0;
 }
 
@@ -392,7 +396,9 @@ static
 int lttng_event_release(struct inode *inode, struct file *file)
 {
 	struct ltt_event *event = file->private_data;
-	fput(event->chan->file);
+
+	if (event)
+		fput(event->chan->file);
 	return 0;
 }
 
@@ -406,7 +412,7 @@ int __init ltt_debugfs_abi_init(void)
 	int ret = 0;
 
 	lttng_dentry = debugfs_create_file("lttng", S_IWUSR, NULL, NULL,
-					   &lttng_session_fops);
+					   &lttng_fops);
 	if (IS_ERR(lttng_dentry) || !lttng_dentry) {
 		printk(KERN_ERR "Error creating LTTng control file\n");
 		ret = -ENOMEM;