[f2fs-dev] [PATCH v4 05/10] ext4: Simplify hash check on ext4_match

[Gabriel Krisman Bertazi]

The existence of fname->cf_name.name requires s_encoding & IS_CASEFOLDED,
therefore this can be simplified.

Signed-off-by: Gabriel Krisman Bertazi <kris...@collabora.com>
---
 fs/ext4/namei.c | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 5296ced2e43e..cebbcabf0ff0 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -1438,25 +1438,19 @@ static bool ext4_match(struct inode *parent,
 #endif
 
 #if IS_ENABLED(CONFIG_UNICODE)
-       if (parent->i_sb->s_encoding && IS_CASEFOLDED(parent) &&
-           (!IS_ENCRYPTED(parent) || fscrypt_has_encryption_key(parent))) {
+       if (IS_ENCRYPTED(parent) && fname->cf_name.name) {
+               if (fname->hinfo.hash != EXT4_DIRENT_HASH(de) ||
+                   fname->hinfo.minor_hash != EXT4_DIRENT_MINOR_HASH(de))
+                       return false;
+       }
+
+       if (parent->i_sb->s_encoding && IS_CASEFOLDED(parent)) {
                struct unicode_name u = {
                        .folded_name = &fname->cf_name,
                        .usr_name = fname->usr_fname
                };
                int ret;
 
-               if (fname->cf_name.name) {
-                       if (IS_ENCRYPTED(parent)) {
-                               if (fname->hinfo.hash != EXT4_DIRENT_HASH(de) ||
-                                       fname->hinfo.minor_hash !=
-                                               EXT4_DIRENT_MINOR_HASH(de)) {
-
-                                       return false;
-                               }
-                       }
-               }
-
                ret = ext4_match_ci(parent, &u, de->name, de->name_len);
                if (ret < 0) {
                        /*
-- 
2.36.1



_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel