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>

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 929a733d302e0d438d2f15f8dfaf6e2e4c56c0d0..80c9d34540ddbc7ece4d9cc42e62edf5bd1ced7f 100644 (file)
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -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);

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 7669b1f3234e0da02a4c6ac910033dd688b0cfa6..acd27555dc5be84f937b365ff323f72bc2752cb4 100644 (file)
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -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);

diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index 366a78a3e61e21a94c06aa96f5b5c02a72c41e78..4ff8c1394017a2a3dd74114f921206f9281a32bd 100644 (file)
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -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,

diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
index ba476009e5de49a89321f7b1d31f2e0d0d5bd63b..2d25ad1526bb16f28e9f18f1d3b0edf2b7093341 100644 (file)
--- a/kernel/trace/trace_functions_graph.c
+++ b/kernel/trace/trace_functions_graph.c
@@ -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,

diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index 5edb518be3458a01096351f0562fb84ce5f9b231..b4a00def88f5c5784e0d0a8ffd18edbfac694f23 100644 (file)
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -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,

diff --git a/kernel/trace/trace_printk.c b/kernel/trace/trace_printk.c
index 7ee4b5cc1ce50193699c8bfb3001857de6af896f..36c1455b7567ee11f2305cc71b2aa9f48c2a0ae1 100644 (file)
--- a/kernel/trace/trace_printk.c
+++ b/kernel/trace/trace_printk.c
@@ -347,7 +347,7 @@ static __init int init_trace_printk_function_export(void)
        struct dentry *d_tracer;
 
        d_tracer = tracing_init_dentry();
-       if (!d_tracer)
+       if (IS_ERR(d_tracer))
                return 0;
 
        trace_create_file("printk_formats", 0444, d_tracer,

diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
index e80927b88eb046684194de77a685dc8ff11016c2..c3e4fcfddd4580f898cda317b326ee4675214ceb 100644 (file)
--- a/kernel/trace/trace_stack.c
+++ b/kernel/trace/trace_stack.c
@@ -460,7 +460,7 @@ static __init int stack_trace_init(void)
        struct dentry *d_tracer;
 
        d_tracer = tracing_init_dentry();
-       if (!d_tracer)
+       if (IS_ERR(d_tracer))
                return 0;
 
        trace_create_file("stack_max_size", 0644, d_tracer,

diff --git a/kernel/trace/trace_stat.c b/kernel/trace/trace_stat.c
index 7af67360b3307413865e2ed0719ea63894f01016..75e19e86c9548044c3a6a712ca73b9bb02d74e50 100644 (file)
--- a/kernel/trace/trace_stat.c
+++ b/kernel/trace/trace_stat.c
@@ -276,7 +276,7 @@ static int tracing_stat_init(void)
        struct dentry *d_tracing;
 
        d_tracing = tracing_init_dentry();
-       if (!d_tracing)
+       if (IS_ERR(d_tracing))
                return 0;
 
        stat_dir = debugfs_create_dir("trace_stat", d_tracing);

diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index 8520acc34b185f7cb05fcbc4a2a30685dce0ef13..5f0eba9e5e6bcb6566f4ccd291dc8ebe8ac1b4d8 100644 (file)
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -1321,7 +1321,7 @@ static __init int init_uprobe_trace(void)
        struct dentry *d_tracer;
 
        d_tracer = tracing_init_dentry();
-       if (!d_tracer)
+       if (IS_ERR(d_tracer))
                return 0;
 
        trace_create_file("uprobe_events", 0644, d_tracer,