ftrace:fix check for return value of register_module_notifier
PATCH 1/1 ftrace:fix check for return value of register_module_notifier
From: Ming Lei <[email protected]>
return zero should be correct, so fix it.
--- kernel/trace/ftrace.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/trace/ftrace.c +1 -1
@@ -2826,7 +2826,7 @@ void __init ftrace_init(void) __stop_mcount_loc); ret =register_module_notifier (&ftrace_module_nb); -if (!ret) +if (ret)pr_warning ("Failed to register trace ftrace module notifier\n" );return ;
Signature · 1 line
1.6.0.GIT
Quoted 14 lines · On Sun, May 17, 2009 at 03:31:38PM +0800, [email protected] wrote:
From: Ming Lei <[email protected]>
return zero should be correct, so fix it.
Signed-off-by Ming Lei <[email protected]>--- kernel/trace/ftrace.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)kernel/trace/ftrace.c +0
-0
kernel/trace/ftrace.c void __init ftrace_init(void) · line 2832
Quoted 8 lines
kernel/trace/ftrace.c +1
-1@@ -2826,7 +2826,7 @@ void __init ftrace_init(void) __stop_mcount_loc); ret =register_module_notifier (&ftrace_module_nb); -if (!ret) +if (ret)pr_warning ("Failed to register trace ftrace module notifier\n" );return ;
Indeed!
register_module_notifier returns blocking_notifier_chain_register():
*
* Currently always returns zero.
*/
int blocking_notifier_chain_register(struct blocking_notifier_head *nh,
struct notifier_block *n)
For now it will never return anything else than 0 but we can keep the warning in case it changes one day, as you did.
Quoted 4 lines · [email protected] wrote:
From: Ming Lei <[email protected]>
return zero should be correct, so fix it.
Nice catch.
We have those bogus warnings:
$ dmesg | grep Failed Failed to register trace ftrace module notifier Failed to register trace events module notifier
Could you fix the same bug in event_trace_init()?
Quoted 18 lines
Signed-off-by Ming Lei <[email protected]>--- kernel/trace/ftrace.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)kernel/trace/ftrace.c +1
-1@@ -2826,7 +2826,7 @@ void __init ftrace_init(void) __stop_mcount_loc); ret =register_module_notifier (&ftrace_module_nb); -if (!ret) +if (ret)pr_warning ("Failed to register trace ftrace module notifier\n" );return ;
2009/5/18 Li Zefan <[email protected]>:
Quoted 8 lines
Quoted 4 lines · [email protected] wrote:
From: Ming Lei <[email protected]>
return zero should be correct, so fix it.
Nice catch.
Quoted 7 lines
We have those bogus warnings:
$ dmesg | grep Failed Failed to register trace ftrace module notifier Failed to register trace events module notifierCould you fix the same bug in
event_trace_init()?
OK, I'll submit it later.
Quoted 20 lines
Quoted 19 lines
Signed-off-by Ming Lei <[email protected]>---
kernel/trace/ftrace.c | 2 +-1 files changed, 1 insertions(+), 1 deletions(-)kernel/trace/ftrace.c +1
-1@@ -2826,7 +2826,7 @@ void __init ftrace_init(void) __stop_mcount_loc); ret = register_module_notifier(&ftrace_module_nb); - if (!ret) + if (ret) pr_warning("Failed to register trace ftrace module notifier\n"); return;
Signature · 1 line
Lei Ming
Ming Lei
Acked-by Frederic WeisbeckerQuoted 1 line
From
d0d91950165f1d0a05ce8f68b333c6f0724b0007Mon Sep 17 00:00:00 2001
From: Ming Lei <[email protected]>
Date: Sun, 17 May 2009 15:26:28 +0800
Subject: [PATCH] ftrace:fix check for return value of register_module_notifier(v2)
return zero should be correct, so fix it.
--- kernel/trace/ftrace.c | 2 +- kernel/trace/trace_events.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
kernel/trace/ftrace.c +1 -1
@@ -2826,7 +2826,7 @@ void __init ftrace_init(void) __stop_mcount_loc); ret =register_module_notifier (&ftrace_module_nb); -if (!ret) +if (ret)pr_warning ("Failed to register trace ftrace module notifier\n" );return ;
kernel/trace/trace_events.c +1 -1
@@ -1174,7 +1174,7 @@ static __init int event_trace_init(void) } ret =register_module_notifier (&trace_module_nb); -if (!ret) +if (ret)pr_warning ("Failed to register trace events module notifier\n" );return 0 ;
Signature · 6 lines
1.6.0.GIT -- Lei Ming
Frederic Weisbecker
Acked-byQuoted 9 lines · Ming Lei
From
d0d91950165f1d0a05ce8f68b333c6f0724b0007Mon Sep 17 00:00:00 2001
From: Ming Lei <[email protected]>
Date: Sun, 17 May 2009 15:26:28 +0800
Subject: [PATCH] ftrace:fix check for return value ofregister_module_notifier(v2)return zero should be correct, so fix it.
Signed-off-by Ming Lei <[email protected]>Signed-off-by Li Zefan <[email protected]>
Hi,
You are making a confusion between Signed-off-by: and Reported-by:
Indeed Li Zefan suggested you to expand your patch to fix another place. And that's what you did in this patch, that's fine.
But Signed-off-by: has a special meaning, please read the Developer's Certificate of Origin 1.1 in Documentation/SubmittingPatches.
You shoudn't add someone else Signed-off-by if he/she didn't gave it to you.
Instead, if you implement in a v2 patch a suggestion someone made while reviewing your v1 patch, you can credit him in the changelog:
v2: change foo, as suggested by li Zefan
And if it's a new patch that addresses a new review, you can just put a Reported-by: tag.
Your first patch have been applied in tip:/tracing/core topic. So could you please send a new patch which addresses only the event_trace_init() callsite?
You can add the
and also my
in advance.
Thanks Ming!
Frederic.
Quoted 44 lines
--- kernel/trace/ftrace.c | 2 +- kernel/trace/trace_events.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)kernel/trace/ftrace.c +1
-1@@ -2826,7 +2826,7 @@ void __init ftrace_init(void) __stop_mcount_loc); ret =register_module_notifier (&ftrace_module_nb); -if (!ret) +if (ret)pr_warning ("Failed to register trace ftrace module notifier\n" );return ;kernel/trace/trace_events.c +1
-1@@ -1174,7 +1174,7 @@ static __init int event_trace_init(void) } ret =register_module_notifier (&trace_module_nb); -if (!ret) +if (ret)pr_warning ("Failed to register trace events module notifier\n" );return 0 ;Signature · 11 lines
1.6.0.GIT -- Lei Ming -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Ming Lei
Acked-by Frederic WeisbeckerThis patch fixes another check in event_trace_init. Thanks.
Quoted 1 line
From
121f44b1658c137b8404756fdbd97dcf1d0c58f9Mon Sep 17 00:00:00 2001
From: Ming Lei <[email protected]>
Date: Mon, 18 May 2009 23:04:46 +0800
Subject: [PATCH] ftrace:fix check for return value of register_module_notifier in event_trace_init
return zero should be correct, so fix it.
--- kernel/trace/trace_events.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/trace/trace_events.c +1 -1
@@ -1174,7 +1174,7 @@ static __init int event_trace_init(void) } ret =register_module_notifier (&trace_module_nb); -if (!ret) +if (ret)pr_warning ("Failed to register trace events module notifier\n" );return 0 ;
Signature · 5 lines
1.6.0.GIT -- Lei Ming
[tip:tracing/core] tracing: fix check for return value of register_module_notifier
In reply to [email protected]Commit-ID: 24ed0c4bfc7d2d7507bb9d50f7f3bbdcd85d76dd Gitweb: http://git.kernel.org/tip/24ed0c4bfc7d2d7507bb9d50f7f3bbdcd85d76dd Author: Ming Lei <[email protected]> AuthorDate: Sun, 17 May 2009 15:31:38 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Mon, 18 May 2009 10:24:13 +0200
tracing: fix check for return value of register_module_notifier
return zero should be correct, so fix it.
[ Impact: eliminate incorrect syslog message ]
LKML-Reference: <[email protected]>
--- kernel/trace/ftrace.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/trace/ftrace.c +1 -1
@@ -2826,7 +2826,7 @@ void __init ftrace_init(void) __stop_mcount_loc); ret =register_module_notifier (&ftrace_module_nb); -if (!ret) +if (ret)pr_warning ("Failed to register trace ftrace module notifier\n" );return ;