Use the string choice helper function to simplify the code.

Signed-off-by: Lalit Shankar Chowdhury <lalitshankarch@gmail.com>
---
 kernel/bpf/diagnostics.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/bpf/diagnostics.c b/kernel/bpf/diagnostics.c
index 0abbbe177e31..ff139777ac64 100644
--- a/kernel/bpf/diagnostics.c
+++ b/kernel/bpf/diagnostics.c
@@ -2354,6 +2354,6 @@ static void diag_print_history(struct bpf_verifier_env *env,
 	if (log->first_seq)
 		diag_write(env, "  %llu older causal-history event%s not retained because diagnostic "
 			   "event storage reached capacity\n",
-			   log->first_seq, log->first_seq == 1 ? "" : "s");
+			   log->first_seq, str_plural(log->first_seq));
 	diag_fmt_restore(env, mark);
 }
-- 
2.53.0

On Thu Sep 17, 2026 at 8:46 PM UTC, Lalit Shankar Chowdhury wrote:
> Use the string choice helper function to simplify the code.
>
> Signed-off-by: Lalit Shankar Chowdhury <lalitshankarch@gmail.com>
> ---
>  kernel/bpf/diagnostics.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/kernel/bpf/diagnostics.c b/kernel/bpf/diagnostics.c
> index 0abbbe177e31..ff139777ac64 100644
> --- a/kernel/bpf/diagnostics.c
> +++ b/kernel/bpf/diagnostics.c
> @@ -2354,6 +2354,6 @@ static void diag_print_history(struct bpf_verifier_env *env,
>  	if (log->first_seq)
>  		diag_write(env, "  %llu older causal-history event%s not retained because diagnostic "
>  			   "event storage reached capacity\n",
> -			   log->first_seq, log->first_seq == 1 ? "" : "s");
> +			   log->first_seq, str_plural(log->first_seq));

Nack.

Instead propose a revert of commit 9ca5facd0400f I will be fully
supporitve to delete this obfuscation garbage.

pw-bot: cr