[PATCH 2/3] trace: provide correct return value after outputting the event.

[PATCH 2/3] trace: provide correct return value after outputting the event.

[Wenji Huang]

This patch is to make the function early return once failure and give
correct return value in case of success.

Signed-off-by: Wenji Huang <wenji.huang@oracle.com>
---
 kernel/trace/trace_functions_graph.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
index 782ec0f..519a0ca 100644
--- a/kernel/trace/trace_functions_graph.c
+++ b/kernel/trace/trace_functions_graph.c
@@ -186,30 +186,30 @@ verif_pid(struct trace_seq *s, pid_t pid, int cpu, pid_t *last_pids_cpu)
 	ret = trace_seq_printf(s,
 		" ------------------------------------------\n");
 	if (!ret)
-		TRACE_TYPE_PARTIAL_LINE;
+		return TRACE_TYPE_PARTIAL_LINE;
 
 	ret = print_graph_cpu(s, cpu);
 	if (ret == TRACE_TYPE_PARTIAL_LINE)
-		TRACE_TYPE_PARTIAL_LINE;
+		return TRACE_TYPE_PARTIAL_LINE;
 
 	ret = print_graph_proc(s, prev_pid);
 	if (ret == TRACE_TYPE_PARTIAL_LINE)
-		TRACE_TYPE_PARTIAL_LINE;
+		return TRACE_TYPE_PARTIAL_LINE;
 
 	ret = trace_seq_printf(s, " => ");
 	if (!ret)
-		TRACE_TYPE_PARTIAL_LINE;
+		return TRACE_TYPE_PARTIAL_LINE;
 
 	ret = print_graph_proc(s, pid);
 	if (ret == TRACE_TYPE_PARTIAL_LINE)
-		TRACE_TYPE_PARTIAL_LINE;
+		return TRACE_TYPE_PARTIAL_LINE;
 
 	ret = trace_seq_printf(s,
 		"\n ------------------------------------------\n\n");
 	if (!ret)
-		TRACE_TYPE_PARTIAL_LINE;
+		return TRACE_TYPE_PARTIAL_LINE;
 
-	return ret;
+	return TRACE_TYPE_HANDLED;
 }
 
 static struct ftrace_graph_ret_entry *
-- 
1.5.6

Re: [PATCH 2/3] trace: provide correct return value after outputting the event.

[Frederic Weisbecker]

On Tue, Feb 10, 2009 at 01:03:05AM -0500, Wenji Huang wrote:
> This patch is to make the function early return once failure and give
> correct return value in case of success.
> 
> Signed-off-by: Wenji Huang <wenji.huang@oracle.com>
> ---
>  kernel/trace/trace_functions_graph.c |   14 +++++++-------
>  1 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
> index 782ec0f..519a0ca 100644
> --- a/kernel/trace/trace_functions_graph.c
> +++ b/kernel/trace/trace_functions_graph.c
> @@ -186,30 +186,30 @@ verif_pid(struct trace_seq *s, pid_t pid, int cpu, pid_t *last_pids_cpu)
>  	ret = trace_seq_printf(s,
>  		" ------------------------------------------\n");
>  	if (!ret)
> -		TRACE_TYPE_PARTIAL_LINE;
> +		return TRACE_TYPE_PARTIAL_LINE;
>  
>  	ret = print_graph_cpu(s, cpu);
>  	if (ret == TRACE_TYPE_PARTIAL_LINE)
> -		TRACE_TYPE_PARTIAL_LINE;
> +		return TRACE_TYPE_PARTIAL_LINE;
>  
>  	ret = print_graph_proc(s, prev_pid);
>  	if (ret == TRACE_TYPE_PARTIAL_LINE)
> -		TRACE_TYPE_PARTIAL_LINE;
> +		return TRACE_TYPE_PARTIAL_LINE;
>  
>  	ret = trace_seq_printf(s, " => ");
>  	if (!ret)
> -		TRACE_TYPE_PARTIAL_LINE;
> +		return TRACE_TYPE_PARTIAL_LINE;
>  
>  	ret = print_graph_proc(s, pid);
>  	if (ret == TRACE_TYPE_PARTIAL_LINE)
> -		TRACE_TYPE_PARTIAL_LINE;
> +		return TRACE_TYPE_PARTIAL_LINE;
>  
>  	ret = trace_seq_printf(s,
>  		"\n ------------------------------------------\n\n");
>  	if (!ret)
> -		TRACE_TYPE_PARTIAL_LINE;
> +		return TRACE_TYPE_PARTIAL_LINE;
>  
> -	return ret;
> +	return TRACE_TYPE_HANDLED;
>  }
>  
>  static struct ftrace_graph_ret_entry *
> -- 
> 1.5.6
> 

How could I have forgotten the return statements here...?

Anyway, the three patches look good.
Thanks!

Acked-by: Frederic Weisbecker <fweisbec@gmail.com>