Merge tag 'zonefs-6.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs

torvalds · torvalds · commit 76b0e9c42996 · 2024-04-13T10:25:32.000-07:00
Pull zonefs fix from Damien Le Moal:

 - Suppress a coccicheck warning using str_plural()

* tag 'zonefs-6.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs:
  zonefs: Use str_plural() to fix Coccinelle warning
diff --git a/fs/zonefs/super.c b/fs/zonefs/super.c
@@ -1048,7 +1048,7 @@ static int zonefs_init_zgroup(struct super_block *sb,
 	zonefs_info(sb, "Zone group \"%s\" has %u file%s\n",
 		    zonefs_zgroup_name(ztype),
 		    zgroup->g_nr_zones,
-		    zgroup->g_nr_zones > 1 ? "s" : "");
+		    str_plural(zgroup->g_nr_zones));
 
 	return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -1048,7 +1048,7 @@ static int zonefs_init_zgroup(struct super_block *sb,`
`1048`	`1048`	`zonefs_info(sb, "Zone group \"%s\" has %u file%s\n",`
`1049`	`1049`	`zonefs_zgroup_name(ztype),`
`1050`	`1050`	`zgroup->g_nr_zones,`
`1051`		`- zgroup->g_nr_zones > 1 ? "s" : "");`
	`1051`	`+ str_plural(zgroup->g_nr_zones));`
`1052`	`1052`
`1053`	`1053`	`return 0;`
`1054`	`1054`	`}`