[PATCH] tracing: Do not call kmem_cache_free() on allocation failure

[PATCH] tracing: Do not call kmem_cache_free() on allocation failure

[Namhyung Kim]

From: Namhyung Kim <namhyung.kim@lge.com>

There's no point calling it when _alloc() failed.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
 kernel/trace/trace_events.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index 27963e2bf4bf..bb4950b552b5 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -97,7 +97,7 @@ static int __trace_define_field(struct list_head *head, const char *type,
 
 	field = kmem_cache_alloc(field_cachep, GFP_TRACE);
 	if (!field)
-		goto err;
+		return -ENOMEM;
 
 	field->name = name;
 	field->type = type;
@@ -114,11 +114,6 @@ static int __trace_define_field(struct list_head *head, const char *type,
 	list_add(&field->link, head);
 
 	return 0;
-
-err:
-	kmem_cache_free(field_cachep, field);
-
-	return -ENOMEM;
 }
 
 int trace_define_field(struct ftrace_event_call *call, const char *type,
-- 
1.7.11.7

Re: [PATCH] tracing: Do not call kmem_cache_free() on allocation failure

[Steven Rostedt]

On Fri, 2013-06-07 at 15:07 +0900, Namhyung Kim wrote:
> From: Namhyung Kim <namhyung.kim@lge.com>
> 
> There's no point calling it when _alloc() failed.

Thanks, I queued this up for 3.11 as it's not that important for a late
-rc release.

-- Steve

> 
> Signed-off-by: Namhyung Kim <namhyung@kernel.org>
> ---
>  kernel/trace/trace_events.c | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
> index 27963e2bf4bf..bb4950b552b5 100644
> --- a/kernel/trace/trace_events.c
> +++ b/kernel/trace/trace_events.c
> @@ -97,7 +97,7 @@ static int __trace_define_field(struct list_head *head, const char *type,
>  
>  	field = kmem_cache_alloc(field_cachep, GFP_TRACE);
>  	if (!field)
> -		goto err;
> +		return -ENOMEM;
>  
>  	field->name = name;
>  	field->type = type;
> @@ -114,11 +114,6 @@ static int __trace_define_field(struct list_head *head, const char *type,
>  	list_add(&field->link, head);
>  
>  	return 0;
> -
> -err:
> -	kmem_cache_free(field_cachep, field);
> -
> -	return -ENOMEM;
>  }
>  
>  int trace_define_field(struct ftrace_event_call *call, const char *type,