Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09a5059a authored by Steven Rostedt (Red Hat)'s avatar Steven Rostedt (Red Hat) Committed by Steven Rostedt
Browse files

tracing: Rename ftrace_trigger_soft_disabled() to trace_trigger_soft_disabled() 



The name "ftrace" really refers to the function hook infrastructure. It
is not about the trace_events. The ftrace_trigger_soft_disabled() tests if a
trace_event is soft disabled (called but not traced), and returns true if
it is. It has nothing to do with function tracing and should be renamed.

Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 5d6ad960

include/linux/trace_events.h

+2 −2
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ extern void event_triggers_post_call(struct trace_event_file *file, 
				     enum event_trigger_type tt);



/**

 * ftrace_trigger_soft_disabled - do triggers and test if soft disabled

 * trace_trigger_soft_disabled - do triggers and test if soft disabled

 * @file: The file pointer of the event to test

 *

 * If any triggers without filters are attached to this event, they
@@ -435,7 +435,7 @@ extern void event_triggers_post_call(struct trace_event_file *file, 
 * otherwise false.

 */

static inline bool

ftrace_trigger_soft_disabled(struct trace_event_file *file)

trace_trigger_soft_disabled(struct trace_event_file *file)

{

	unsigned long eflags = file->flags;

include/trace/perf.h

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ ftrace_raw_event_##call(void *__data, proto) \ 
	struct ftrace_raw_##call *entry;				\

	int __data_size;						\

									\

	if (ftrace_trigger_soft_disabled(trace_file))			\

	if (trace_trigger_soft_disabled(trace_file))			\

		return;							\

									\

	__data_size = ftrace_get_offsets_##call(&__data_offsets, args); \

kernel/trace/trace_kprobe.c

+2 −2
Original line number Diff line number Diff line
@@ -928,7 +928,7 @@ __kprobe_trace_func(struct trace_kprobe *tk, struct pt_regs *regs, 


	WARN_ON(call != trace_file->event_call);



	if (ftrace_trigger_soft_disabled(trace_file))

	if (trace_trigger_soft_disabled(trace_file))

		return;



	local_save_flags(irq_flags);
@@ -976,7 +976,7 @@ __kretprobe_trace_func(struct trace_kprobe *tk, struct kretprobe_instance *ri, 


	WARN_ON(call != trace_file->event_call);



	if (ftrace_trigger_soft_disabled(trace_file))

	if (trace_trigger_soft_disabled(trace_file))

		return;



	local_save_flags(irq_flags);

kernel/trace/trace_syscalls.c

+2 −2
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ static void ftrace_syscall_enter(void *data, struct pt_regs *regs, long id) 
	if (!trace_file)

		return;



	if (ftrace_trigger_soft_disabled(trace_file))

	if (trace_trigger_soft_disabled(trace_file))

		return;



	sys_data = syscall_nr_to_meta(syscall_nr);
@@ -359,7 +359,7 @@ static void ftrace_syscall_exit(void *data, struct pt_regs *regs, long ret) 
	if (!trace_file)

		return;



	if (ftrace_trigger_soft_disabled(trace_file))

	if (trace_trigger_soft_disabled(trace_file))

		return;



	sys_data = syscall_nr_to_meta(syscall_nr);

kernel/trace/trace_uprobe.c

+1 −1
Original line number Diff line number Diff line
@@ -784,7 +784,7 @@ static void __uprobe_trace_func(struct trace_uprobe *tu, 
	if (WARN_ON_ONCE(tu->tp.size + dsize > PAGE_SIZE))

		return;



	if (ftrace_trigger_soft_disabled(trace_file))

	if (trace_trigger_soft_disabled(trace_file))

		return;



	esize = SIZEOF_TRACE_ENTRY(is_ret_probe(tu));