Skip to contentSkip to conversation

ext4: use str_plural() instead of custom macro

PATCH Applied Joshua Crofts 2 participants 2 messages Jul 13 – Jul 23 ext4 file system

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 ext4: use str_plural() instead of custom macro

Remove the custom PLURAL() macro and use str_plural() from string_choices.h instead.

---
Changes in v2:
- Remove redundant blank line
- Link to v1: https://lore.kernel.org/r/[email protected]

---
 fs/ext4/orphan.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
fs/ext4/orphan.c +3 -4
index 64ea47624233..373c1333af48 100644
@@ -4,6 +4,7 @@
 #include <linux/fs.h>
 #include <linux/quotaops.h>
 #include <linux/buffer_head.h>
+#include <linux/string_choices.h>
 
 #include "ext4.h"
 #include "ext4_jbd2.h"
@@ -486,14 +487,12 @@ void ext4_orphan_cleanup(struct super_block *sb, struct ext4_super_block *es)
 		}
 	}
 
-#define PLURAL(x) (x), ((x) == 1) ? "" : "s"
-
 	if (nr_orphans)
 		ext4_msg(sb, KERN_INFO, "%d orphan inode%s deleted",
-		       PLURAL(nr_orphans));
+			 nr_orphans, str_plural(nr_orphans));
 	if (nr_truncates)
 		ext4_msg(sb, KERN_INFO, "%d truncate%s cleaned up",
-		       PLURAL(nr_truncates));
+			 nr_truncates, str_plural(nr_truncates));
 #ifdef CONFIG_QUOTA
 	/* Turn off quotas if they were enabled for orphan cleanup */
 	if (quota_update) {

---
base-commit: c143957520c6c9b5cd72e0de8b52b814f0c576fe
change-id: 20260711-remove-plural-macro-7ecfa879fcae

Best regards,

Signature · 2 lines
Kind regards,
Joshua Crofts
maintainer Applied
#1 lore raw
Quoted 2 lines · Joshua Crofts

Remove the custom PLURAL() macro and use str_plural() from string_choices.h instead.

Applied, thanks!

[1/1] ext4: use str_plural() instead of custom macro

      commit: fef5265969773387cbeb79803de4834e4bbd1d4f

Best regards,

Signature · 1 line
Theodore Ts'o <[email protected]>