From: Jiaxing Wang Date: Sun, 18 Oct 2015 11:58:08 +0000 (+0800) Subject: tracing: Update instance_rmdir() to use tracefs_remove_recursive X-Git-Tag: v4.3.6~138 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fcbeb18d7ae4aae88006890998efad7c6141dc15;p=thirdparty%2Fkernel%2Fstable.git tracing: Update instance_rmdir() to use tracefs_remove_recursive 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 Signed-off-by: Steven Rostedt Signed-off-by: Greg Kroah-Hartman --- diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 6e79408674aaa..69f97541ce6e3 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -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);