The following commit has been merged into the locking/core branch of tip:
Commit-ID: 13c267f0c27e35ee9372d3cf0dde1ea09db02f13
Gitweb: https://git.kernel.org/tip/13c267f0c27e35ee9372d3cf0dde1ea09db02f13
Author: Thorsten Blum <thorsten.blum@xxxxxxxxxx>
AuthorDate: Tue, 28 May 2024 14:00:09 +02:00
Committer: Boqun Feng <boqun.feng@xxxxxxxxx>
CommitterDate: Tue, 06 Aug 2024 10:46:42 -07:00
lockdep: Use str_plural() to fix Coccinelle warning
Fixes the following Coccinelle/coccicheck warning reported by
string_choices.cocci:
opportunity for str_plural(depth)
Acked-by: Waiman Long <longman@xxxxxxxxxx>
Signed-off-by: Thorsten Blum <thorsten.blum@xxxxxxxxxx>
Signed-off-by: Boqun Feng <boqun.feng@xxxxxxxxx>
Link: https://lore.kernel.org/r/20240528120008.403511-2-thorsten.blum@xxxxxxxxxx
---
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 fee21f3..266f57f 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -785,7 +785,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.
|