dm vdo: Use str_plural() to simplify the code

[PATCH] dm vdo: Use str_plural() to simplify the code

Posted by Xichao Zhao 1 month ago

Use the string choice helper function str_plural() to simplify the code.

Signed-off-by: Xichao Zhao <zhao.xichao@vivo.com>
---
 drivers/md/raid0.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index cbe2a9054cb9..a2e59a8d441f 100644
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -41,7 +41,7 @@ static void dump_zones(struct mddev *mddev)
 	int raid_disks = conf->strip_zone[0].nb_dev;
 	pr_debug("md: RAID0 configuration for %s - %d zone%s\n",
 		 mdname(mddev),
-		 conf->nr_strip_zones, conf->nr_strip_zones==1?"":"s");
+		 conf->nr_strip_zones, str_plural(conf->nr_strip_zones));
 	for (j = 0; j < conf->nr_strip_zones; j++) {
 		char line[200];
 		int len = 0;
-- 
2.34.1

Re: [PATCH] dm vdo: Use str_plural() to simplify the code

Posted by Li Nan 1 month ago


在 2025/8/28 19:27, Xichao Zhao 写道:
> Use the string choice helper function str_plural() to simplify the code.
> 
> Signed-off-by: Xichao Zhao <zhao.xichao@vivo.com>
> ---
>   drivers/md/raid0.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
> index cbe2a9054cb9..a2e59a8d441f 100644
> --- a/drivers/md/raid0.c
> +++ b/drivers/md/raid0.c

Why subject is 'dm vdo'? The modified file is raid0. Please check before
sending.

> @@ -41,7 +41,7 @@ static void dump_zones(struct mddev *mddev)
>   	int raid_disks = conf->strip_zone[0].nb_dev;
>   	pr_debug("md: RAID0 configuration for %s - %d zone%s\n",
>   		 mdname(mddev),
> -		 conf->nr_strip_zones, conf->nr_strip_zones==1?"":"s");
> +		 conf->nr_strip_zones, str_plural(conf->nr_strip_zones));
>   	for (j = 0; j < conf->nr_strip_zones; j++) {
>   		char line[200];
>   		int len = 0;

-- 
Thanks,
Nan