linux-kernel - Re: [PATCH] initrd: Use str_plural() in rd_load

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <wq74que2nuy3gv623ddjptknqqyumae4uyvhvc7fhk6evin4sp@fyefkea25njh>
Date: Fri, 12 Sep 2025 12:50:25 +0200
From: Jan Kara <jack@...e.cz>
To: Thorsten Blum <thorsten.blum@...ux.dev>
Cc: Alexander Viro <viro@...iv.linux.org.uk>, 
	Christian Brauner <brauner@...nel.org>, Jan Kara <jack@...e.cz>, linux-fsdevel@...r.kernel.org, 
	linux-kernel@...r.kernel.org
Subject: Re: [PATCH] initrd: Use str_plural() in rd_load_image()

On Fri 12-09-25 09:46:52, Thorsten Blum wrote:
> Add the local variable 'nr_disks' and replace the manual ternary "s"
> pluralization with the standardized str_plural() helper function.
> 
> Use pr_notice() instead of printk(KERN_NOTICE) to silence a checkpatch
> warning.
> 
> No functional changes intended.
> 
> Signed-off-by: Thorsten Blum <thorsten.blum@...ux.dev>

Looks good. Feel free to add:

Reviewed-by: Jan Kara <jack@...e.cz>

								Honza

> ---
>  init/do_mounts_rd.c | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c
> index ac021ae6e6fa..b8fccc7ffb7d 100644
> --- a/init/do_mounts_rd.c
> +++ b/init/do_mounts_rd.c
> @@ -7,6 +7,7 @@
>  #include <uapi/linux/cramfs_fs.h>
>  #include <linux/initrd.h>
>  #include <linux/string.h>
> +#include <linux/string_choices.h>
>  #include <linux/slab.h>
>  
>  #include "do_mounts.h"
> @@ -186,7 +187,7 @@ static unsigned long nr_blocks(struct file *file)
>  int __init rd_load_image(char *from)
>  {
>  	int res = 0;
> -	unsigned long rd_blocks, devblocks;
> +	unsigned long rd_blocks, devblocks, nr_disks;
>  	int nblocks, i;
>  	char *buf = NULL;
>  	unsigned short rotate = 0;
> @@ -244,8 +245,9 @@ int __init rd_load_image(char *from)
>  		goto done;
>  	}
>  
> -	printk(KERN_NOTICE "RAMDISK: Loading %dKiB [%ld disk%s] into ram disk... ",
> -		nblocks, ((nblocks-1)/devblocks)+1, nblocks>devblocks ? "s" : "");
> +	nr_disks = (nblocks - 1) / devblocks + 1;
> +	pr_notice("RAMDISK: Loading %dKiB [%ld disk%s] into ram disk... ",
> +		  nblocks, nr_disks, str_plural(nr_disks));
>  	for (i = 0; i < nblocks; i++) {
>  		if (i && (i % devblocks == 0)) {
>  			pr_cont("done disk #1.\n");
> -- 
> 2.51.0
> 
-- 
Jan Kara <jack@...e.com>
SUSE Labs, CR