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

Commit 14a5ae40 authored by Steven Rostedt (Red Hat)'s avatar Steven Rostedt (Red Hat) Committed by Steven Rostedt
Browse files

tracing: Use IS_ERR() check for return value of tracing_init_dentry() 



tracing_init_dentry() will soon return NULL as a valid pointer for the
top level tracing directroy. NULL can not be used as an error value.
Instead, switch to ERR_PTR() and check the return status with
IS_ERR().

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

kernel/trace/ftrace.c

+1 −1
Original line number Diff line number Diff line
@@ -5419,7 +5419,7 @@ static __init int ftrace_init_debugfs(void) 
	struct dentry *d_tracer;



	d_tracer = tracing_init_dentry();

	if (!d_tracer)

	if (IS_ERR(d_tracer))

		return 0;



	ftrace_init_dyn_debugfs(d_tracer);

kernel/trace/trace.c

+4 −4
Original line number Diff line number Diff line
@@ -5820,7 +5820,7 @@ struct dentry *tracing_init_dentry_tr(struct trace_array *tr) 
		return tr->dir;



	if (!debugfs_initialized())

		return NULL;

		return ERR_PTR(-ENODEV);



	if (tr->flags & TRACE_ARRAY_FL_GLOBAL)

		tr->dir = debugfs_create_dir("tracing", NULL);
@@ -5844,7 +5844,7 @@ static struct dentry *tracing_dentry_percpu(struct trace_array *tr, int cpu) 
		return tr->percpu_dir;



	d_tracer = tracing_init_dentry_tr(tr);

	if (!d_tracer)

	if (IS_ERR(d_tracer))

		return NULL;



	tr->percpu_dir = debugfs_create_dir("per_cpu", d_tracer);
@@ -6047,7 +6047,7 @@ static struct dentry *trace_options_init_dentry(struct trace_array *tr) 
		return tr->options;



	d_tracer = tracing_init_dentry_tr(tr);

	if (!d_tracer)

	if (IS_ERR(d_tracer))

		return NULL;



	tr->options = debugfs_create_dir("options", d_tracer);
@@ -6538,7 +6538,7 @@ static __init int tracer_init_debugfs(void) 
	trace_access_lock_init();



	d_tracer = tracing_init_dentry();

	if (!d_tracer)

	if (IS_ERR(d_tracer))

		return 0;



	init_tracer_debugfs(&global_trace, d_tracer);

kernel/trace/trace_events.c

+1 −1
Original line number Diff line number Diff line
@@ -2490,7 +2490,7 @@ static __init int event_trace_init(void) 
		return -ENODEV;



	d_tracer = tracing_init_dentry();

	if (!d_tracer)

	if (IS_ERR(d_tracer))

		return 0;



	entry = debugfs_create_file("available_events", 0444, d_tracer,

kernel/trace/trace_functions_graph.c

+1 −1
Original line number Diff line number Diff line
@@ -1437,7 +1437,7 @@ static __init int init_graph_debugfs(void) 
	struct dentry *d_tracer;



	d_tracer = tracing_init_dentry();

	if (!d_tracer)

	if (IS_ERR(d_tracer))

		return 0;



	trace_create_file("max_graph_depth", 0644, d_tracer,

kernel/trace/trace_kprobe.c

+1 −1
Original line number Diff line number Diff line
@@ -1320,7 +1320,7 @@ static __init int init_kprobe_trace(void) 
		return -EINVAL;



	d_tracer = tracing_init_dentry();

	if (!d_tracer)

	if (IS_ERR(d_tracer))

		return 0;



	entry = debugfs_create_file("kprobe_events", 0644, d_tracer,