leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
Steven Rostedt (Red Hat)
2015-01-20 11:14:16 -05:00
committed by Steven Rostedt
parent 3efb5f21a3
commit 14a5ae40f0
9 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/trace/trace.c
View File

@@ -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);