Skip to content

Commit 14a5ae4

Browse files
committed
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: Steven Rostedt <rostedt@goodmis.org>
1 parent 3efb5f2 commit 14a5ae4

9 files changed

+12
-12
lines changed

kernel/trace/ftrace.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -5419,7 +5419,7 @@ static __init int ftrace_init_debugfs(void)
54195419
struct dentry *d_tracer;
54205420

54215421
d_tracer = tracing_init_dentry();
5422-
if (!d_tracer)
5422+
if (IS_ERR(d_tracer))
54235423
return 0;
54245424

54255425
ftrace_init_dyn_debugfs(d_tracer);

kernel/trace/trace.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -5820,7 +5820,7 @@ struct dentry *tracing_init_dentry_tr(struct trace_array *tr)
58205820
return tr->dir;
58215821

58225822
if (!debugfs_initialized())
5823-
return NULL;
5823+
return ERR_PTR(-ENODEV);
58245824

58255825
if (tr->flags & TRACE_ARRAY_FL_GLOBAL)
58265826
tr->dir = debugfs_create_dir("tracing", NULL);
@@ -5844,7 +5844,7 @@ static struct dentry *tracing_dentry_percpu(struct trace_array *tr, int cpu)
58445844
return tr->percpu_dir;
58455845

58465846
d_tracer = tracing_init_dentry_tr(tr);
5847-
if (!d_tracer)
5847+
if (IS_ERR(d_tracer))
58485848
return NULL;
58495849

58505850
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)
60476047
return tr->options;
60486048

60496049
d_tracer = tracing_init_dentry_tr(tr);
6050-
if (!d_tracer)
6050+
if (IS_ERR(d_tracer))
60516051
return NULL;
60526052

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

65406540
d_tracer = tracing_init_dentry();
6541-
if (!d_tracer)
6541+
if (IS_ERR(d_tracer))
65426542
return 0;
65436543

65446544
init_tracer_debugfs(&global_trace, d_tracer);

kernel/trace/trace_events.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2490,7 +2490,7 @@ static __init int event_trace_init(void)
24902490
return -ENODEV;
24912491

24922492
d_tracer = tracing_init_dentry();
2493-
if (!d_tracer)
2493+
if (IS_ERR(d_tracer))
24942494
return 0;
24952495

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

kernel/trace/trace_functions_graph.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1437,7 +1437,7 @@ static __init int init_graph_debugfs(void)
14371437
struct dentry *d_tracer;
14381438

14391439
d_tracer = tracing_init_dentry();
1440-
if (!d_tracer)
1440+
if (IS_ERR(d_tracer))
14411441
return 0;
14421442

14431443
trace_create_file("max_graph_depth", 0644, d_tracer,

kernel/trace/trace_kprobe.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1320,7 +1320,7 @@ static __init int init_kprobe_trace(void)
13201320
return -EINVAL;
13211321

13221322
d_tracer = tracing_init_dentry();
1323-
if (!d_tracer)
1323+
if (IS_ERR(d_tracer))
13241324
return 0;
13251325

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

kernel/trace/trace_printk.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ static __init int init_trace_printk_function_export(void)
347347
struct dentry *d_tracer;
348348

349349
d_tracer = tracing_init_dentry();
350-
if (!d_tracer)
350+
if (IS_ERR(d_tracer))
351351
return 0;
352352

353353
trace_create_file("printk_formats", 0444, d_tracer,

kernel/trace/trace_stack.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ static __init int stack_trace_init(void)
460460
struct dentry *d_tracer;
461461

462462
d_tracer = tracing_init_dentry();
463-
if (!d_tracer)
463+
if (IS_ERR(d_tracer))
464464
return 0;
465465

466466
trace_create_file("stack_max_size", 0644, d_tracer,

kernel/trace/trace_stat.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ static int tracing_stat_init(void)
276276
struct dentry *d_tracing;
277277

278278
d_tracing = tracing_init_dentry();
279-
if (!d_tracing)
279+
if (IS_ERR(d_tracing))
280280
return 0;
281281

282282
stat_dir = debugfs_create_dir("trace_stat", d_tracing);

kernel/trace/trace_uprobe.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1321,7 +1321,7 @@ static __init int init_uprobe_trace(void)
13211321
struct dentry *d_tracer;
13221322

13231323
d_tracer = tracing_init_dentry();
1324-
if (!d_tracer)
1324+
if (IS_ERR(d_tracer))
13251325
return 0;
13261326

13271327
trace_create_file("uprobe_events", 0644, d_tracer,

0 commit comments

Comments
 (0)