{
struct ltt_channel *channel = channel_file->private_data;
static struct lttng_kernel_event metadata_params = {
- .instrumentation = LTTNG_KERNEL_TRACEPOINTS,
+ .instrumentation = LTTNG_KERNEL_TRACEPOINT,
.name = "lttng_metadata",
};
- char *event_name = "lttng_metadata";
struct ltt_event *event;
int ret;
* We tolerate no failure path after event creation. It will stay
* invariant for the rest of the session.
*/
- event = ltt_event_create(channel, event_name, &metadata_params, NULL);
+ event = ltt_event_create(channel, &metadata_params, NULL);
if (!event) {
goto create_error;
ret = -EEXIST;
{
struct ltt_channel *channel = channel_file->private_data;
struct ltt_event *event;
- char *event_name;
struct lttng_kernel_event event_param;
int event_fd, ret;
struct file *event_file;
if (copy_from_user(&event_param, uevent_param, sizeof(event_param)))
return -EFAULT;
- event_name = kmalloc(PATH_MAX, GFP_KERNEL);
- if (!event_name)
- return -ENOMEM;
- if (strncpy_from_user(event_name, uevent_param->name, PATH_MAX) < 0) {
- ret = -EFAULT;
- goto name_error;
- }
- event_name[PATH_MAX - 1] = '\0';
+ event_param.name[LTTNG_SYM_NAME_LEN - 1] = '\0';
switch (event_param.instrumentation) {
- case LTTNG_KERNEL_KPROBES:
+ case LTTNG_KERNEL_KPROBE:
event_param.u.kprobe.symbol_name[LTTNG_SYM_NAME_LEN - 1] = '\0';
break;
- case LTTNG_KERNEL_FUNCTION_TRACER:
+ case LTTNG_KERNEL_FUNCTION:
event_param.u.ftrace.symbol_name[LTTNG_SYM_NAME_LEN - 1] = '\0';
break;
default:
* We tolerate no failure path after event creation. It will stay
* invariant for the rest of the session.
*/
- event = ltt_event_create(channel, event_name, &event_param, NULL);
+ event = ltt_event_create(channel, &event_param, NULL);
if (!event) {
ret = -EEXIST;
goto event_error;
fd_install(event_fd, event_file);
/* The event holds a reference on the channel */
atomic_long_inc(&channel_file->f_count);
- kfree(event_name);
return event_fd;
event_error:
file_error:
put_unused_fd(event_fd);
fd_error:
-name_error:
- kfree(event_name);
return ret;
}