From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932412AbbKCSEj (ORCPT ); Tue, 3 Nov 2015 13:04:39 -0500 Received: from mail.kernel.org ([198.145.29.136]:53124 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932252AbbKCSD5 (ORCPT ); Tue, 3 Nov 2015 13:03:57 -0500 Message-Id: <20151103180348.170755515@goodmis.org> User-Agent: quilt/0.61-1 Date: Tue, 03 Nov 2015 13:03:12 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Andrew Morton , , Jiaxing Wang Subject: [for-next][PATCH 04/13] tracing: Update instance_rmdir() to use tracefs_remove_recursive References: <20151103180308.542651732@goodmis.org> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Disposition: inline; filename=0004-tracing-Update-instance_rmdir-to-use-tracefs_remove_.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jiaxing Wang 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 Cc: stable@vger.kernel.org # 4.1+ Fixes: 8434dc9340cd2 ("tracing: Convert the tracing facility over to use tracefs") Signed-off-by: Jiaxing Wang Signed-off-by: Steven Rostedt --- kernel/trace/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 78022c1a125f..67873c67665e 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -6689,7 +6689,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); for (i = 0; i < tr->nr_topts; i++) { -- 2.6.1