]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
tracing: Update instance_rmdir() to use tracefs_remove_recursive
authorJiaxing Wang <hello.wjx@gmail.com>
Sun, 18 Oct 2015 11:58:08 +0000 (19:58 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 19 Feb 2016 22:28:27 +0000 (14:28 -0800)
commit 681a4a2f4529517422835b7395df07404dfe2278 upstream.

Update instancd_rmdir to use tracefs_remove_recursive instead of
debugfs_remove_recursive.This was left in the transition from debugfs
to tracefs.

Link: http://lkml.kernel.org/r/1445169490-18315-2-git-send-email-hello.wjx@gmail.com
Fixes: 8434dc9340cd2 ("tracing: Convert the tracing facility over to use tracefs")
Signed-off-by: Jiaxing Wang <hello.wjx@gmail.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
kernel/trace/trace.c

index 6e79408674aaa15e7f5be7da0e86488599fdfa0f..69f97541ce6e37f2d5bbeda39cf7888443521f7b 100644 (file)
@@ -6602,7 +6602,7 @@ static int instance_rmdir(const char *name)
        tracing_set_nop(tr);
        event_trace_del_tracer(tr);
        ftrace_destroy_function_files(tr);
-       debugfs_remove_recursive(tr->dir);
+       tracefs_remove_recursive(tr->dir);
        free_trace_buffers(tr);
 
        kfree(tr->name);