Re: [PATCH 2/2] tracing: Fix error handling to ensure instances canalways be removed

[Steven Rostedt]

On Wed, 2013-07-10 at 17:34 -0700, Alexander Z Lam wrote:
> Remove debugfs directories for tracing instances during creation if an error
> occurs causing the trace_array for that instance to not be added to
> ftrace_trace_arrays. If the directory continues to exist after the error, it
> cannot be removed because the respective trace_array is not in
> ftrace_trace_arrays.

This patch is fine, I'll put it in now.

Thanks,

-- Steve

> 
> Cc: Vaibhav Nagarnaik <vnagarnaik@xxxxxxxxxx>
> Cc: David Sharp <dhsharp@xxxxxxxxxx>
> Cc: Alexander Z Lam <lambchop468@xxxxxxxxx>
> Signed-off-by: Alexander Z Lam <azl@xxxxxxxxxx>
> ---
>  kernel/trace/trace.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
> index ca2743b..4ea9967 100644
> --- a/kernel/trace/trace.c
> +++ b/kernel/trace/trace.c
> @@ -5985,8 +5985,10 @@ static int new_instance_create(const char *name)
>  		goto out_free_tr;
>  
>  	ret = event_trace_add_tracer(tr->dir, tr);
> -	if (ret)
> +	if (ret) {
> +		debugfs_remove_recursive(tr->dir);
>  		goto out_free_tr;
> +	}
>  
>  	init_tracer_debugfs(tr, tr->dir);
>  


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/