Received-SPF: pass (google.com: domain of linux-kernel+bounces-122915-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Message-ID: <9b15de60-b593-4b0c-bacc-ebe79de5d541@redhat.com>
Date: Thu, 28 Mar 2024 08:41:10 -0400
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH] lockdep: Use str_plural() to fix Coccinelle warning
Content-Language: en-US
To: Thorsten Blum <thorsten.blum@toblux.com>,
 Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@redhat.com>,
 Will Deacon <will@kernel.org>
Cc: Boqun Feng <boqun.feng@gmail.com>, linux-kernel@vger.kernel.org
References: <20240328100952.200379-3-thorsten.blum@toblux.com>
From: Waiman Long <longman@redhat.com>
In-Reply-To: <20240328100952.200379-3-thorsten.blum@toblux.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit

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>