[f2fs-dev] [PATCH v4 02/10] ext4: Simplify the handling of cached insensitive names

[Gabriel Krisman Bertazi]

Keeping it as qstr avoids the unnecessary conversion in ext4_match

Signed-off-by: Gabriel Krisman Bertazi <kris...@collabora.com>

--
Changes since v1:
  - Simplify hunk (eric)
---
 fs/ext4/ext4.h  |  2 +-
 fs/ext4/namei.c | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index a743b1e3b89e..93a28fcb2e22 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -2490,7 +2490,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 59eb3ecfdea7..84fdb23f09b8 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -1382,7 +1382,8 @@ static int ext4_match_ci(const struct inode *parent, 
const struct qstr *name,
 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;
 
@@ -1392,18 +1393,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;
 
@@ -1443,8 +1444,6 @@ static bool ext4_match(struct inode *parent,
                int ret;
 
                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 !=
@@ -1453,7 +1452,8 @@ static bool ext4_match(struct inode *parent,
                                        return false;
                                }
                        }
-                       ret = ext4_match_ci(parent, &cf, de->name,
+
+                       ret = ext4_match_ci(parent, &fname->cf_name, de->name,
                                            de->name_len, true);
                } else {
                        ret = ext4_match_ci(parent, fname->usr_fname,
-- 
2.36.1



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