mirror of
https://github.com/linux-msm/laptops-kernel.git
synced 2026-08-13 14:19:53 -07:00
ext4: use str_plural() instead of custom macro
Remove the custom PLURAL() macro and use str_plural() from string_choices.h instead. Reviewed-by: Baokun Li <libaokun@huawei.com> Reviewed-by: Jan Kara <jack@suse.cz> Signed-off-by: Joshua Crofts <joshua.crofts1@gmail.com> Link: https://patch.msgid.link/20260713-remove-plural-macro-v2-1-424e1536ac10@gmail.com Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
committed by
Theodore Ts'o
parent
2a4c637d6f
commit
fef5265969
+3
-4
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user