| Message ID | 1451949726-25290-1-git-send-email-kamal@canonical.com |
|---|---|
| State | New |
| Headers | show |
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index abcbf7f..126f8f6 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);
This is a note to let you know that I have just added a patch titled tracing: Update instance_rmdir() to use tracefs_remove_recursive to the linux-4.2.y-queue branch of the 4.2.y-ckt extended stable tree which can be found at: http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-4.2.y-queue This patch is scheduled to be released in version 4.2.8-ckt1. If you, or anyone else, feels it should not be added to this tree, please reply to this email. For more information about the 4.2.y-ckt tree, see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable Thanks. -Kamal ------ From 560e1f00861c4b229f8d57e7774ab1f36c9475eb Mon Sep 17 00:00:00 2001 From: Jiaxing Wang <hello.wjx@gmail.com> Date: Sun, 18 Oct 2015 19:58:08 +0800 Subject: 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 <hello.wjx@gmail.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Kamal Mostafa <kamal@canonical.com> --- kernel/trace/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.9.1