[PATCH v6 02/10] ext4: Use generic_ci_validate_strict_name helper
From: André Almeida
Date: Thu Oct 10 2024 - 15:43:04 EST
Use the helper function to check the requirements for casefold
directories using strict encoding.
Suggested-by: Gabriel Krisman Bertazi <krisman@xxxxxxx>
Signed-off-by: André Almeida <andrealmeid@xxxxxxxxxx>
Acked-by: Theodore Ts'o <tytso@xxxxxxx>
Reviewed-by: Gabriel Krisman Bertazi <krisman@xxxxxxx>
---
Changes from v4:
- Now we can drop the if IS_ENABLED() guard
---
fs/ext4/namei.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 790db7eac6c2ad5e1790e363e4ac273162e35013..612ccbeb493b8d901c123221ef6573457193dd16 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -2395,11 +2395,8 @@ static int ext4_add_entry(handle_t *handle, struct dentry *dentry,
if (fscrypt_is_nokey_name(dentry))
return -ENOKEY;
-#if IS_ENABLED(CONFIG_UNICODE)
- if (sb_has_strict_encoding(sb) && IS_CASEFOLDED(dir) &&
- utf8_validate(sb->s_encoding, &dentry->d_name))
+ if (!generic_ci_validate_strict_name(dir, &dentry->d_name))
return -EINVAL;
-#endif
retval = ext4_fname_setup_filename(dir, &dentry->d_name, 0, &fname);
if (retval)
--
2.47.0