f2fs: Simplify the handling of cached casefolded names

Keeping it as qstr avoids the unnecessary conversion in f2fs_match

Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com>
[eugen.hristev@collabora.com: port to 6.10-rc1 and minor changes]
Signed-off-by: Eugen Hristev <eugen.hristev@collabora.com>
Link: https://lore.kernel.org/r/20240606073353.47130-3-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/f2fs/dir.c b/fs/f2fs/dir.c
index 02c9355176d3b55f467d0bd6948c7e5db600b519..bdf980e25adb37bdf024c27f0e68057d547f598c 100644 (file)
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -42,35 +42,49 @@ static unsigned int bucket_blocks(unsigned int level)
                return 4;
 }
 
+#if IS_ENABLED(CONFIG_UNICODE)
 /* If @dir is casefolded, initialize @fname->cf_name from @fname->usr_fname. */
 int f2fs_init_casefolded_name(const struct inode *dir,
                              struct f2fs_filename *fname)
 {
-#if IS_ENABLED(CONFIG_UNICODE)
        struct super_block *sb = dir->i_sb;
+       unsigned char *buf;
+       int len;
 
        if (IS_CASEFOLDED(dir) &&
            !is_dot_dotdot(fname->usr_fname->name, fname->usr_fname->len)) {
-               fname->cf_name.name = f2fs_kmem_cache_alloc(f2fs_cf_name_slab,
-                                       GFP_NOFS, false, F2FS_SB(sb));
-               if (!fname->cf_name.name)
+               buf = f2fs_kmem_cache_alloc(f2fs_cf_name_slab,
+                                           GFP_NOFS, false, F2FS_SB(sb));
+               if (!buf)
                        return -ENOMEM;
-               fname->cf_name.len = utf8_casefold(sb->s_encoding,
-                                                  fname->usr_fname,
-                                                  fname->cf_name.name,
-                                                  F2FS_NAME_LEN);
-               if ((int)fname->cf_name.len <= 0) {
-                       kmem_cache_free(f2fs_cf_name_slab, fname->cf_name.name);
-                       fname->cf_name.name = NULL;
+
+               len = utf8_casefold(sb->s_encoding, fname->usr_fname,
+                                   buf, F2FS_NAME_LEN);
+               if (len <= 0) {
+                       kmem_cache_free(f2fs_cf_name_slab, buf);
                        if (sb_has_strict_encoding(sb))
                                return -EINVAL;
                        /* fall back to treating name as opaque byte sequence */
+                       return 0;
                }
+               fname->cf_name.name = buf;
+               fname->cf_name.len = len;
        }
-#endif
+
        return 0;
 }
 
+void f2fs_free_casefolded_name(struct f2fs_filename *fname)
+{
+       unsigned char *buf = (unsigned char *)fname->cf_name.name;
+
+       if (buf) {
+               kmem_cache_free(f2fs_cf_name_slab, buf);
+               fname->cf_name.name = NULL;
+       }
+}
+#endif /* CONFIG_UNICODE */
+
 static int __f2fs_setup_filename(const struct inode *dir,
                                 const struct fscrypt_name *crypt_name,
                                 struct f2fs_filename *fname)
@@ -142,12 +156,7 @@ void f2fs_free_filename(struct f2fs_filename *fname)
        kfree(fname->crypto_buf.name);
        fname->crypto_buf.name = NULL;
 #endif
-#if IS_ENABLED(CONFIG_UNICODE)
-       if (fname->cf_name.name) {
-               kmem_cache_free(f2fs_cf_name_slab, fname->cf_name.name);
-               fname->cf_name.name = NULL;
-       }
-#endif
+       f2fs_free_casefolded_name(fname);
 }
 
 static unsigned long dir_block_index(unsigned int level,
@@ -235,11 +244,9 @@ static inline int f2fs_match_name(const struct inode *dir,
        struct fscrypt_name f;
 
 #if IS_ENABLED(CONFIG_UNICODE)
-       if (fname->cf_name.name) {
-               struct qstr cf = FSTR_TO_QSTR(&fname->cf_name);
-
-               return f2fs_match_ci_name(dir, &cf, de_name, de_name_len);
-       }
+       if (fname->cf_name.name)
+               return f2fs_match_ci_name(dir, &fname->cf_name,
+                                         de_name, de_name_len);
 #endif
        f.usr_fname = fname->usr_fname;
        f.disk_name = fname->disk_name;

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 1974b6aff397cca4560d7be3a092fe90ec7ce70a..8a9d910aa55281b5289b324a022bf29abcbdd053 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -531,7 +531,7 @@ struct f2fs_filename {
         * internal operation where usr_fname is also NULL.  In all these cases
         * we fall back to treating the name as an opaque byte sequence.
         */
-       struct fscrypt_str cf_name;
+       struct qstr cf_name;
 #endif
 };
 
@@ -3533,8 +3533,22 @@ int f2fs_get_tmpfile(struct mnt_idmap *idmap, struct inode *dir,
 /*
  * dir.c
  */
+#if IS_ENABLED(CONFIG_UNICODE)
 int f2fs_init_casefolded_name(const struct inode *dir,
                              struct f2fs_filename *fname);
+void f2fs_free_casefolded_name(struct f2fs_filename *fname);
+#else
+static inline int f2fs_init_casefolded_name(const struct inode *dir,
+                                           struct f2fs_filename *fname)
+{
+       return 0;
+}
+
+static inline void f2fs_free_casefolded_name(struct f2fs_filename *fname)
+{
+}
+#endif /* CONFIG_UNICODE */
+
 int f2fs_setup_filename(struct inode *dir, const struct qstr *iname,
                        int lookup, struct f2fs_filename *fname);
 int f2fs_prepare_lookup(struct inode *dir, struct dentry *dentry,

diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c
index 496aee53c38a2c57dd917fa7ec2417b5bbd3ea32..8712e264071fef1191eec5e73d899d5e23c7308d 100644 (file)
--- a/fs/f2fs/recovery.c
+++ b/fs/f2fs/recovery.c
@@ -46,10 +46,6 @@
 
 static struct kmem_cache *fsync_entry_slab;
 
-#if IS_ENABLED(CONFIG_UNICODE)
-extern struct kmem_cache *f2fs_cf_name_slab;
-#endif
-
 bool f2fs_space_for_roll_forward(struct f2fs_sb_info *sbi)
 {
        s64 nalloc = percpu_counter_sum_positive(&sbi->alloc_valid_block_count);
@@ -153,11 +149,8 @@ static int init_recovered_filename(const struct inode *dir,
                if (err)
                        return err;
                f2fs_hash_filename(dir, fname);
-#if IS_ENABLED(CONFIG_UNICODE)
                /* Case-sensitive match is fine for recovery */
-               kmem_cache_free(f2fs_cf_name_slab, fname->cf_name.name);
-               fname->cf_name.name = NULL;
-#endif
+               f2fs_free_casefolded_name(fname);
        } else {
                f2fs_hash_filename(dir, fname);
        }