ext4: Simplify the handling of cached casefolded names

Keeping it as qstr avoids the unnecessary conversion in ext4_match

Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com>
[eugen.hristev@collabora.com: port to 6.10-rc1]
Signed-off-by: Eugen Hristev <eugen.hristev@collabora.com>
Link: https://lore.kernel.org/r/20240606073353.47130-2-eugen.hristev@collabora.com
Reviewed-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Gabriel Krisman Bertazi <krisman@suse.de>
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 983dad8c07ecd1b4123c2217d0e7b22b7b7519cd..deffd7431c8bf549bcc94dd02c407db094513873 100644 (file)
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -2511,7 +2511,7 @@ struct ext4_filename {
        struct fscrypt_str crypto_buf;
 #endif
 #if IS_ENABLED(CONFIG_UNICODE)
-       struct fscrypt_str cf_name;
+       struct qstr cf_name;
 #endif
 };
 

diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index a630b27a4cc6e7caf57301831d2eeb68f8827c1f..ec4c9bfc1057793574e507219f3fd0e36d01dc4b 100644 (file)
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -1445,7 +1445,8 @@ out:
 int ext4_fname_setup_ci_filename(struct inode *dir, const struct qstr *iname,
                                  struct ext4_filename *name)
 {
-       struct fscrypt_str *cf_name = &name->cf_name;
+       struct qstr *cf_name = &name->cf_name;
+       unsigned char *buf;
        struct dx_hash_info *hinfo = &name->hinfo;
        int len;
 
@@ -1455,18 +1456,18 @@ int ext4_fname_setup_ci_filename(struct inode *dir, const struct qstr *iname,
                return 0;
        }
 
-       cf_name->name = kmalloc(EXT4_NAME_LEN, GFP_NOFS);
-       if (!cf_name->name)
+       buf = kmalloc(EXT4_NAME_LEN, GFP_NOFS);
+       if (!buf)
                return -ENOMEM;
 
-       len = utf8_casefold(dir->i_sb->s_encoding,
-                           iname, cf_name->name,
-                           EXT4_NAME_LEN);
+       len = utf8_casefold(dir->i_sb->s_encoding, iname, buf, EXT4_NAME_LEN);
        if (len <= 0) {
-               kfree(cf_name->name);
-               cf_name->name = NULL;
+               kfree(buf);
+               buf = NULL;
        }
+       cf_name->name = buf;
        cf_name->len = (unsigned) len;
+
        if (!IS_ENCRYPTED(dir))
                return 0;
 
@@ -1503,8 +1504,6 @@ static bool ext4_match(struct inode *parent,
        if (IS_CASEFOLDED(parent) &&
            (!IS_ENCRYPTED(parent) || fscrypt_has_encryption_key(parent))) {
                if (fname->cf_name.name) {
-                       struct qstr cf = {.name = fname->cf_name.name,
-                                         .len = fname->cf_name.len};
                        if (IS_ENCRYPTED(parent)) {
                                if (fname->hinfo.hash != EXT4_DIRENT_HASH(de) ||
                                        fname->hinfo.minor_hash !=
@@ -1513,8 +1512,8 @@ static bool ext4_match(struct inode *parent,
                                        return false;
                                }
                        }
-                       return !ext4_ci_compare(parent, &cf, de->name,
-                                                       de->name_len, true);
+                       return !ext4_ci_compare(parent, &fname->cf_name,
+                                               de->name, de->name_len, true);
                }
                return !ext4_ci_compare(parent, fname->usr_fname, de->name,
                                                de->name_len, false);