Skip to content

Commit 1ef26d8

Browse files
committed
tracing: Use the new eventfs descriptor for print trigger
The check to create the print event "trigger" was using the obsolete "dir" value of the trace_event_file to determine if it should create the trigger or not. But that value will now be NULL because it uses the event file descriptor. Change it to test the "ef" field of the trace_event_file structure so that the trace_marker "trigger" file appears again. Link: https://lkml.kernel.org/r/20230908022001.371815239@goodmis.org Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Ajay Kaher <akaher@vmware.com> Fixes: 27152bc ("eventfs: Move tracing/events to eventfs") Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
1 parent 95a404b commit 1ef26d8

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

kernel/trace/trace.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9792,8 +9792,8 @@ init_tracer_tracefs(struct trace_array *tr, struct dentry *d_tracer)
97929792
tr, &tracing_mark_fops);
97939793

97949794
file = __find_event_file(tr, "ftrace", "print");
9795-
if (file && file->dir)
9796-
trace_create_file("trigger", TRACE_MODE_WRITE, file->dir,
9795+
if (file && file->ef)
9796+
eventfs_add_file("trigger", TRACE_MODE_WRITE, file->ef,
97979797
file, &event_trigger_fops);
97989798
tr->trace_marker_file = file;
97999799

0 commit comments

Comments
 (0)