[PATCH] ntfs: use str_plural in ntfs_attr_make_non_resident

Thorsten Blum posted 1 patch 1 month ago
fs/ntfs/attrib.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
[PATCH] ntfs: use str_plural in ntfs_attr_make_non_resident
Posted by Thorsten Blum 1 month ago
Replace the manual ternary "s" pluralization with str_plural() to
simplify the code.

Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
---
 fs/ntfs/attrib.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fs/ntfs/attrib.c b/fs/ntfs/attrib.c
index 97b660eaa00c..162aad2cd08e 100644
--- a/fs/ntfs/attrib.c
+++ b/fs/ntfs/attrib.c
@@ -16,6 +16,7 @@
  * Copyright (c) 2010 Erik Larsson
  */
 
+#include <linux/string_choices.h>
 #include <linux/writeback.h>
 #include <linux/iomap.h>
 
@@ -1857,7 +1858,7 @@ int ntfs_attr_make_non_resident(struct ntfs_inode *ni, const u32 data_size)
 		if (IS_ERR(rl)) {
 			err = PTR_ERR(rl);
 			ntfs_debug("Failed to allocate cluster%s, error code %i.",
-					ntfs_bytes_to_cluster(vol, new_size) > 1 ? "s" : "",
+					str_plural(ntfs_bytes_to_cluster(vol, new_size)),
 					err);
 			goto folio_err_out;
 		}
Re: [PATCH] ntfs: use str_plural in ntfs_attr_make_non_resident
Posted by Namjae Jeon 1 month ago
On Mon, May 11, 2026 at 6:51 PM Thorsten Blum <thorsten.blum@linux.dev> wrote:
>
> Replace the manual ternary "s" pluralization with str_plural() to
> simplify the code.
>
> Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
Applied it to #ntfs-next.
Thanks!