[v1] lockdep: Use str_plural() to fix Coccinelle warning

[PATCH] lockdep: Use str_plural() to fix Coccinelle warning

Posted by Thorsten Blum 1 year, 10 months ago

Fixes the following Coccinelle/coccicheck warning reported by
string_choices.cocci:

	opportunity for str_plural(depth)

Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com>
---
 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 151bd3de5936..31d7720c9b8d 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -786,7 +786,7 @@ static void lockdep_print_held_locks(struct task_struct *p)
 		printk("no locks held by %s/%d.\n", p->comm, task_pid_nr(p));
 	else
 		printk("%d lock%s held by %s/%d:\n", depth,
-		       depth > 1 ? "s" : "", p->comm, task_pid_nr(p));
+		       str_plural(depth), p->comm, task_pid_nr(p));
 	/*
 	 * It's not reliable to print a task's held locks if it's not sleeping
 	 * and it's not the current task.
-- 
2.44.0

Re: [PATCH] lockdep: Use str_plural() to fix Coccinelle warning

Posted by Waiman Long 1 year, 10 months ago

On 3/28/24 06:09, Thorsten Blum wrote:
> Fixes the following Coccinelle/coccicheck warning reported by
> string_choices.cocci:
>
> 	opportunity for str_plural(depth)
>
> Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com>
> ---
>   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 151bd3de5936..31d7720c9b8d 100644
> --- a/kernel/locking/lockdep.c
> +++ b/kernel/locking/lockdep.c
> @@ -786,7 +786,7 @@ static void lockdep_print_held_locks(struct task_struct *p)
>   		printk("no locks held by %s/%d.\n", p->comm, task_pid_nr(p));
>   	else
>   		printk("%d lock%s held by %s/%d:\n", depth,
> -		       depth > 1 ? "s" : "", p->comm, task_pid_nr(p));
> +		       str_plural(depth), p->comm, task_pid_nr(p));
>   	/*
>   	 * It's not reliable to print a task's held locks if it's not sleeping
>   	 * and it's not the current task.
Acked-by: Waiman Long <longman@redhat.com>

[RESEND PATCH] lockdep: Use str_plural() to fix Coccinelle warning

Posted by Thorsten Blum 1 year, 9 months ago

Fixes the following Coccinelle/coccicheck warning reported by
string_choices.cocci:

	opportunity for str_plural(depth)

Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com>
Acked-by: Waiman Long <longman@redhat.com>
---
 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 151bd3de5936..31d7720c9b8d 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -786,7 +786,7 @@ static void lockdep_print_held_locks(struct task_struct *p)
 		printk("no locks held by %s/%d.\n", p->comm, task_pid_nr(p));
 	else
 		printk("%d lock%s held by %s/%d:\n", depth,
-		       depth > 1 ? "s" : "", p->comm, task_pid_nr(p));
+		       str_plural(depth), p->comm, task_pid_nr(p));
 	/*
 	 * It's not reliable to print a task's held locks if it's not sleeping
 	 * and it's not the current task.
-- 
2.44.0