[PATCH] lockdep: Add missing space in error message

[PATCH] lockdep: Add missing space in error message

[Borislav Petkov]

From: Borislav Petkov <bp@suse.de>

... to fix this:

WARNING: lockdep init error! lock-(console_sem).lock was acquiredbefore lockdep_init

Signed-off-by: Borislav Petkov <bp@suse.de>
---
 kernel/locking/lockdep.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index a0831e1b99f4..041ac1add184 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -4066,7 +4066,7 @@ void __init lockdep_info(void)
 
 #ifdef CONFIG_DEBUG_LOCKDEP
 	if (lockdep_init_error) {
-		printk("WARNING: lockdep init error! lock-%s was acquired"
+		printk("WARNING: lockdep init error! lock-%s was acquired "
 			"before lockdep_init\n", lock_init_error);
 		printk("Call stack leading to lockdep invocation was:\n");
 		print_stack_trace(&lockdep_init_trace, 0);
-- 
2.3.5

Re: [PATCH] lockdep: Add missing space in error message

[Ingo Molnar]

* Borislav Petkov <bp@alien8.de> wrote:

> From: Borislav Petkov <bp@suse.de>
> 
> ... to fix this:
> 
> WARNING: lockdep init error! lock-(console_sem).lock was acquiredbefore lockdep_init
> 
> Signed-off-by: Borislav Petkov <bp@suse.de>
> ---
>  kernel/locking/lockdep.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
> index a0831e1b99f4..041ac1add184 100644
> --- a/kernel/locking/lockdep.c
> +++ b/kernel/locking/lockdep.c
> @@ -4066,7 +4066,7 @@ void __init lockdep_info(void)
>  
>  #ifdef CONFIG_DEBUG_LOCKDEP
>  	if (lockdep_init_error) {
> -		printk("WARNING: lockdep init error! lock-%s was acquired"
> +		printk("WARNING: lockdep init error! lock-%s was acquired "
>  			"before lockdep_init\n", lock_init_error);

Please also fix the cause, not just the symptom: the cause is the unnecessary 
line-break in the middle of a user visible string.

Thanks,

	Ingo

[PATCH -v1.1] lockdep: Do not break user-visible string

[Borislav Petkov]

On Tue, Jun 02, 2015 at 01:52:17PM +0200, Ingo Molnar wrote:
> Please also fix the cause, not just the symptom: the cause is the unnecessary 
> line-break in the middle of a user visible string.

v1.1:

---
From: Borislav Petkov <bp@suse.de>
Date: Fri, 29 May 2015 18:49:45 +0200
Subject: [PATCH v1.1] lockdep: Do not break user-visible string

Remove the line-break in the user-visible string and add the missing
space in this error message:

  WARNING: lockdep init error! lock-(console_sem).lock was acquiredbefore lockdep_init

Signed-off-by: Borislav Petkov <bp@suse.de>
---
 kernel/locking/lockdep.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index a0831e1b99f4..4f0b995d86a2 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -4066,8 +4066,7 @@ void __init lockdep_info(void)
 
 #ifdef CONFIG_DEBUG_LOCKDEP
 	if (lockdep_init_error) {
-		printk("WARNING: lockdep init error! lock-%s was acquired"
-			"before lockdep_init\n", lock_init_error);
+		printk("WARNING: lockdep init error! lock-%s was acquired before lockdep_init\n", lock_init_error);
 		printk("Call stack leading to lockdep invocation was:\n");
 		print_stack_trace(&lockdep_init_trace, 0);
 	}
-- 
2.3.5

-- 
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.
--

[tip:locking/core] lockdep: Do not break user-visible string

[tip-bot for Borislav Petkov]

Commit-ID:  92ae18371cb1abb4e186dd9d48de2bb0d9bba626
Gitweb:     http://git.kernel.org/tip/92ae18371cb1abb4e186dd9d48de2bb0d9bba626
Author:     Borislav Petkov <bp@alien8.de>
AuthorDate: Tue, 2 Jun 2015 15:38:27 +0200
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 3 Jun 2015 10:07:09 +0200

lockdep: Do not break user-visible string

Remove the line-break in the user-visible string and add the
missing space in this error message:

  WARNING: lockdep init error! lock-(console_sem).lock was acquiredbefore lockdep_init

Also:

  - don't yell, it's just a debug warning

  - denote references to function calls with '()'

  - standardize the lock name quoting

  - and finish the sentence.

The result:

  WARNING: lockdep init error: lock '(console_sem).lock' was acquired before lockdep_init().

Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20150602133827.GD19887@pd.tnic
[ Added a few more stylistic tweaks to the error message. ]
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 kernel/locking/lockdep.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index a0831e1..a61bb1d3 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -4066,8 +4066,7 @@ void __init lockdep_info(void)
 
 #ifdef CONFIG_DEBUG_LOCKDEP
 	if (lockdep_init_error) {
-		printk("WARNING: lockdep init error! lock-%s was acquired"
-			"before lockdep_init\n", lock_init_error);
+		printk("WARNING: lockdep init error: lock '%s' was acquired before lockdep_init().\n", lock_init_error);
 		printk("Call stack leading to lockdep invocation was:\n");
 		print_stack_trace(&lockdep_init_trace, 0);
 	}