X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttng-abi.c;h=98f03c3e4fbbd552f85d813ca020ca745596b552;hb=328ed5540256ef125c0604ae882eec8aa443528a;hp=d15e3f83a66a68af207820b0c5f6770ba67d12b5;hpb=a90917c3f8c4ed79117f1caa333b29a2108084ec;p=lttng-modules.git

diff --git a/lttng-abi.c b/lttng-abi.c
index d15e3f83..98f03c3e 100644
--- a/lttng-abi.c
+++ b/lttng-abi.c
@@ -175,7 +175,7 @@ long lttng_abi_add_context(struct file *file,
 	case LTTNG_KERNEL_CONTEXT_VPPID:
 		return lttng_add_vppid_to_ctx(ctx);
 	case LTTNG_KERNEL_CONTEXT_PERF_COUNTER:
-		context_param.u.perf_counter.name[LTTNG_SYM_NAME_LEN - 1] = '\0';
+		context_param.u.perf_counter.name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0';
 		return lttng_add_perf_counter_to_ctx(context_param.u.perf_counter.type,
 				context_param.u.perf_counter.config,
 				context_param.u.perf_counter.name,
@@ -500,16 +500,16 @@ int lttng_abi_create_event(struct file *channel_file,
 
 	if (copy_from_user(&event_param, uevent_param, sizeof(event_param)))
 		return -EFAULT;
-	event_param.name[LTTNG_SYM_NAME_LEN - 1] = '\0';
+	event_param.name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0';
 	switch (event_param.instrumentation) {
 	case LTTNG_KERNEL_KRETPROBE:
-		event_param.u.kretprobe.symbol_name[LTTNG_SYM_NAME_LEN - 1] = '\0';
+		event_param.u.kretprobe.symbol_name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0';
 		break;
 	case LTTNG_KERNEL_KPROBE:
-		event_param.u.kprobe.symbol_name[LTTNG_SYM_NAME_LEN - 1] = '\0';
+		event_param.u.kprobe.symbol_name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0';
 		break;
 	case LTTNG_KERNEL_FUNCTION:
-		event_param.u.ftrace.symbol_name[LTTNG_SYM_NAME_LEN - 1] = '\0';
+		event_param.u.ftrace.symbol_name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0';
 		break;
 	default:
 		break;
@@ -749,10 +749,10 @@ int __init lttng_abi_init(void)
 	int ret = 0;
 
 	wrapper_vmalloc_sync_all();
-	lttng_proc_dentry = proc_create_data("lttng", S_IWUSR, NULL,
+	lttng_proc_dentry = proc_create_data("lttng", S_IRUSR | S_IWUSR, NULL,
 					&lttng_fops, NULL);
 	
-	if (lttng_proc_dentry) {
+	if (!lttng_proc_dentry) {
 		printk(KERN_ERR "Error creating LTTng control file\n");
 		ret = -ENOMEM;
 		goto error;